Unicopia/src/main/java/com/minelittlepony
Sollace 5cc612ca3a
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java
#	src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java
#	src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java
#	src/main/java/com/minelittlepony/unicopia/item/URecipes.java
#	src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java
2024-02-08 20:16:46 +00:00
..
unicopia Merge branch '1.20.1' into 1.20.2 2024-02-08 20:16:46 +00:00