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

69 Commits

Author SHA1 Message Date
9c9f02667c Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java
2025-08-17 19:00: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
1d8472e35c fix server freeze when loading head 2025-08-17 17:02:00 +03:00
11ecf88eb2 add OnServerStopped event 2025-07-24 03:20:16 +03:00
23eec5d7ac Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts:
#	forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java
2025-07-05 20:10:51 +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
2ea4d3f3e7 formatting 2025-07-05 19:21:45 +03:00
9063254e12 Merge branch '1.20.2-multiloader' into 1.20-multiloader 2025-06-21 11:13:24 +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
28db1ee84c Revert "use server side"
This reverts commit ad6d64e8d4.
2025-06-21 11:03:39 +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
6f5b291008 backport to 1.21.5 2025-06-19 06:04:40 +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
1c51796409 add mojmap layer version to parchment on forge 2025-06-18 19:03:33 +03:00
d351f7497c gradle properties for 1.20 2025-05-03 10:58:41 +03:00
33586d02a3 Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts:
#	gradle.properties
2025-05-03 10:53:13 +03:00
5f6d1204fc gradle properties for 1.20.2 2025-05-03 10:51:54 +03:00
a655e0c2ce gradle properties for 1.20.3 2025-05-03 10:44:08 +03:00
a7298a1909 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader
# Conflicts:
#	gradle.properties
2025-05-03 10:37:23 +03:00
e1a58f4246 gradle properties for 1.20.5 2025-05-03 10:35:51 +03:00
496c8d8078 Merge branch '1.21-multiloader' into 1.20.5-multiloader
# Conflicts:
#	gradle.properties
2025-05-03 10:34:32 +03:00
0070d3ab1c gradle properties for 1.21 2025-05-03 10:27:09 +03:00
41b6a5d030 split gradle.properties 2025-04-27 21:04:24 +03:00
694e5ebfef Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
2025-03-26 02:53:09 +03:00
d374c80659 Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2025-03-26 02:38:36 +03:00
1cafc91935 Merge branch '1.21-multiloader' into 1.20.5-multiloader
# Conflicts:
#	gradle.properties
2025-03-26 02:32:11 +03:00
07d620ae2f use moddev gradle for neoforge 2025-03-26 02:23:11 +03:00
e43ebdd11e Merge branch '1.20.2-multiloader' into 1.20-multiloader 2024-12-02 17:57:26 +03:00
348471b30d actually fix reobf on forge 2024-12-02 17:54:13 +03:00
3b88b5f5d5 Merge branch '1.20.2-multiloader' into 1.20-multiloader 2024-12-02 12:21:47 +03:00
e52baaef4c Merge branch '1.20.5-multiloader' into 1.20.3-multiloader 2024-12-02 03:39:12 +03:00
03dad0f8dc Merge branch '1.21-multiloader' into 1.20.5-multiloader 2024-12-02 03:35:57 +03:00
a35a64c017 use custom mineskin client fork 2024-12-02 03:12:26 +03:00