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

165 Commits

Author SHA1 Message Date
63a8ff18b5 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2026-01-14 23:50:54 +03:00
41793a904f Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2026-01-14 23:50:47 +03:00
3c2269ca6e Merge branch '1.21-multiloader' into 1.20.5-multiloader 2026-01-14 23:50:42 +03:00
4cf35048b0 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2026-01-14 23:47:37 +03:00
965af68461 Merge branch '1.21.6-multiloader' into 1.21.5-multiloader
# Conflicts:
#	gradle.properties
2026-01-14 23:47:22 +03:00
8fba8a997e Merge branch '1.21.9-multiloader' into 1.21.6-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
#	common/src/main/resources/skinrestorer.mixins.json
#	gradle.properties
2026-01-14 23:46:53 +03:00
a0d8f3d518 another backport to 1.21.9 2026-01-14 23:45:13 +03:00
aa3cb3df09 Merge branch '1.21.11-multiloader' into 1.21.9-multiloader 2026-01-14 23:41:52 +03:00
2e655ce1f3 bump version 2026-01-14 19:06:02 +03:00
ffd2a0dba7 update mineskin 2026-01-12 23:28:32 +03:00
76e801c944 use parchment 2026-01-10 14:55:31 +03:00
da754aa830 backport to 1.21.9
This reverts commit 69a561f679.
2025-12-15 23:31:54 +03:00
69a561f679 port 1.21.11 2025-12-15 23:27:30 +03:00
b5bed1c441 backport to 1.21.6 2025-10-04 22:59:06 +03:00
f36390a3d5 port to 1.21.9 2025-10-04 22:56:14 +03:00
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
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
fb7a4d11e9 bump version 2025-08-17 17:02:22 +03:00
8d4c2e9f83 add 1.21.8 to supported versions 2025-07-24 03:22:56 +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
5bab96e269 bump version 2025-07-13 20:30:28 +03:00
a0b557be51 add 1.21.7 to mc version list 2025-07-13 20:21:36 +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
1c7f97551d bump version 2025-07-09 21:37:18 +03:00
d54e30749f Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-07-05 20:03:20 +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
91eead3d1f bump version 2025-07-05 19:39:00 +03:00
6076325c87 Merge branch '1.20.3-multiloader' into 1.20.2-multiloader 2025-06-21 11:13:21 +03:00
64aaf906b0 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-06-21 11:13:17 +03:00
fb644adbc3 Merge branch '1.21-multiloader' into 1.20.5-multiloader 2025-06-21 11:13:12 +03:00
b4e76576c2 Merge branch '1.21.5-multiloader' into 1.21-multiloader 2025-06-21 11:13:07 +03:00
556ecdc039 Merge branch '1.21.6-multiloader' into 1.21.5-multiloader 2025-06-21 11:12:59 +03:00
4cc12e23dc bump version 2025-06-21 11:06:38 +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