Commit graph

3413 commits

Author SHA1 Message Date
­Sollace
2e1702d23a New translations en_us.json (Chinese Simplified) 2024-10-28 17:59:07 +00:00
­Sollace
e627a7471c New translations en_us.json (Russian) 2024-10-28 17:59:05 +00:00
Sollace
935cc95ea2
Add missing translation for the rainboom death message. Fixes #501 2024-10-28 17:45:01 +00:00
Sollace
f2aff24f54
Fixed "Travelling in Style" advancement triggering without the balloon flying 2024-10-28 17:41:55 +00:00
Sollace
75aceac066
Fix various hot air balloon animations and quirks
It will no longer void the balloon and equipped fuel when broken
2024-10-28 17:40:15 +00:00
Sollace
06e4a1c8be
Fixed packet errors in multiplayer and close a memory leak 2024-10-28 15:47:55 +00:00
Sollace
e67954f370
Fixed players kicked from server when trying to use an ability 2024-10-28 15:47:32 +00:00
Sollace
0603ebf281
Fixed crash when throwing horseshoes 2024-10-20 22:04:40 +01:00
Sollace
b4fb815311
Updated basket textures by @Dazzle93638
Co-authored-by: Dazzle93638 <madi93638@gmail.com>
2024-10-19 19:01:26 +01:00
Sollace
c5f33d0abd
Fix incorrect recipe id 2024-10-15 17:15:46 +01:00
Sollace
1bfb8e7203
Fix loot tables 2024-10-15 15:09:31 +01:00
Sollace
4c593efb32
Don't perform adjustments on empty food components. squeek502/AppleSkin#331 2024-10-15 14:54:55 +01:00
Sollace
c9e8c8a3a9
Fixed rocks popping off of farmland. Fixes #493 2024-10-15 11:28:34 +01:00
Sollace
e0255c0e9b
Merge branch '1.20.1' into 1.20.2 2024-10-15 11:27:44 +01:00
Sollace
762c1125a3
Fixed rocks popping off of farmland. Fixes #493 2024-10-15 11:27:28 +01:00
Sollace
ae4a09ad28
Fixed rocks popping off of farmland 2024-10-15 11:25:51 +01:00
Sollace
bc40970616
Bump blockus 2024-10-15 11:12:08 +01:00
Sollace
b72d53811f
Bump blockus 2024-10-15 11:02:41 +01:00
Sollace
b8d6dc45cd
Downgrade to quilt support versions 2024-10-15 11:01:44 +01:00
Sollace
a6c9522c57
Update fabwork 2024-10-14 20:07:48 +01:00
Sollace
235e36baed
Added an entity behaviour for the breeze 2024-10-14 20:06:07 +01:00
Sollace
81bcf14a60
Bump target and fix compatibility with 1.21.1 2024-10-14 20:05:49 +01:00
Sollace
9907d3c907
Merge branch '1.20.4' into 1.21 2024-10-14 19:20:23 +01:00
Sollace
36eb042ffa
Fix #490 (again) 2024-10-14 19:20:10 +01:00
Sollace
652802b844
Fix #490 (again) 2024-10-14 19:19:48 +01:00
Sollace
6e6a82c7a5
Fix #490 (again) 2024-10-14 19:16:02 +01:00
Sollace
4350088b44
Update fabwork 2024-10-14 18:59:33 +01:00
Sollace
28b4ca5bf1
Merge branch '1.20.4' into 1.21
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/cloud/CloudBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/NaturalCloudBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudStairsBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/Soakable.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudStairsBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/jar/FluidOnlyJarContents.java
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/TrickCraftingRecipeJsonBuilder.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/MimicEntity.java
#	src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
2024-10-14 18:56:33 +01:00
Sollace
378cb34f83
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
#	src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
2024-10-14 18:49:28 +01:00
Sollace
895a7bff60
Change criterion check to an OR for tribe joins
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
2024-10-14 18:47:02 +01:00
Sollace
a43f5d2022
Fix carver crash #490 2024-10-14 18:46:10 +01:00
Sollace
fd65e7db17
Change early molting season advancements to regular tasks Closes #483 2024-10-14 18:46:06 +01:00
Sollace
93299feae6
Fixed the trick apple recipes
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/TrickCraftingRecipeJsonBuilder.java
#	src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
2024-10-14 18:45:49 +01:00
Sollace
708f9191a8
Change criterion check to an OR for tribe joins 2024-10-13 18:19:31 +01:00
Sollace
39597a0a1c
Change criterion check to an OR for tribe joins 2024-10-13 18:18:50 +01:00
Sollace
fc5fec106a
Fix carver crash #490 2024-10-12 21:47:38 +01:00
Sollace
4a0a5eeade
Change early molting season advancements to regular tasks Closes #483 2024-10-12 21:47:15 +01:00
Sollace
536cdf99d4
Fix carver crash #490 2024-10-12 21:44:46 +01:00
Sollace
24a4761b7a
Change early molting season advancements to regular tasks Closes #483 2024-10-12 21:23:59 +01:00
Sollace
78c090e037
Only count progressive advancements for the triggered id 2024-10-12 21:23:23 +01:00
Sollace
3297480b3f
Don't send advancement counter data to the client (it doesn't need it) 2024-10-12 20:29:55 +01:00
Sollace
2ce52b3a0f
Fixed red butterfly item texture 2024-10-12 20:28:52 +01:00
Sollace
2723fbf7b3
Balloons now change their appearance to reflect their type 2024-10-12 20:28:24 +01:00
­Sollace
438d8b9f0b New translations en_us.json (Chinese Traditional) 2024-10-12 15:01:22 +01:00
­Sollace
5cb958af18 New translations en_us.json (French) 2024-10-12 15:01:21 +01:00
­Sollace
c2d698c3c2 New translations en_us.json (French) 2024-10-12 13:49:57 +01:00
Sollace
3d18dedb0c
Add oat seeds as drops from other places where the game drops wheat seeds 2024-10-11 16:05:12 +01:00
Sollace
932c773e12
Fixed short grass dropping wheat worms instead of oat seeds 2024-10-11 16:01:43 +01:00
­Sollace
405732e975 New translations en_us.json (Chinese Simplified) 2024-10-11 14:58:43 +01:00
Sollace
1bbc5b7569
Rewrite entity minion/discorded ai changes to be non-destructive 2024-10-11 14:05:50 +01:00