Commit graph

2368 commits

Author SHA1 Message Date
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
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
Sollace
bbe9eb0068
Fix shields not rendering in first person and change shields to be a semi-circle (since the rest will just clip into the ground) 2024-01-25 22:58:40 +00:00
Sollace
885bf6d1c4
Only send entities through a portal if they're facing into it 2024-01-25 22:58:02 +00:00
Sollace
4c821a521c
Change cast spells to be easier to reach and change the center to be the center of the entity not its base position 2024-01-25 22:57:44 +00:00
Sollace
1a17ff7dd0
Fix portal rendering issues :D 2024-01-25 22:56:22 +00:00
Sollace
a19637a8e4
Allow spells to animate post-removal 2024-01-25 19:09:57 +00:00
Sollace
5356c5c7ec
Disable fancy portal rendering since they don't work quite right 2024-01-24 22:06:40 +00:00
Sollace
8785a3f5aa
Add portal rendering (wip) 2024-01-24 19:44:57 +00:00
Sollace
56e1f5ffeb
Fixed portals breaking when relogging and fixed various portal placements 2024-01-24 19:44:30 +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
eb1b767319
Clean up deprecated particle handling 2024-01-22 23:28:03 +00:00
Sollace
edb1e024d6
Fix portals and move them to a spell renderer 2024-01-22 17:23:11 +00:00
Sollace
225c67d558
Tweak dark vortex rendering and fix its behaviour 2024-01-22 15:47:58 +00:00
Sollace
34aa3b8ced
Fixed spells not rendering on non-pony entities 2024-01-22 13:48:24 +00:00
Sollace
39672e5028
Fixed crash when equipping the bangle of comradery 2024-01-22 13:48:03 +00:00
Sollace
dd9bec2a0c
Added a visible icon for active spells in the world (shows timer countdown when applicable) 2024-01-22 13:19:58 +00:00
Sollace
e1d9faa223
Switch to using a spell renderer for bubble spells 2024-01-22 13:19:29 +00:00
Sollace
8cb3ba298d
Fixed dark vortex particles not going to its actual center 2024-01-22 13:19:01 +00:00
Sollace
134db120cd
Fix timed spells' timers not displaying correctly 2024-01-22 13:17:45 +00:00
Sollace
9510b83c72
Implement a renderer for the back hole 2024-01-21 18:06:53 +00:00
Sollace
e09ade57b1
Add a method to render a spell using the dispatcher 2024-01-21 15:19:49 +00:00
Sollace
3827deb235
Set up a proper render layer for shields 2024-01-21 15:17:21 +00:00
Sollace
7fb9543dbe
Move shield effect over to a spell renderer 2024-01-20 22:31:32 +00:00
Sollace
b3a7d338d2
Reimplement placed spell rendering to no longer require a particle 2024-01-20 19:48:43 +00:00
Sollace
81070be4b3
Fixed spells not affecting experience orbs 2024-01-20 16:45:33 +00:00
Sollace
e017fb1b89
Fix lag when both a dark vortex and hydrophobic (as well as other combinations) of spells are active at once 2024-01-20 16:45:22 +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
ab3ac8cb0d
Improve spell lookup performance by using the Ether 2024-01-20 15:12:23 +00:00
Sollace
d22dd3bdf9
Change how black holes function to instead generate energy 2024-01-19 22:12:22 +00:00
Sollace
5d2478604c
Fixed items being consumed in creative mode 2024-01-19 16:13:54 +00:00
Sollace
08e1702a1a
Fix bales being rebuilt with only wheat and added option to trim bales with a hoe 2024-01-19 16:12:25 +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
dde64153dd
Fixed bulb duplicating arms when reloading a world 2024-01-18 16:24:02 +00:00
Sollace
0c26827790
Add advancement for killing mobs with a horseshoe 2024-01-17 19:48:35 +00:00
Sollace
5ac68a3df9
Fixed race change advancement criterion. Fixes #230 2024-01-17 19:29:00 +00:00
Sollace
54381cf673
Fruit trees now consider the light level instead of time of day when trying to grow. Fixes #237 2024-01-17 19:18:56 +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
­Sollace
9c9afe798d
Merge pull request #240 from LingVarr/1.20.1
Update ru_ru.json
2024-01-17 18:42:30 +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
Sollace
144f00c207
The Ignominious Bulb now grows from a sprout when first summoned and will no longer lose its arms 2024-01-15 20:25:18 +00: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
073d411e90
Fixed errors logged relating to the recipe book 2024-01-03 23:19:43 +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
383cefa915
Fix damage message when dying to a tentacle 2024-01-03 23:11:00 +01:00
Sollace
2d87fd5099
Exclude grass blocks from earth ponies' ability so they aren't always swamped in tall grass every time 2024-01-03 23:01:45 +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
Sollace
b782157f74
Merge branch '1.20.2' into 1.20.4 2023-12-31 00:00:46 +01:00
Sollace
99fc4ea904
Merge branch 'Cryghast-1.20.2' into 1.20.1 2023-12-30 23:57:20 +01:00
Cryghast
cdb77e5fa3
time worn修正 2023-12-30 23:55:17 +01:00
Cryghast
9b92155bf0
update更新 2023-12-30 23:55:16 +01:00
Cryghast
5af1557664
loot bug 2023-12-30 23:55:16 +01:00
Cryghast
988d5d8ce1
更新汉化 2023-12-30 23:55:16 +01:00
Cryghast
24868633a5
time worn修正 2023-12-30 23:54:30 +01:00
Cryghast
17b437a060
update更新 2023-12-30 23:54:30 +01:00
Cryghast
ab0b412945
loot bug 2023-12-30 23:54:30 +01:00
Cryghast
cc5e39aebb
更新汉化 2023-12-30 23:54:30 +01:00
Sollace
4abb1774b7
Fix build 2023-12-30 23:37:49 +01:00
Sollace
d461b9ae04
1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
LingVarr
bad793aabf
Update ru_ru.json (#224) 2023-12-20 14:29:24 +01:00
Sollace
c1c37881eb
Fix missing mixin target 2023-12-15 20:46:36 +00:00
Sollace
e361e7e83d
Fix missing mixin target 2023-12-15 20:45:29 +00:00
Sollace
0ab31bf3ac
Merge branch '1.20' into 1.20.2 2023-12-15 20:38:34 +00:00
Sollace
ea813c3dcb
Add an advancement: A Falling Wizard 2023-12-13 18:21:06 +00:00
Sollace
f8fc9467be
We don't need this to be a model, just use the part 2023-12-05 23:06:52 +00:00
Sollace
a7ff78e141
Added the stable doors, crystal door, and cloud door 2023-12-04 20:46:45 +00:00
Sollace
d8565f3260
Added etched clouds and cloud chests 2023-12-04 14:49:24 +00:00
Sollace
f769568031
*punches gradle in the gut* 2023-12-03 21:19:36 +00:00
Sollace
ad7a7d84c0
New food system:
- Foods fill for different amounts for different races
- Certain foods can no longer be eaten by certain races
- Added food categories for candy, rocks, desserts
- Moved everything to datapacks
2023-12-03 02:39:55 +00:00
Sollace
16a7b96f81
wip 2023-11-28 15:30:34 +00:00
Sollace
8a85f0709e
Kirins can now cool themselves off by drinking bottles of water, juice, and eating melon slices 2023-11-27 16:02:38 +00:00
Sollace
2df34bd986
Prevent zap leaves from changing state when placed manually 2023-11-26 18:18:44 +00:00
LingVarr
9809f13fd1
Update ru_ru.json (#217) 2023-11-26 12:24:13 +00:00
Sollace
fb7a85c5d8
Guardians no longer attack seaponies 2023-11-25 21:42:58 +00:00
Sollace
ea78257ffd
Force ponies to use the seapony model (if they have one) when they are a seapony in unicopia 2023-11-25 21:27:29 +00:00
Sollace
e44347e8ed
Fix food component not being updated correctly 2023-11-25 21:01:07 +00:00
Sollace
c8dc41a68e
Fixed not being able to equip amulets, bracelets, and necklaces when trinkets is not installed 2023-11-25 20:49:47 +00:00
Sollace
e45ec6e1ff
Add the final necklace texture 2023-11-25 20:28:20 +00:00
Sollace
528f14dbf4
Exclude non-grantable tribes from the lan settings screen 2023-11-25 20:16:32 +00:00
Sollace
cb94d3c841
Add interaction indicators to the tribe selection gui 2023-11-25 20:12:54 +00:00
Sollace
277753b81b
Add missing cloud blocks to the creative tab for pegasi 2023-11-25 19:15:37 +00:00
Sollace
ec136e6045
Only play kirin rage theme to the kirin themselves 2023-11-25 03:58:55 +00:00
Sollace
3f7a9a0a78
Slime pustules now conduct redstone 2023-11-25 03:53:24 +00:00
Sollace
aa595d4284
Reduce slime spawn rate 2023-11-25 03:08:49 +00:00
Sollace
515efb93cb
Render the pattern on beds with nbt 2023-11-25 03:05:45 +00:00
Sollace
3ab4159125
Improve bed rendering performance 2023-11-25 02:51:19 +00:00
Sollace
a7ac895fd1
Trigger an update when a bed's sheets are changed 2023-11-25 02:37:10 +00:00
Sollace
7e25107f7a
Add proper collission shapes for the cloud beds 2023-11-25 02:15:29 +00:00
Sollace
44578ab4ac
Add a proper collision box for the shaping bench 2023-11-25 01:27:18 +00:00
Sollace
9ae1ef13ff
Added recipes for the remaining bed sheet patterns 2023-11-24 16:13:02 +00:00
Sollace
a1568feab4
Added translations for the plunder vine and loot bug 2023-11-24 15:47:48 +00:00