PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-12-18 16:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity
3383 commits 14 branches 185 tags 44 MiB
Commit graph

3383 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
1bbc5b7569
Rewrite entity minion/discorded ai changes to be non-destructive 2024-10-11 14:05:50 +01:00
Sollace
b034ed3598
Update tla for https://github.com/MattiDragon/TlaApi/pull/9 2024-10-11 12:40:07 +01:00
Sollace
62cb65a5d3
Actually change the tla version number when we update it 2024-10-11 11:38:51 +01:00
Sollace
0370c9379c
Update tla to the version based on the branch at https://github.com/Sollace/TlaApi/tree/1.21-all-prs-merged 2024-10-11 11:23:54 +01:00
Sollace
017f2176d5
Clean up some tla stuff and depend on our own textures for recipe decorations 2024-10-11 11:23:41 +01:00
Sollace
a540856f5f
Update emi and rebuild tla 2024-10-10 22:45:39 +01:00
Sollace
667b6056f5
Fixed issues loading spellbook chapters 2024-10-10 20:54:38 +01:00
Sollace
6594e30d18
Fixed crash when rendering level markers in the hud 2024-10-10 20:22:38 +01:00
Sollace
0e49cda1cc
Fixed network error when joining a world 2024-10-10 20:02:46 +01:00
Sollace
156e17bee5
Fixed datafixes for the unicopia:charges component 2024-10-10 20:02:31 +01:00
Sollace
aac9404848
Add quilt as a supported loader 2024-10-10 19:41:24 +01:00
Sollace
c1fae299b8
Exclude 1.21.1 from the supported version ranges 2024-10-10 19:30:36 +01:00
Sollace
23577c1c02
Fixed the trick apple recipes 2024-10-10 19:15:12 +01:00
Sollace
f1ddb2381d
Fixed the trick apple recipes 
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/TrickCraftingRecipeJsonBuilder.java
 2024-10-10 19:03:48 +01:00
Sollace
8c90991214
Fixed the trick apple recipes 2024-10-10 18:59:37 +01:00
Sollace
340227b1c4
Bump blockus 2024-10-10 18:32:11 +01:00
Sollace
a11c8d6aa2
Fix sweet apple acres advancement 2024-10-10 18:27:48 +01:00
Sollace
7ecf4b1367
Fix sweet apple acres advancement 2024-10-10 18:19:53 +01:00
Sollace
cab9b517c2
Fix sweet apple acres advancement 2024-10-10 18:11:46 +01:00
Sollace
0995d01a2f
Fix sweet apple acres advancement 2024-10-10 18:04:05 +01:00
Sollace
49847d1479
Fix regressions 2024-10-10 17:29:28 +01:00
­Sollace
c3b2004405
New Crowdin updates (#481) 2024-10-10 17:08:28 +01:00
­Sollace
c5cb8913c9
New Crowdin updates (#480) 2024-10-10 14:23:56 +01:00
­Sollace
37e51859a9
New Crowdin updates (#479) 2024-10-10 14:08:49 +01:00
Sollace
0785ae0d3d
Fix incorrect id 2024-10-09 18:55:00 +01:00
­Sollace
0484bdc5e2
New Crowdin updates (#478) 2024-10-09 14:46:40 +01:00