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

428 Commits

Author SHA1 Message Date
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
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
c9bf691544 Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-05-30 22:56:56 +03:00
1a6327f91c Merge branch '1.20-multiloader' into 1.19.4-multiloader 2025-05-30 22:56:48 +03:00
56655bca36 backport to 1.20 2025-05-30 22:39:37 +03:00
90ca995907 Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
2025-05-30 22:38:16 +03:00
0823ed6669 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-05-30 22:37:22 +03:00
3fff2eb920 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-05-30 22:37:11 +03:00
50a49b33a2 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-05-30 22:36:56 +03:00
8de7f3a16f Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-05-30 22:36:25 +03:00
5b384c32d6 remove shadow from ServerLoginPacketListenerImplMixin 2025-05-30 22:35:56 +03:00
7fb647b3ba Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
2025-05-30 21:50:53 +03:00
907566e12b Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-05-30 21:48:30 +03:00
8a730c7c61 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-05-30 21:48:01 +03:00
0feba3f4b2 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-05-30 21:47:51 +03:00
fcd76d9a87 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-05-30 21:47:45 +03:00
8119a08c80 remove shadow of server from PlayerListMixin 2025-05-30 21:46:42 +03:00
6c159d6aa2 remove shadow of public method getPlayers 2025-05-30 21:29:42 +03:00
034d4863b7 Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-05-24 14:21:37 +03:00
59ea3eb160 Merge branch '1.20-multiloader' into 1.19.4-multiloader 2025-05-24 14:17:51 +03:00
1a5f4ab2b0 Merge branch '1.20.2-multiloader' into 1.20-multiloader 2025-05-24 14:13:19 +03:00
a2c4da3c6e Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-05-24 14:07:13 +03:00
04e781d36f Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-05-24 14:05:58 +03:00
4b30b8b53d Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-05-24 14:00:30 +03:00
0921cf70bf Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-05-24 13:52:11 +03:00
760ac65ab3 bump version 2025-05-24 13:50:29 +03:00
2e7a9edc20 update CHANGELOG.md 2025-05-24 13:50:17 +03:00
8457e6f4ab apply mixins at higher priority (fixes #52) 2025-05-24 13:33:11 +03:00
66a9c1fbbf update mixins compatibilityLevel to java 17 2025-05-24 13:31:57 +03:00
e3754cda90 update bug_report.yaml 2025-05-24 12:03:52 +03:00
768125d11d Merge branch '1.19.4-multiloader' into 1.19.3-multiloader 2025-05-03 11:31:53 +03:00