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
..
affliction	Merge branch '1.20.2' into 1.20.4	2024-04-05 22:01:26 +01:00
Ailment.java	New food system:	2023-12-03 02:39:55 +00:00
DietProfile.java	Move pony diets to datagen. Summary of diets:	2024-04-05 14:06:29 +01:00
DietsLoader.java	Fix some tag references and fix diets not loading	2024-04-05 15:07:07 +01:00
DietView.java	New food system:	2023-12-03 02:39:55 +00:00
Effect.java	Use the id of the food group as the name rather than the tag	2024-04-02 08:30:54 +01:00
FoodAttributes.java	New food system:	2023-12-03 02:39:55 +00:00
FoodGroup.java	Datagen food groups+	2024-04-04 20:22:10 +01:00
FoodGroupEffects.java	Datagen food groups+	2024-04-04 20:22:10 +01:00
FoodGroupKey.java	Datagen food groups+	2024-04-04 20:22:10 +01:00
PonyDiets.java	Use the id of the food group as the name rather than the tag	2024-04-02 08:30:54 +01:00