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
3324 commits 14 branches 185 tags 44 MiB
Commit graph

3324 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Sollace
b034ed3598
Update tla for https://github.com/MattiDragon/TlaApi/pull/9 2024-10-11 12:40:07 +01:00
­Sollace
01a54620ad New translations en_us.json (Chinese Traditional) 2024-10-11 12:13:01 +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
1a78659517 New translations en_us.json (Chinese Traditional) 2024-10-11 09:54:43 +01:00
­Sollace
4252191460 New translations en_us.json (Chinese Simplified) 2024-10-11 05:22:14 +01:00
­Sollace
21e06e5bbf New translations en_us.json (Chinese Simplified) 2024-10-11 03:31:06 +01:00
Sollace
a540856f5f
Update emi and rebuild tla 2024-10-10 22:45:39 +01:00
­Sollace
001bf74afc New translations en_us.json (French) 2024-10-10 21:30:51 +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
8c90991214
Fixed the trick apple recipes 2024-10-10 18:59:37 +01:00