PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 22:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity
Unicopia/src/main
History
Sollace 5af0f73f5c
Merge branch '1.20.1' into 1.20.2 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/network/MsgZapAppleStage.java
2024-02-03 23:19:53 +00:00
..
java/com/minelittlepony/unicopia Merge branch '1.20.1' into 1.20.2 2024-02-03 23:19:53 +00:00
resources Merge branch '1.20.1' into 1.20.2 2024-02-03 23:19:53 +00:00