1
0
mirror of https://github.com/Suiranoil/SkinRestorer.git synced 2026-01-16 04:42:12 +00:00
Commit Graph

461 Commits

Author SHA1 Message Date
ee0bca8cef Merge branch '1.19.3-multiloader' into 1.19.1-multiloader 2025-06-19 06:40:33 +03:00
6c96dcfd4a Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-06-19 06:40:25 +03:00
20ff29e8d9 Merge branch '1.20-multiloader' into 1.19.4-multiloader 2025-06-19 06:40:15 +03:00
b2ec095dd0 Merge branch '1.20.2-multiloader' into 1.20-multiloader 2025-06-19 06:39:58 +03:00
a308fba699 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-06-19 06:39:47 +03:00
119e91e222 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-06-19 06:39:36 +03:00
ba6dc5a1e5 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-06-19 06:39:10 +03:00
b0333b4b7f Merge branch '1.21.5-multiloader' into 1.21-multiloader
# Conflicts:
#	gradle.properties
2025-06-19 06:25:21 +03:00
21f00231af fix minecraft version range 2025-06-19 06:05:56 +03:00
6f5b291008 backport to 1.21.5 2025-06-19 06:04:40 +03:00
df58fe8c89 update CHANGELOG 2025-06-19 06:01:20 +03:00
2325b3b35c bump version 2025-06-19 06:00:49 +03:00
ad6d64e8d4 use server side 2025-06-19 05:55:44 +03:00
07b4887f60 update to minecraft 1.21.6 2025-06-19 05:55:43 +03:00
30d21c9424 update parchment 2025-06-18 19:04:28 +03:00
1c51796409 add mojmap layer version to parchment on forge 2025-06-18 19:03:33 +03:00
16da52c460 Merge branch '1.19.3-multiloader' into 1.19.1-multiloader 2025-06-11 01:28:27 +03:00
474f601cc3 Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-06-11 01:28:22 +03:00
1aeedf9cb4 Merge branch '1.20-multiloader' into 1.19.4-multiloader 2025-06-11 01:28:17 +03:00
f2280fef96 Merge branch '1.20.2-multiloader' into 1.20-multiloader 2025-06-11 01:28:13 +03:00
984d220a22 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-06-11 01:28:09 +03:00
02613e40fd Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-06-11 01:28:05 +03:00
dc0d69f0f0 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-06-11 01:28:01 +03:00
53e0740e43 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-06-11 01:27:55 +03:00
1b6afd5d6e update mineskin client to 3.0.6 2025-06-11 01:26:34 +03:00
2d3f94c88a Merge branch '1.19.3-multiloader' into 1.19.1-multiloader 2025-06-01 19:38:13 +03:00
ff43c18634 Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-06-01 19:38:10 +03:00
02082e6a2a Merge branch '1.20-multiloader' into 1.19.4-multiloader 2025-06-01 19:38:02 +03:00
c1bfa5350e Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
#	common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java
#	common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
2025-06-01 19:17:40 +03:00
b1c562f45d Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-06-01 19:14:34 +03:00
aeab757b05 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-06-01 19:14:28 +03:00
ef247f1ad3 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-06-01 19:14:21 +03:00
1eff73e9b3 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-06-01 19:14:13 +03:00
7e05f1eec9 decouple publish task from jar tasks 2025-06-01 19:12:57 +03:00
81d05fe991 Revert "remove shadow of public method getPlayers"
This reverts commit 6c159d6aa2.
2025-06-01 18:38:17 +03:00
757d46b231 Revert "remove shadow of server from PlayerListMixin"
This reverts commit 8119a08c80.
2025-06-01 18:38:17 +03:00
3b15f7b341 Revert "remove shadow from ServerLoginPacketListenerImplMixin"
This reverts commit 5b384c32d6.
2025-06-01 18:38:17 +03:00
38a2fd7214 update gitignore 2025-06-01 18:20:04 +03:00
945ce667be Merge branch '1.19.3-multiloader' into 1.19.1-multiloader 2025-06-01 14:11:10 +03:00
bd983e10ec Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-06-01 14:09:42 +03:00
c695e66a94 Merge branch '1.20-multiloader' into 1.19.4-multiloader 2025-06-01 14:07:07 +03:00
c07497cddb Merge branch '1.20.2-multiloader' into 1.20-multiloader 2025-06-01 14:06:02 +03:00
418397d3d2 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-06-01 14:03:19 +03:00
7af35cda9f Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-06-01 14:02:05 +03:00
3d92617e47 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-06-01 14:00:34 +03:00
f357e6c985 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-06-01 13:57:15 +03:00
e4c9e1b3cd bump version 2025-06-01 13:55:20 +03:00
3ef3318ed3 update CHANGELOG.md 2025-06-01 13:48:54 +03:00
4afd93e8bf Merge branch '1.19.3-multiloader' into 1.19.1-multiloader 2025-05-30 22:57:04 +03:00
c9bf691544 Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-05-30 22:56:56 +03:00