Commit graph

8 commits

Author SHA1 Message Date
Sollace
e317df4bf9
Merge branch '1.20.1' into 1.20.2 2024-10-08 16:40:25 +01:00
Sollace
512ae4d126
Fixed bat screech effect position when ponified. Fixes #399 2024-10-08 15:34:00 +01:00
Sollace
7abe3e4260
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	gradle.properties
2024-04-11 13:26:40 +01:00
Sollace
4cb06bcc92
Move ability assignment to the races 2024-04-08 20:46:06 +01:00
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
Sollace
ec9a12bdf9
Clean up tags and fix some recipe unlock conditions 2024-03-31 14:35:04 +01:00
Sollace
0ab31bf3ac
Merge branch '1.20' into 1.20.2 2023-12-15 20:38:34 +00:00
Sollace
0d0ea4558d
Added hippogriffs and seaponies 2023-11-08 12:58:41 +00:00