Commit graph

5 commits

Author SHA1 Message Date
Sollace
b72be6e403
Move serialisation-related utils to the serialization package 2024-10-03 15:35:28 +01:00
Sollace
b28c89e202
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	gradle.properties
#	src/main/java/com/minelittlepony/unicopia/server/world/Tree.java
2024-02-11 15:37:28 +00:00
Sollace
ded8499e9f
Adjust tree spawn rate and add a sweet apple orchard biome 2024-02-10 18:16:25 +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
ae6e7a0337
Added golden oak trees 2024-01-18 19:52:59 +00:00