Commit graph

875 commits

Author SHA1 Message Date
Sollace
f4b607346a
Merge branch '1.20.1' into 1.20.2 2024-03-02 15:01:32 +00:00
Sollace
2f74a90afc
Le fixes 2024-03-02 00:35:23 +00:00
Sollace
df0cc6d225
Allow for placing our saplings in flower pots 2024-03-01 23:28:25 +00:00
Cryghast
f0f02b478f update zh_cn.json 2024-02-29 23:12:53 +08:00
Sollace
ba2e673de7
Each butterly type has its own item and throwing a butterfly in a jar will spawn a butterfly of that type where it lands 2024-02-26 23:05:30 +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
07bf99fcac
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	gradle.properties
2024-02-24 13:32:29 +00:00
Sollace
4b66dd517f
Fixed leaves rendering weird with sodium and fast graphics 2024-02-22 00:49:21 +00:00
Sollace
672807e343
Nerf leaves. Fixes #270 2024-02-21 23:22:28 +00:00
Sollace
a5132859ab
Fixed incorrect percentage breakdown for pony diets in tooltips 2024-02-21 23:21:41 +00:00
Sollace
5acebc270c
Fix cloud door recipe. Closes #265 2024-02-21 22:51:28 +00:00
Sollace
53497c70d6
Fix incompatibility with mods that add points of interest containing chests 2024-02-20 20:21:16 +00:00
Sollace
cdfc4babb4
Fix leaf flowers rendering on fast graphics 2024-02-20 18:40:04 +00:00
Sollace
0560ff5556
Remove terrain adaptation from floating islands because it still looks weird 2024-02-18 14:42:42 +00:00
Sollace
2abeff5767
Disable leaf flowers on fast graphics 2024-02-18 14:37:49 +00:00
Sollace
5c8ee9c0ff
Merge branch '1.20.1' into 1.20.2 2024-02-17 15:29:14 +00:00
­Sollace
c924d81331
Merge pull request #260 from LingVarr/1.20.1
Update ru_ru.json
2024-02-17 15:07:09 +00:00
Cryghast
4351644ced update zh_cn.json again 2024-02-17 21:57:45 +08:00
Cryghast
a0ace5ea1f update zh_cn.json 2024-02-17 21:43:56 +08:00
Sollace
013a75fccb
Merge branch '1.20.1' into 1.20.2 2024-02-16 16:52:41 +00:00
Sollace
0e1d7e8a51
Fix z-fighting on the hive block 2024-02-16 12:18:08 +00:00
Sollace
4dcc919d5e
Update zap apple textures 2024-02-16 12:06:32 +00:00
LingVarr
a12c70a67e Update ru_ru.json 2024-02-16 19:28:01 +11:00
Sollace
cef99f4a67
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	README.md
#	src/main/java/com/minelittlepony/unicopia/client/gui/TribeConfirmationScreen.java
#	src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java
2024-02-15 16:24:09 +00:00
Sollace
9b3cb7944a
Improve the /unicopia racelist command and give better feedback when it is enabled or disabled 2024-02-13 21:58:19 +00:00
­Sollace
4593648974
Merge pull request #257 from Cryghast/1.20.1
update zh_cn.json
2024-02-13 17:27:27 +00:00
Cryghast
a072317f31 update zh_cn.json 2024-02-13 23:36:24 +08:00
LingVarr
1b424a1445 Update ru_ru.json and READMEs 2024-02-13 14:44:12 +11:00
Sollace
e97adc8841
Add /racelist show and /racelist rest 2024-02-12 19:36:43 +00:00
Sollace
ceb98f6fab
Add missing ability icons 2024-02-12 17:29:11 +00:00
Sollace
ae5464b758
Fixed shapeshifting and fixed disguise entities not playing animations 2024-02-12 13:14:40 +00:00
横刀天笑(Knife smile)
f2bc32a90b
Merge branch 'Sollace:1.20.1' into 1.20.1 2024-02-12 11:30:54 +08:00
Sollace
0de1847392
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	gradle.properties
2024-02-11 14:52:56 +00:00
Sollace
623d231f2f
Fix the mimic spell recipe 2024-02-11 14:51:29 +00:00
Sollace
ae0179be8f
Fix compatibility with Synatra Connector / Froge 2024-02-11 14:01:18 +00:00
Cryghast
4644092120 update zh_cn.json 2024-02-11 20:37:18 +08:00
Sollace
65b468507c
Added flowers to apple tree leaves when they are flowing 2024-02-10 21:56:36 +00:00
Sollace
ded8499e9f
Adjust tree spawn rate and add a sweet apple orchard biome 2024-02-10 18:16:25 +00:00
LingVarr
6586e7625d Update ru_ru.json 2024-02-09 19:12:09 +11:00
LingVarr
dd804c872e
Merge branch 'Sollace:1.20.1' into 1.20.1 2024-02-09 19:00:43 +11:00
Sollace
5e099aeea5
Only load these if the mod is present 2024-02-08 22:17:36 +00:00
Sollace
1b688ac9f4
Only load these if the mod is present 2024-02-08 22:17:16 +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
Sollace
400bc19d08
Added zap planks, stairs, and slabs 2024-02-08 16:56:32 +00:00
Sollace
c4ab7e1bdf
Zap logs can now be waxed to keep them from zapping you when you mine them 2024-02-08 15:19:41 +00:00
Sollace
17cd097d88
Move recipes 2024-02-08 15:06:51 +00:00
Sollace
4aa088ec1b
Fix invalid traits 2024-02-08 14:53:05 +00:00
Sollace
2d7eca4d5b
Zap leaves now drop zaplings 2024-02-08 14:38:59 +00:00
Sollace
adb07cc586
Add spectral_clock, curing_joke, and flowering_zap_leaves to the creative tabs for respective tribes 2024-02-08 14:23:26 +00:00