Commit graph

127 commits

Author SHA1 Message Date
Sollace
259b0cddc4
Updating to 1.21 (part 2) 2024-09-26 21:36:35 +01:00
Sollace
74d30d7c95
1.20.4 -> 1.21.X (wip) 2024-09-25 23:55:05 +01:00
Sollace
48a569d0b5
Update iris dependency 2024-09-21 21:41:21 +01:00
Sollace
3cc7030e7b
Fixed amulet rendering when trinkets is not installed. Closes #455 2024-09-18 16:52:44 +01:00
Sollace
7a42a2d35a
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	gradle.properties
2024-04-11 13:27:41 +01:00
Sollace
7abe3e4260
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	gradle.properties
2024-04-11 13:26:40 +01:00
Sollace
835834a468
Update dependencies 2024-04-06 16:08:38 +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
a81336ef88
Switch support for farmer's delight to farmer's delight refabricated 2024-03-31 16:47:40 +01:00
Sollace
450eee5fe6
Downgrade for quilt compatibility 2024-02-24 14:22:28 +00:00
Sollace
5e7526d2ae
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	gradle.properties
2024-02-24 13:55:06 +00:00
Sollace
3f475c693b
Update minelp 2024-02-24 13:50:45 +00: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
cdfc4babb4
Fix leaf flowers rendering on fast graphics 2024-02-20 18:40:04 +00: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
0de1847392
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	gradle.properties
2024-02-11 14:52:56 +00:00
Sollace
ae0179be8f
Fix compatibility with Synatra Connector / Froge 2024-02-11 14:01:18 +00:00
Sollace
989d1df294
Add toggles for pehkui and sodium 2024-02-11 00:28:39 +00:00
Sollace
9599d0044b
Update minelp 2024-02-10 18:16:25 +00:00
Sollace
34566b560e
Add dev dependencies 2024-02-08 22:59:21 +00:00
Sollace
48be331a21
Update reach-entity-attributes 2024-02-08 22:07:50 +00:00
Sollace
90c7148e6d
Update EMI 2023-12-30 23:37:41 +01:00
Sollace
d461b9ae04
1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
Sollace
1a2efb5016
Update emi 2023-10-24 00:51:03 +01:00
Sollace
7c9071a321
EMI is running late 2023-10-24 00:51:02 +01:00
Sollace
24f1f4bdcd
1.20.1 -> 1.20.2 2023-10-24 00:50:57 +01:00
Sollace
c4a5835b5d
Update minimum version range to 1.20.1 2023-09-07 22:48:38 +01:00
Sollace
3c62db0268
Update EMI 2023-09-02 22:18:49 +01:00
Sollace
c2c16d575c
Fixed tooltips in the spellbook gui 2023-08-28 21:29:29 +01:00
Sollace
db52feb6b1
1.20-pre6 -> 1.20.1 2023-08-14 20:28:30 +01:00
Sollace
3e4542af7f
Update dependencies 2023-08-05 20:22:00 +01:00
Sollace
97f56ea4ed
Update dependencies 2023-08-04 18:25:52 +01:00
Sollace
9d90932ce9
Update kirin 2023-07-06 10:46:06 +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
a13ec4979a Accidentally made a mess of gradle 2023-05-31 19:43:58 +01:00
Sollace
940041e52c Remove JEI 2023-05-31 18:05:02 +01:00
Sollace
3673e75363 Update dependencies, add JEI 2023-05-30 22:52:02 +01:00
Sollace
a3e5144854 Added a palm wood set 2023-05-25 19:03:09 +01:00
Sollace
188530c3ef Added EMI support 2023-05-20 11:22:46 +01:00
Sollace
c331e6638b Update dependencies 2023-04-11 17:19:32 +02:00
Sollace
f3816d06b4 Update fabwork 2023-03-04 22:47:13 +00:00
Sollace
65201baa62 Update minlp 2023-02-25 20:15:31 +00:00
Sollace
99120bd40d Bump fabwork 2023-01-27 13:40:09 +00:00
Sollace
605d51614e Bump fabwork 1.1.2 -> 1.1.3 2023-01-26 21:01:39 +00:00
Sollace
791a0dd073 Update dependencies 2023-01-25 09:57:15 +00:00
Sollace
bc54d0e280 Update fabwork again 2022-12-30 21:09:33 +01:00
Sollace
83932bfea1 Update fabwork and switch a lot of the packets to records and replace the client handler with the new receiver method of registering callbacks 2022-12-30 20:42:18 +01:00