Sollace
|
0b7ef78cb8
|
Merge branch '1.20.2' into 1.20.4
|
2024-06-24 02:38:53 +01:00 |
|
Sollace
|
74a08b4820
|
Merge branch '1.20.1' into 1.20.2
|
2024-06-24 01:15:50 +01:00 |
|
Sollace
|
498ec2bca0
|
The pearl necklace now has 4 durability
|
2024-06-23 14:41:44 +01:00 |
|
Sollace
|
09cecef68e
|
Fix quick moving items in the spellbook. Fixes #348
|
2024-05-16 21:42:58 +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
|
5529382e71
|
Move recipes to their own package
|
2024-04-05 18:33:24 +01:00 |
|
Sollace
|
e2de87bc0e
|
Merge branch '1.20.2' into 1.20.4
# Conflicts:
# gradle.properties
# gradle/wrapper/gradle-wrapper.properties
# src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java
|
2024-02-24 13:50:09 +00:00 |
|
Sollace
|
07bf99fcac
|
Merge branch '1.20.1' into 1.20.2
# Conflicts:
# gradle.properties
|
2024-02-24 13:32:29 +00:00 |
|
Sollace
|
3606c5b0f2
|
Fixed mobs not being able to wear the amulets when trinkets is present
|
2024-02-24 13:06:32 +00:00 |
|
Sollace
|
3a5fb82a29
|
Merge branch '1.20.2' into 1.20.4
# Conflicts:
# src/main/java/com/minelittlepony/unicopia/block/BlockConstructionUtils.java
# src/main/java/com/minelittlepony/unicopia/block/SpikesBlock.java
# src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
# src/main/java/com/minelittlepony/unicopia/block/ZapBlock.java
# src/main/java/com/minelittlepony/unicopia/block/zap/BaseZapAppleLeavesBlock.java
# src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesBlock.java
# src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesPlaceholderBlock.java
# src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLogBlock.java
|
2024-02-08 20:43:57 +00:00 |
|
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
|
0ab31bf3ac
|
Merge branch '1.20' into 1.20.2
|
2023-12-15 20:38:34 +00:00 |
|
Sollace
|
63243e254d
|
Added the shaping bench
|
2023-11-20 22:30:21 +00:00 |
|
Sollace
|
24f1f4bdcd
|
1.20.1 -> 1.20.2
|
2023-10-24 00:50:57 +01:00 |
|
Sollace
|
6d7345c389
|
Move trinkets and seasons code to the compat package
|
2023-09-10 22:14:27 +01:00 |
|
Sollace
|
576e36df39
|
Rearrange armor slot positioning in the spellbook, turn the spell slots into actual functioning slots
|
2023-08-29 15:21:10 +01:00 |
|
Sollace
|
d47433a463
|
Adjust slot placement and fixed trinket slots not hiding when switching tabs
|
2023-08-28 19:56:38 +01:00 |
|
Sollace
|
1ed6ef7a17
|
Display trinket slots in the spellbook
|
2023-08-16 15:58:44 +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
|
43d1142f1f
|
1.19.4 -> 1.20-pre6
|
2023-06-03 12:40:54 +01:00 |
|
Sollace
|
62aac0f711
|
1.19.3 -> 1.19.4
|
2023-06-02 20:20:30 +01:00 |
|
Sollace
|
598f4273da
|
Fixed spellbook not repainting when its state is updated from the server
|
2023-01-21 22:52:20 +00:00 |
|
Sollace
|
1763f433d4
|
Switch to using the simple networking apis provided by fabwork
|
2022-12-29 22:37:17 +01:00 |
|
Sollace
|
c9c463d6c9
|
1.19.2 -> 1.19.3 (1.20) [part 1]
|
2022-12-18 21:07:24 +00:00 |
|
Sollace
|
a73d0cb3ea
|
Fixed spellbook crafting slot weightings not matching the documented behaviour
|
2022-10-21 14:05:46 +02:00 |
|
Sollace
|
2eaefdad9b
|
Add debug configs
|
2022-10-11 17:19:50 +02:00 |
|
Sollace
|
4a73cae094
|
Fixed being able to convert any item into botched gems
|
2022-10-07 09:03:24 +02:00 |
|
Sollace
|
a664a52bbe
|
Anyone can read the spellbook now
|
2022-09-21 22:58:29 +02:00 |
|
Sollace
|
ac874945cd
|
Use the stack-aware version of Slot#getMaxItemCount
|
2022-09-21 10:53:09 +02:00 |
|
Sollace
|
89879494df
|
Grant the player experience when crafting spells
|
2022-09-15 21:50:28 +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
|
b1599c74af
|
More cleanup and refactoring
|
2022-09-11 19:43:36 +02:00 |
|
Sollace
|
8a7c66b6c1
|
Remove some debug logs
|
2022-09-11 19:27:04 +02:00 |
|
Sollace
|
17a989f2a0
|
Fixed shift-clicking stacks from the result slot not putting them into the correct location and fixed shift-clicking not clearing the input grid
|
2022-09-11 19:26:19 +02:00 |
|
Sollace
|
3166fb3919
|
Fix item duplication/sync glitch in the spellbook
|
2022-09-11 18:52:26 +02:00 |
|
Sollace
|
5e23b7520e
|
Clean up some things that aren't being used any more
|
2022-09-11 12:45:23 +02:00 |
|
Sollace
|
6e04c6ab6d
|
Store the state in the spellbook and synchronize it between players when multiple are viewing the same book
|
2022-09-11 12:22:06 +02:00 |
|
Sollace
|
0f90593a9a
|
Move spellbook gui related code to the correct package
|
2022-09-10 22:13:56 +02:00 |
|
Sollace
|
bfe5f2e3b9
|
Reset the scrollbars when moving between dex pages
|
2022-09-10 17:30:25 +02:00 |
|
Sollace
|
06268b70ca
|
Disable debug reloading of spellbook chapters
|
2022-09-10 17:30:11 +02:00 |
|