Commit graph

20 commits

Author SHA1 Message Date
Sollace
1980cf634e
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java
#	src/main/java/com/minelittlepony/unicopia/advancement/RacePredicate.java
#	src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/CloudPillarBlock.java
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java
#	src/main/java/com/minelittlepony/unicopia/diet/affliction/StatusEffectAffliction.java
#	src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java
#	src/main/resources/data/unicopia/tags/items/food_types/forage_nauseating.json
2024-04-05 22:01:26 +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
a266253d53
Fix build 2024-03-24 00:49:28 +00:00
Sollace
d0d17a3eed
Move all remaining advancements to datagen and some new ones 2024-03-23 23:16:44 +00:00
Sollace
9ee9e53f63
Fix resource loading errors 2024-02-08 22:16:40 +00:00
Sollace
d461b9ae04
1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
Sollace
24f1f4bdcd
1.20.1 -> 1.20.2 2023-10-24 00:50:57 +01:00
Sollace
77e662bb85
Add new advancements 2023-09-09 18:46:41 +01:00
Sollace
76a7ecc3bb
Fixed certain race buffs and checks not accounting for worn amulets (or failing if wearing an amulet) 2023-09-01 19:09:13 +01:00
Sollace
43d1142f1f 1.19.4 -> 1.20-pre6 2023-06-03 12:40:54 +01:00
Sollace
82bdce6c51 Added consumption and heartbound enchantments 2023-05-17 19:49:38 +01:00
Sollace
5fff677f79 Prep for a future feature 2022-09-30 10:21:18 +02:00
Sollace
b1a979eb24 Add utility for creating identifiers with the mod's namespace 2022-08-27 15:25:02 +02:00
Sollace
09e0bcd7b2 Rewrite races to use a registry 2022-08-27 15:07:29 +02:00
Sollace
d94626e094 Added advancements and recipes for crafting muffins 2022-04-01 00:40:39 +02:00
Sollace
6d48b1ad57 Fixed molting season advancements #45 2022-01-14 11:09:01 +02:00
Sollace
2cae459eb8 1.17 -> 1.18 2021-12-22 11:15:09 +02:00
Sollace
a2512f293a More advancements, I say, more! 2021-08-19 14:43:15 +02:00
Sollace
51082fdf90 Added a bunch of new advancements 2021-08-19 01:29:49 +02:00
Sollace
40ac0dfb00 Added some advancements for bat ponies 2021-08-09 15:20:33 +02:00