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

243 Commits

Author SHA1 Message Date
abcb37fc6b Merge branch '1.20.3-multiloader' into 1.20.2-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java
2025-08-17 18:54:00 +03:00
b3b524c53a Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-08-17 18:46:05 +03:00
e6b2dcb4eb Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-08-17 18:30:22 +03:00
5f8a868e5c backport to 1.21 2025-08-17 18:28:46 +03:00
fce13237f9 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-08-17 18:25:45 +03:00
c987d48738 Merge branch '1.21.6-multiloader' into 1.21.5-multiloader
# Conflicts:
#	forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java
#	gradle.properties
2025-08-17 18:24:03 +03:00
1d8472e35c fix server freeze when loading head 2025-08-17 17:02:00 +03:00
84a06898a2 do not replace skin for head if on client and not in singleplayer 2025-07-24 03:21:43 +03:00
11ecf88eb2 add OnServerStopped event 2025-07-24 03:20:16 +03:00
acd1f888c0 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java
2025-07-13 20:40:54 +03:00
c192cdce7e Merge branch '1.20.5-multiloader' into 1.20.3-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java
2025-07-13 20:39:34 +03:00
d54cb48697 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-07-13 20:37:43 +03:00
6df0cf4fd2 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-07-13 20:36:09 +03:00
2cec50afae Merge branch '1.21.6-multiloader' into 1.21.5-multiloader
# Conflicts:
#	gradle.properties
2025-07-13 20:35:24 +03:00
7fad7de710 check name and id for null
fixes #60 and #61
2025-07-13 20:20:14 +03:00
cfd6dcd181 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-07-09 21:43:52 +03:00
06e5a2f5b7 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-07-09 21:43:07 +03:00
05ef681621 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-07-09 21:42:39 +03:00
daf0310072 Merge branch '1.21.5-multiloader' into 1.21-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
2025-07-09 21:38:52 +03:00
a3bd44af89 Merge branch '1.21.6-multiloader' into 1.21.5-multiloader 2025-07-09 21:38:04 +03:00
a8cc81e570 better exception logging 2025-07-09 21:37:18 +03:00
6ce3484824 rethrow io exception 2025-07-07 01:02:12 +03:00
b518305028 add exception logging 2025-07-07 00:56:32 +03:00
b38a296efa port to 1.20.2 2025-07-05 20:08:47 +03:00
d54e30749f Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-07-05 20:03:20 +03:00
e5134cdd71 port to 1.20.3 2025-07-05 19:58:53 +03:00
220f9c6ac3 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java
#	neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java
2025-07-05 19:55:32 +03:00
742b4cb4d0 Merge branch '1.21-multiloader' into 1.20.5-multiloader
# Conflicts:
#	forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java
2025-07-05 19:52:30 +03:00
1bacee4b22 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-07-05 19:47:43 +03:00
4a87bd43ca Merge branch '1.21.6-multiloader' into 1.21.5-multiloader 2025-07-05 19:40:24 +03:00
2ea4d3f3e7 formatting 2025-07-05 19:21:45 +03:00
e65501e620 support custom skins for player head block 2025-07-05 19:15:22 +03:00
6f5b291008 backport to 1.21.5 2025-06-19 06:04:40 +03:00
07b4887f60 update to minecraft 1.21.6 2025-06-19 05:55:43 +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
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
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
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