Commit graph

19 commits

Author SHA1 Message Date
Sollace
f51cb97721
Merge branch '1.20.2' into 1.20.4 2024-02-03 23:20:10 +00:00
Sollace
5af0f73f5c
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/network/MsgZapAppleStage.java
2024-02-03 23:19:53 +00:00
Sollace
c7a23a19d9
Add pages for the altar and the spectral clock 2024-02-03 23:17:45 +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
ad1784b417
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/element/Recipe.java
#	src/main/resources/assets/unicopia/lang/zh_cn.json
2024-02-02 21:08:49 +00:00
Sollace
8804fa0aba
Added the spectral clock for tracking the zap apple tree's season and make the zap apple tree cyce faster 2024-02-01 21:47:05 +00:00
Sollace
d08de6fae8
Make chapter contents translatable 2024-01-30 15:32:54 +00:00
Sollace
d461b9ae04
1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
Sollace
24f1f4bdcd
1.20.1 -> 1.20.2 2023-10-24 00:50:57 +01:00
Sollace
2ad431ab4b
Standardise the spell recipe ingredients/requirements lists 2023-08-14 13:05:20 +01:00
Sollace
31375f5c2d
Added drops for the hot air balloon 2023-08-13 10:04:09 +01:00
Sollace
1763f433d4 Switch to using the simple networking apis provided by fabwork 2022-12-29 22:37:17 +01:00
Sollace
2eaefdad9b Add debug configs 2022-10-11 17:19:50 +02:00
Sollace
986c8b67d7 Update page contents from the server for debugging purposes 2022-09-12 12:50:10 +02:00
Sollace
17d3d92416 Spellbook chapters are now server-controlled 2022-09-12 01:46:48 +02:00
Sollace
0f90593a9a Move spellbook gui related code to the correct package 2022-09-10 22:13:56 +02:00
Sollace
06268b70ca Disable debug reloading of spellbook chapters 2022-09-10 17:30:11 +02:00
Sollace
37148fad51 Fix some more text wrapping issues and catch exceptions whilst loading chapters 2022-09-02 12:53:14 +02:00
Sollace
978d336b96 Add tabs with chapters and pages to the spellbook, add a profile page with character levels and mana, and contents for the introduction chapter 2022-08-31 23:58:49 +02:00