Commit graph

320 commits

Author SHA1 Message Date
Sollace
a420c9ec38
Merge branch '1.20.2' into 1.20.4 2024-04-26 16:51:34 +01:00
Sollace
2d28bed961
Merge branch '1.20.1' into 1.20.2 2024-04-26 16:47:32 +01:00
Sollace
68025e4642
Fix respawning on cloud blocks 2024-04-26 16:40:43 +01:00
Sollace
da38726bc0
Fixed server crash when ticking jar items 2024-04-26 15:14:13 +01:00
Sollace
95abda651d
Merge branch '1.20.2' into 1.20.4 2024-04-23 14:52:08 +01:00
Sollace
fb216459b5
Merge branch '1.20.1' into 1.20.2 2024-04-23 14:51:47 +01:00
Sollace
1545210efa
Added wind trail particles 2024-04-22 17:21:12 +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
408c9d11c0
Crystal doors can now be locked by providing them a signed bangle of comradery.
When locked they will only let the owner or players wearing a signed bangle through.
Also you can't cheat them
2024-04-11 19:37:25 +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
d6e1a6c3b8
Fixed slime pustule not triggering a redstone update above it 2024-04-05 15:07:21 +01:00
Sollace
3bc1628fd4
Datagen loot tables and partially rewrite food 2024-04-01 23:39:21 +01:00
Sollace
77d1d62494
Fix build 2024-03-31 22:47:27 +01:00
Sollace
7d63797d4d
Jars can now hold fluids 2024-03-31 22:34:31 +01:00
Sollace
ec9a12bdf9
Clean up tags and fix some recipe unlock conditions 2024-03-31 14:35:04 +01:00
Sollace
2784627adc
Fix bugs and allow for storing bucketed entities in jars 2024-03-30 21:22:36 +00:00
Sollace
f0b2a8a550
Made jars placeable 2024-03-30 02:19:54 +00:00
Sollace
82b74ecb18
Added feather touch enchantment 2024-03-28 15:32:21 +00:00
Sollace
5cfebba12e
Fix quilt crash 2024-03-26 19:05:57 +00:00
Sollace
2ac6970e04
Added block of worms 2024-03-25 18:09:48 +00:00
Sollace
a6b8e6fe93
You can now place cloud pillars horizontally 2024-03-25 00:41:42 +00:00
Sollace
9ef3a946f6
Cache computed shapes (should improve bed performance) 2024-03-25 00:41:18 +00:00
Sollace
f67ab25a54
Fix MC-269785 for our own beds 2024-03-22 20:44:43 +00:00
Sollace
01b9e11e2d
Fixed fancy beds deleting their sheets when broken 2024-03-22 19:09:50 +00:00
Sollace
a3c1248e9f
Move all remaining regular recipes to datagen 2024-03-22 00:07:36 +00:00
Sollace
0d88cb67e6
Merge branch '1.20.2' into 1.20.4 2024-03-20 22:16:00 +00:00
Sollace
c608a33aea
Merge branch '1.20.1' into 1.20.2 2024-03-20 21:49:36 +00:00
Sollace
86cc754a7d
Remove collission from plunder vine buds 2024-03-17 14:42:41 +00:00
Sollace
e859c71e4f
Datagen plundervine blockstates 2024-03-17 14:42:26 +00:00
Sollace
956b55dc30
Datagen the rest of the blocks and fix some texturing on soggy cloud blocks 2024-03-16 15:26:45 +00:00
Sollace
9db67f6727
More datagen 2024-03-15 00:57:14 +00:00
Sollace
2d2a6e9b32
Fixed fruit tree growth + use bonemeal to grow apples 2024-03-03 12:23:42 +00:00
Sollace
67caa81a07
Merge branch '1.20.2' into 1.20.4 2024-03-02 15:48:20 +00:00
Sollace
f4b607346a
Merge branch '1.20.1' into 1.20.2 2024-03-02 15:01:32 +00:00
Sollace
8a2463d0a8
You can now safely collect slime pustules with shears and silk touch tools 2024-02-26 23:04:38 +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
2abeff5767
Disable leaf flowers on fast graphics 2024-02-18 14:37:49 +00:00
Sollace
ccbb0bdecd
Merge branch '1.20.2' into 1.20.4 2024-02-16 16:53:57 +00:00
Sollace
013a75fccb
Merge branch '1.20.1' into 1.20.2 2024-02-16 16:52:41 +00:00
Sollace
4edde4d479
Added a new feature to hive blocks 2024-02-16 16:42:48 +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
f8b4238822
Revert the player range check when dropping fruit from trees 2024-02-10 21:09:36 +00:00
Sollace
ded8499e9f
Adjust tree spawn rate and add a sweet apple orchard biome 2024-02-10 18:16:25 +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
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
5ed68fca7f
Added zap fence and zap fence gate 2024-02-08 19:56:41 +00:00