Commit graph

8 commits

Author SHA1 Message Date
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