Sollace
|
9219b07aff
|
Merge branch '1.20.1' into 1.20.2
# Conflicts:
# BlockusAddon
# build.gradle
# gradle.properties
# src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java
# src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellEnhancingRecipe.java
# src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/SpellTraits.java
# src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/Trait.java
# src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java
# src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java
# src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java
# src/main/java/com/minelittlepony/unicopia/entity/Living.java
# src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
# src/main/java/com/minelittlepony/unicopia/recipe/URecipes.java
# src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
# src/main/resources/data/unicopia/loot_tables/blocks/apple_pie.json
|
2024-04-05 20:19:13 +01:00 |
|