Commit graph

16 commits

Author SHA1 Message Date
Sollace
84b672ffbb
Clean up deprications 2024-10-03 18:28:00 +01:00
Sollace
259b0cddc4
Updating to 1.21 (part 2) 2024-09-26 21:36:35 +01:00
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
9ef3a946f6
Cache computed shapes (should improve bed performance) 2024-03-25 00:41:18 +00:00
Sollace
f67ab25a54
Fix MC-269785 for our own beds 2024-03-22 20:44:43 +00:00
Sollace
01b9e11e2d
Fixed fancy beds deleting their sheets when broken 2024-03-22 19:09:50 +00:00
Sollace
a3c1248e9f
Move all remaining regular recipes to datagen 2024-03-22 00:07:36 +00:00
Sollace
398ed0743d
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java
#	src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
2024-02-02 22:35:42 +00:00
Sollace
d461b9ae04
1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
Sollace
0ab31bf3ac
Merge branch '1.20' into 1.20.2 2023-12-15 20:38:34 +00:00
Sollace
a7ac895fd1
Trigger an update when a bed's sheets are changed 2023-11-25 02:37:10 +00:00
Sollace
7e25107f7a
Add proper collission shapes for the cloud beds 2023-11-25 02:15:29 +00:00
Sollace
2017aefc5a
Add more bed sheet variants and kelp bed sheets 2023-11-11 00:34:15 +00:00
Sollace
33375097fe
Added bedsheets for all the remaining colours and added recipes for them 2023-11-02 18:24:35 +00:00
Sollace
05a5960380
Added fancy beds and bedsheets 2023-10-31 20:38:28 +00:00