Commit graph

3298 commits

Author SHA1 Message Date
Lumière Élevé
1529fa4dd0 Some more stuff. 2024-02-03 15:17:31 +00:00
Lumière Élevé
f97c7b17bd
Merge branch 'Sollace:1.20.1' into 1.20.1 2024-02-03 13:33:29 +00:00
Sprinkled Frosting
408cb8c4a7 種族選擇 2024-02-03 13:16:23 +00:00
Sprinkled Frosting
9209b5dbd3 魔法與食物 2024-02-03 12:47:21 +00:00
Sollace
4230518d08
Make the spectral clock more accurate 2024-02-03 12:42:26 +00:00
Sprinkled Frosting
b9266b047e 熒幕提示 2024-02-03 12:18:36 +00:00
Sprinkled Frosting
da42cadad0 藥水 2024-02-03 12:15:29 +00:00
Sprinkled Frosting
b356d1f888 正體中文實驗 2024-02-03 11:28:00 +00:00
Lumière Élevé
ae730ce8fc Some French translations. 2024-02-03 10:31:05 +00:00
Lumière Élevé
26fc8f9823 Prepare a new file for French translations. 2024-02-03 10:10:02 +00:00
LingVarr
8454ccedd7
Update en_us.json 2024-02-03 13:07:02 +11:00
Sollace
398ed0743d
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java
#	src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
2024-02-02 22:35:42 +00:00
Sollace
466ba09072
Merge branch '1.20.1' into 1.20.2 2024-02-02 21:17:53 +00:00
Sollace
38892ffde4
Remove unused mixin 2024-02-02 21:17:34 +00:00
Sollace
eb4c70de2f
1.20.1 -> 1.20.2 (merge fixes) 2024-02-02 21:17:16 +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
5a5ec8b24c
Implement method to obtain the spectral clock using the altar 2024-02-02 21:04:20 +00:00
LingVarr
38e2a1c035 Update ru_ru.json
Spellbook time
2024-02-02 22:01:54 +11:00
LingVarr
8fd97223ed Fix some typos in en_us.json
I hope those were typos and not some special irish grammar.
2024-02-02 22:01:10 +11: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
e1f4d77580
Adjust tree heights to remove the possibility of trees generating absurdly tall 2024-02-01 13:26:57 +00:00
Sollace
2e938633e9
Clean up and adjust transitions when zap apple trees change stages 2024-02-01 13:26:35 +00:00
Sollace
fbe859dcc7
Fixed zap apple trees not progressing through their stages properly 2024-02-01 13:00:38 +00:00
Sollace
b194f720ef
Fixed spell equip sound playing when opening the spellbook 2024-02-01 12:18:15 +00:00
Sollace
72b5b3d50c
Apply text tint to more parts of the spellbook's contents 2024-02-01 12:12:25 +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
a36aa10085
Add the dust cloud when pegasi take off from sand, gravel, and concrete power
+ fix dust particles flying away too quickly from where a pegasus takes off
2024-01-31 14:05:14 +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
e15d64ff3d
Implement support for displaying chapters with varying content height 2024-01-29 21:19:47 +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
­Sollace
8af82ade1c
Merge pull request #246 from Cryghast/1.20.1
update zh_cn and en_us
2024-01-28 20:00:28 +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
e385eb5640
Add config options for portal rendering 2024-01-27 04:21:31 +00:00
Sollace
80500a74c8
Improve portal rendering 2024-01-27 04:08:56 +00:00
Sollace
da3aec8d83
Don't render debug info for the first person entity 2024-01-27 00:22:27 +00:00
Sollace
cd9597f117
Fix portals placing in the ground 2024-01-27 00:21:27 +00:00
Sollace
8b7a55d764
Combine TexturedSphereModel into SphereModel 2024-01-26 23:30:22 +00:00
Sollace
7c7ea1e555
Fix build 2024-01-26 16:10:59 +00:00
Sollace
0910ad72ca
Fixed dismissing spells from the gui killing them without going through the normal removal process 2024-01-26 15:58:22 +00:00
Sollace
4151b66e99
Fix shields targetting the entity it belongs to 2024-01-26 15:57:36 +00:00