Sollace
|
8adaa062d3
|
Merge branch '1.20.2' into 1.20.4
|
2024-04-23 15:00:17 +01:00 |
|
Sollace
|
0be4aa1b4f
|
Fix build
|
2024-04-23 14:55:27 +01:00 |
|
Sollace
|
292b034220
|
Merge branch '1.20.2' into 1.20.4
|
2024-04-17 11:59:21 +01:00 |
|
Sollace
|
22eaf9997c
|
Merge branch '1.20.1' into 1.20.2
|
2024-04-17 11:57:23 +01:00 |
|
Sollace
|
9c744eb3eb
|
Added frog's legs
|
2024-04-11 15:42:35 +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
|
00f677c157
|
1.15.2 -> 1.16
|
2020-06-26 22:13:50 +02:00 |
|
Sollace
|
e3c5f6fc4b
|
Fixed the spellbook
|
2020-06-01 17:00:22 +02:00 |
|
Sollace
|
2f6ffe43a9
|
Some terminology changes and cleanup
|
2020-05-28 18:27:30 +02:00 |
|
Sollace
|
8e30e8539a
|
Finally got all the recipes fixed
|
2020-05-02 18:20:41 +02:00 |
|
Sollace
|
070aeaefe3
|
Implement toxicity for ingredients (I may remove this in favour of flattening)
|
2020-05-02 00:38:37 +02:00 |
|
Sollace
|
e9041347e0
|
Refactor again and add recipe types for the crafting table \o/
|
2020-05-01 17:23:40 +02:00 |
|
Sollace
|
94952f5c16
|
Update recipes and loot tables, ensure everything is obtainable that should be obtainable, and revamp the enchanting recipe system
|
2020-04-28 21:27:33 +02:00 |
|