mirror of
https://github.com/Sollace/Unicopia.git
synced 2025-02-16 10:04:22 +01:00
# 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 |
||
---|---|---|
.. | ||
main |