PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-12-01 00:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity
Unicopia/src/main/java/com/minelittlepony/unicopia/advancement
History
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
..
CustomEventCriterion.java Merge branch '1.20.2' into 1.20.4 2024-04-05 22:01:26 +01:00
RaceChangeCriterion.java 1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
RacePredicate.java Merge branch '1.20.2' into 1.20.4 2024-04-05 22:01:26 +01:00
SendViaDragonBreathScrollCriterion.java Merge branch '1.20.1' into 1.20.2 2024-04-05 20:19:13 +01:00
TraitDiscoveredCriterion.java Merge branch '1.20.2' into 1.20.4 2024-04-05 22:01:26 +01:00
UCriteria.java Merge branch '1.20.1' into 1.20.2 2024-04-05 20:19:13 +01:00