Tags: Xaidee/minecraft-comes-alive
Tags
Merge branch '1.19.4' into 1.20.1 # Conflicts: # common/src/main/java/net/mca/entity/interaction/VillagerCommandHandler.java # common/src/main/java/net/mca/mixin/MixinPlayerEntity.java # fabric/src/main/java/net/mca/fabric/MCAFabric.java # forge/src/main/java/net/mca/forge/ForgeBusEvents.java # quilt/src/main/java/net/mca/quilt/MCAQuilt.java
Merge branch '1.19.2' into 1.19.4 # Conflicts: # common/src/main/java/net/mca/entity/ai/brain/VillagerTasksMCA.java # common/src/main/java/net/mca/entity/ai/brain/tasks/WanderOrTeleportToTargetTask.java # forge/src/main/resources/META-INF/mods.toml
Merge branch '1.19.4' into 1.20.1 # Conflicts: # common/src/main/java/net/mca/client/gui/SkinLibraryScreen.java
PreviousNext