Commit graph

789 commits

Author SHA1 Message Date
Sollace
5af0f73f5c
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/network/MsgZapAppleStage.java
2024-02-03 23:19:53 +00:00
Sollace
c7a23a19d9
Add pages for the altar and the spectral clock 2024-02-03 23:17:45 +00:00
Sollace
73d4975bf4
Remove extra ice spell page (should be blank) 2024-02-03 23:17:02 +00:00
Sollace
ad1784b417
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/element/Recipe.java
#	src/main/resources/assets/unicopia/lang/zh_cn.json
2024-02-02 21:08:49 +00:00
Sollace
28e64eebe1
Fix incorrect translation string 2024-02-02 08:26:00 +00:00
Sollace
a0ebfbacce
Move the unintelligle stuff to translation strings for LingVarr 2024-02-02 08:23:22 +00:00
Sollace
82428f77b7
Add more stages to the spectral clock 2024-02-02 08:16:33 +00:00
Sollace
7cb8e9c859
Fixed cloud block placement desync when on multiplayer 2024-02-01 23:17:46 +00:00
Sollace
8804fa0aba
Added the spectral clock for tracking the zap apple tree's season and make the zap apple tree cyce faster 2024-02-01 21:47:05 +00:00
Sollace
e85bb4b3a5
Fix formatting being lost when wrapping text
- move page headers outside the scrollable area,
- fix text cut off at the bottom of the scroll region
2024-01-31 17:00:47 +00:00
Sollace
dc6bc9fe9e
Add a dust cloud when earth ponies stomp sand, gravel, and concrete powder 2024-01-31 14:04:29 +00:00
Sollace
d08de6fae8
Make chapter contents translatable 2024-01-30 15:32:54 +00:00
Sollace
d4e698fa56
Move earth ponies' transmutations to recipes 2024-01-29 19:05:20 +00:00
Sollace
78dbc800ae
Assign traits to a lot of items that needed it 2024-01-29 16:35:21 +00:00
Cryghast
7c1eaf8736 update zh_cn and en_us 2024-01-28 22:44:28 +08:00
­Sollace
4eec169f5a
Merge pull request #243 from LingVarr/1.20.1
Update ru_ru.json
2024-01-28 01:58:30 +00:00
Sollace
fcad058e3a
Add the bulb as a possible generation in the pit 2024-01-27 21:19:01 +00:00
Sollace
31850a0f5c
Add a trap to the changling hive using the new potion 2024-01-27 21:18:42 +00:00
Sollace
e06ae63077
Add time-limited variants of the metamorphosis potions and add make all potions craftable 2024-01-27 21:17:16 +00:00
Sollace
80500a74c8
Improve portal rendering 2024-01-27 04:08:56 +00:00
Sollace
8785a3f5aa
Add portal rendering (wip) 2024-01-24 19:44:57 +00:00
LingVarr
e1cc467b05 Merge branch '1.20.1' of https://github.com/LingVarr/Unicopia into 1.20.1 2024-01-23 10:33:40 +11:00
Sollace
225c67d558
Tweak dark vortex rendering and fix its behaviour 2024-01-22 15:47:58 +00:00
Sollace
e1d9faa223
Switch to using a spell renderer for bubble spells 2024-01-22 13:19:29 +00:00
Sollace
7b1f5ce0db
Fix error loading the dead ringer advancement 2024-01-20 16:44:33 +00:00
LingVarr
35536e6e4a Update ru_ru.json 2024-01-21 03:03:41 +11:00
Sollace
69985e50f9
Fixed placed spells breaking when reloading a world 2024-01-20 15:42:26 +00:00
Sollace
e5236e5802
Fix loot tables 2024-01-19 16:11:48 +00:00
Sollace
f2b817d635
Make places hay bales edible 2024-01-19 15:28:40 +00:00
Sollace
ae6e7a0337
Added golden oak trees 2024-01-18 19:52:59 +00:00
Sollace
c7a161e114
Update goldroot textures 2024-01-18 16:28:45 +00:00
Sollace
0c26827790
Add advancement for killing mobs with a horseshoe 2024-01-17 19:48:35 +00:00
Sollace
f3ab86ed74
Fix palm log/stripped log and wood recipes 2024-01-17 19:13:17 +00:00
Sollace
5867e987f3
Fix leaves not mining with hoes. Closes #235 2024-01-17 18:50:19 +00:00
Sollace
4e9966055f
Fixed flowering zap leaves not recognisde as leaves 2024-01-17 18:50:19 +00:00
­Sollace
18111ae6e0
Merge pull request #242 from Cryghast/1.20.1
update zh_cn.json
2024-01-17 18:43:24 +00:00
Cryghast
f568552462 update zh_cn.json 2024-01-16 08:20:59 +08:00
Cryghast
117c68c8c6 update zh.cn.json 2024-01-16 08:18:57 +08:00
LingVarr
0ca19ba07c Update ru_ru.json 2024-01-15 23:38:22 +11:00
Lumière Élevé
facbbe2d26
Drink, soup and etc. 2024-01-14 20:06:19 +00:00
Lumière Élevé
ddd217c53d
Dehydration compat 2024-01-14 19:51:46 +00:00
Sollace
1c751aca0e
Rename ignominious bulb and vine 2024-01-05 18:41:20 +01:00
横刀天笑(Knife smile)
0e40c10c43
update zhcn json (#232)
* update zhcn json

* ignimeous
2024-01-05 18:36:19 +01:00
Sollace
e572c2c1ea
Added gold root 2024-01-04 22:41:27 +01:00
Sollace
0372592a79
Fixed errors loading changeling diets 2024-01-03 23:19:29 +01:00
Sollace
d4a3a274e2
Fixed cloud door recipe 2024-01-03 23:19:17 +01:00
Sollace
5196c9bf17
Made curing joke obtainable by earth ponies 2024-01-03 23:01:18 +01:00
Sollace
19831a635f
Added translations and fixed the loot table for some of the doors 2024-01-03 22:59:58 +01:00
Sollace
6eea0944d2
Added curing joke and ignimeous bulbs 2024-01-03 21:51:24 +01:00
Sollace
80225bf1e7
Added the second magical plant 2024-01-02 23:03:41 +01:00