Sollace
|
3cc7030e7b
|
Fixed amulet rendering when trinkets is not installed. Closes #455
|
2024-09-18 16:52:44 +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
|
a67935c634
|
Merge branch '1.20.1' into 1.20.2
|
2024-04-25 15:33:11 +01:00 |
|
Sollace
|
cda4e5b0b6
|
Change ad-astra oxygen check to use the current location instead of the entity
|
2024-04-24 20:00:44 +01:00 |
|
Sollace
|
498577294e
|
Redo ad_astra compat
|
2024-04-24 19:33:22 +01:00 |
|
Sollace
|
22eaf9997c
|
Merge branch '1.20.1' into 1.20.2
|
2024-04-17 11:57:23 +01:00 |
|
Sollace
|
86faeeaa43
|
Clean up warnings
|
2024-04-12 01:23:43 +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
|
c608a33aea
|
Merge branch '1.20.1' into 1.20.2
|
2024-03-20 21:49:36 +00:00 |
|
Sollace
|
f7534f9f84
|
Fixed being able to equip amulets the the chest slot when trinkets is installed. #300
|
2024-03-20 00:21:50 +00:00 |
|
Sollace
|
095b10802f
|
Update ad-astra integration
|
2024-03-19 22:25:42 +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
|
cdfc4babb4
|
Fix leaf flowers rendering on fast graphics
|
2024-02-20 18:40:04 +00:00 |
|
Sollace
|
2abeff5767
|
Disable leaf flowers on fast graphics
|
2024-02-18 14:37:49 +00:00 |
|
Sollace
|
5cc612ca3a
|
Merge branch '1.20.1' into 1.20.2
# Conflicts:
# src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java
# src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java
# src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java
# src/main/java/com/minelittlepony/unicopia/item/URecipes.java
# src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java
|
2024-02-08 20:16:46 +00:00 |
|
Sollace
|
660973371d
|
Fixed stripped zap logs and wood not dropping
|
2024-02-08 14:22:52 +00:00 |
|
Sollace
|
3d5292c7f3
|
Add structure previews to the emi recipes for earth ponies, add the spectral clock recipe to emi, and ensure items aren't burned when throwing them into the altar's flame
|
2024-02-05 12:21:10 +00:00 |
|
Sollace
|
eb4c70de2f
|
1.20.1 -> 1.20.2 (merge fixes)
|
2024-02-02 21:17:16 +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
|
d4e698fa56
|
Move earth ponies' transmutations to recipes
|
2024-01-29 19:05:20 +00:00 |
|
Sollace
|
0ab31bf3ac
|
Merge branch '1.20' into 1.20.2
|
2023-12-15 20:38:34 +00:00 |
|
Sollace
|
c8dc41a68e
|
Fixed not being able to equip amulets, bracelets, and necklaces when trinkets is not installed
|
2023-11-25 20:49:47 +00:00 |
|
Sollace
|
c1b5c58eab
|
Added emi integration for the shaping bench
|
2023-11-20 22:57:41 +00:00 |
|
Sollace
|
ec151ad092
|
Fix whitespace
|
2023-10-24 00:51:03 +01:00 |
|
Sollace
|
24f1f4bdcd
|
1.20.1 -> 1.20.2
|
2023-10-24 00:50:57 +01:00 |
|
Sollace
|
fc1b461046
|
Implement kirin ability
|
2023-10-09 22:05:41 +01:00 |
|
Sollace
|
af76a4fef6
|
Added ad_astra integration
|
2023-09-10 23:28:53 +01:00 |
|
Sollace
|
6d7345c389
|
Move trinkets and seasons code to the compat package
|
2023-09-10 22:14:27 +01:00 |
|
Sollace
|
3c62db0268
|
Update EMI
|
2023-09-02 22:18:49 +01:00 |
|
Sollace
|
ed3c0f9609
|
Add Pehkui compatibility. Closes #88
|
2023-08-08 01:35:05 +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
|
3673e75363
|
Update dependencies, add JEI
|
2023-05-30 22:52:02 +01:00 |
|
Sollace
|
640c5ab7e1
|
Unused import
|
2023-05-20 14:28:25 +01:00 |
|
Sollace
|
fa83842689
|
Fix arrow texture in emi recipes
|
2023-05-20 13:45:18 +01:00 |
|
Sollace
|
188530c3ef
|
Added EMI support
|
2023-05-20 11:22:46 +01:00 |
|