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
..
models	Made jars placeable	2024-03-30 02:19:54 +00:00
accretion_disk.svg	Add svg source for the black hole's texture	2024-01-24 19:44:46 +00:00
oats_guide.xcf	Reorganise misc asset files	2022-12-29 22:21:25 +01:00
paintings-2x1.xcf	Reorganise misc asset files	2022-12-29 22:21:25 +01:00
paintings-2x3.xcf	Reorganise misc asset files	2022-12-29 22:21:25 +01:00
paintings-2x4.xcf	Reorganise misc asset files	2022-12-29 22:21:25 +01:00
paintings-3x3.xcf	Reorganise misc asset files	2022-12-29 22:21:25 +01:00
pegasus_hud_concept.svg	wip	2024-02-16 11:18:49 +00:00
runes.svg	Reorganise misc asset files	2022-12-29 22:21:25 +01:00
spectral_clock_0.xcf	Add more stages to the spectral clock	2024-02-02 08:16:33 +00:00
zap_planks.xcf	Added zap planks, stairs, and slabs	2024-02-08 16:56:32 +00:00