Sollace
|
398ed0743d
|
Merge branch '1.20.2' into 1.20.4
# Conflicts:
# src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java
# src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
# src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java
# src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java
# src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
# src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java
# src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
|
2024-02-02 22:35:42 +00:00 |
|