Commit graph

2733 commits

Author SHA1 Message Date
Sollace
cda4e5b0b6
Change ad-astra oxygen check to use the current location instead of the entity 2024-04-24 20:00:44 +01:00
Sollace
f84ef86546
Fix null camera crash 2024-04-24 19:41:14 +01:00
Sollace
498577294e
Redo ad_astra compat 2024-04-24 19:33:22 +01:00
Sollace
e830268253
Merge branch '1.20.1' into 1.20.2 2024-04-24 18:35:01 +01:00
­Sollace
119eafbbc7
New Crowdin updates (#337)
* New translations en_us.json (French)
* New translations en_us.json (Russian)
* New translations en_us.json (Chinese Simplified)
* New translations en_us.json (Chinese Traditional)
* New translations en_us.json (English (upside down))
* New translations en_us.json (English, United Kingdom)
* New translations en_us.json (German)
2024-04-24 12:42:23 +01:00
Sollace
a48dffcf3a
Merge branch '1.20.1' into 1.20.2 2024-04-23 17:58:06 +01:00
Sollace
d83a3b0239
Fix compatibilty with HDSkins 2024-04-23 17:57:50 +01:00
Sollace
80b5c4a5dc
Merge branch '1.20.1' into 1.20.2 2024-04-23 15:29:07 +01:00
Sollace
cda7ec1d9e
Move entity type and status effect tags to datagen 2024-04-23 15:28:49 +01:00
Sollace
0be4aa1b4f
Fix build 2024-04-23 14:55:27 +01:00
Sollace
fb216459b5
Merge branch '1.20.1' into 1.20.2 2024-04-23 14:51:47 +01:00
Sollace
a1d59b48bf
Slight tweaks to the wind particle 2024-04-23 14:51:33 +01:00
Sollace
03f4b4004e
Add spiral particle (wip) 2024-04-23 14:41:21 +01:00
Sollace
1545210efa
Added wind trail particles 2024-04-22 17:21:12 +01:00
Sollace
e51d82f37e
Added a visual effect when flying at high speeds 2024-04-21 23:51:59 +01:00
Sollace
96b14aa1c3
Fixed bumpy pegasus flight patterns (also fixed diving) 2024-04-21 23:07:30 +01:00
Sollace
bdedeeece4
Players can no longer use their abilities in spectator mode 2024-04-21 23:07:10 +01:00
Sollace
19f67c23c6
Incorporate the player's luck and allow it to turn back if left unattended 2024-04-21 18:51:30 +01:00
Sollace
22d6874102
Give them legs and they can breath underwater now 2024-04-20 17:20:18 +01:00
Sollace
2749bab863
Fixed incorrect translation for compacted etched cloud 2024-04-18 21:36:52 +01:00
Sollace
f68be46b0c
Add new chest type 2024-04-18 21:09:15 +01:00
Sollace
afad14682f
Merge branch '1.20.1' into 1.20.2 2024-04-17 14:04:17 +01:00
Sollace
e20c4260f6
Fix crowdin jank 2024-04-17 13:59:09 +01:00
Sollace
22eaf9997c
Merge branch '1.20.1' into 1.20.2 2024-04-17 11:57:23 +01:00
­Sollace
d0cf4cea82
Merge pull request #334 from Sollace/l10n_1.20.1
New Crowdin updates
2024-04-17 11:54:50 +01:00
­Sollace
ff1ec2fc73 New translations en_us.json (German) 2024-04-15 17:11:11 +01:00
­Sollace
f221d0be12 New translations en_us.json (German) 2024-04-15 14:55:57 +01:00
­Sollace
06b009af25 New translations en_us.json (French) 2024-04-14 22:52:12 +01:00
­Sollace
8f7c87f18d New translations en_us.json (German) 2024-04-14 16:50:53 +01:00
­Sollace
4eabfb456f New translations en_us.json (German) 2024-04-14 15:48:56 +01:00
­Sollace
2bd8e26114 New translations en_us.json (German) 2024-04-13 21:12:27 +01:00
­Sollace
d7a57318ee New translations en_us.json (German) 2024-04-13 17:45:26 +01:00
­Sollace
fb909e1009 New translations en_us.json (French) 2024-04-13 17:45:23 +01:00
­Sollace
a563fa0a29 New translations en_us.json (French) 2024-04-13 16:47:01 +01:00
­Sollace
a15114db30 New translations en_us.json (French) 2024-04-13 15:49:42 +01:00
­Sollace
27685aacd7 New translations en_us.json (German) 2024-04-13 03:32:33 +01:00
­Sollace
824377ca03 New translations en_us.json (German) 2024-04-12 19:24:22 +01:00
­Sollace
e99ef2e8d4 New translations en_us.json (Chinese Traditional) 2024-04-12 19:24:21 +01:00
­Sollace
877fc9e113 New translations en_us.json (Chinese Simplified) 2024-04-12 19:24:20 +01:00
­Sollace
04404cb9d8 New translations en_us.json (French) 2024-04-12 19:24:17 +01:00
­Sollace
77a2ed3e42 New translations en_us.json (English, United Kingdom) 2024-04-12 18:19:32 +01:00
­Sollace
05f9429ddf New translations en_us.json (English (upside down)) 2024-04-12 18:19:31 +01:00
­Sollace
e625f68e5e New translations en_us.json (German) 2024-04-12 18:19:30 +01:00
­Sollace
de475de405 New translations en_us.json (Chinese Traditional) 2024-04-12 18:19:28 +01:00
­Sollace
80b812d052 New translations en_us.json (Chinese Simplified) 2024-04-12 18:19:27 +01:00
­Sollace
a891cb0dd1 New translations en_us.json (Russian) 2024-04-12 18:19:26 +01:00
­Sollace
a274f9d72f New translations en_us.json (French) 2024-04-12 18:19:25 +01:00
­Sollace
84383aa052 New translations en_us.json (English, United Kingdom) 2024-04-12 17:11:35 +01:00
­Sollace
65e845b396 New translations en_us.json (Chinese Simplified) 2024-04-12 07:17:42 +01:00
Sollace
fd8a2f3f32
Fix one more warning 2024-04-12 01:27:56 +01:00
Sollace
136267f439
Use the newer api for the polearm renderer 2024-04-12 01:27:12 +01:00
Sollace
0a5ec3da03
Indicate whether an ability can actually do something for a selected activation type 2024-04-12 01:24:15 +01:00
Sollace
86faeeaa43
Clean up warnings 2024-04-12 01:23:43 +01:00
Sollace
3489c47d63
Make the VR keys respect the toggle option and display a visual feedback when they are being used 2024-04-12 00:50:03 +01:00
­Sollace
3bfc656dd0 New translations en_us.json (Russian) 2024-04-11 22:55:58 +01:00
­Sollace
b739978701 New translations en_us.json (Chinese Traditional) 2024-04-11 20:28:44 +01:00
Sollace
408c9d11c0
Crystal doors can now be locked by providing them a signed bangle of comradery.
When locked they will only let the owner or players wearing a signed bangle through.
Also you can't cheat them
2024-04-11 19:37:25 +01:00
­Sollace
76405a8f48 New translations en_us.json (German) 2024-04-11 18:38:26 +01:00
Sollace
b99c6b6c29
Move creative tabs to datagen 2024-04-11 18:15:10 +01:00
­Sollace
6c04d866b5 New translations en_us.json (English (upside down)) 2024-04-11 16:46:14 +01:00
­Sollace
69a55c097e New translations en_us.json (German) 2024-04-11 16:46:13 +01:00
­Sollace
ffbeb78283 New translations en_us.json (Chinese Traditional) 2024-04-11 16:46:12 +01:00
­Sollace
c21e6a271a New translations en_us.json (Chinese Simplified) 2024-04-11 16:46:10 +01:00
­Sollace
6fcaf4dd04 New translations en_us.json (Russian) 2024-04-11 16:46:09 +01:00
­Sollace
5d0c7b23dd New translations en_us.json (French) 2024-04-11 16:46:08 +01:00
Sollace
9c744eb3eb
Added frog's legs 2024-04-11 15:42:35 +01:00
­Sollace
7a67232890 New translations en_us.json (German) 2024-04-11 15:40:13 +01:00
Sollace
59fbd177a2
Fixed diets not loading 2024-04-11 15:28:31 +01:00
Sollace
c78abf58be
Add poison effects to pufferfish 2024-04-11 14:47:36 +01:00
­Sollace
97bfb714e0 New translations en_us.json (German) 2024-04-11 13:59:30 +01:00
­Sollace
6c0eaff6c1 New translations en_us.json (Chinese Simplified) 2024-04-11 13:59:29 +01:00
Sollace
7abe3e4260
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	gradle.properties
2024-04-11 13:26:40 +01:00
­Sollace
58b26c90fe New translations en_us.json (Chinese Simplified) 2024-04-11 12:37:43 +01:00
­Sollace
2216b9d3d5 New translations en_us.json (English (upside down)) 2024-04-10 23:40:32 +01:00
­Sollace
04fa39bd65 New translations en_us.json (German) 2024-04-10 22:26:43 +01:00
­Sollace
3df738c560 New translations en_us.json (Chinese Simplified) 2024-04-10 15:06:04 +01:00
­Sollace
5b41458025 New translations en_us.json (Chinese Simplified) 2024-04-10 14:03:47 +01:00
­Sollace
944f4f1ca6 New translations en_us.json (German) 2024-04-10 11:51:28 +01:00
­Sollace
078e1c9354 New translations en_us.json (German) 2024-04-10 09:20:51 +01:00
­Sollace
e2ae3ab95a New translations en_us.json (Chinese Simplified) 2024-04-09 19:26:32 +01:00
­Sollace
045769c7a8 New translations en_us.json (Chinese Simplified) 2024-04-09 17:25:42 +01:00
­Sollace
9cd1b7055d New translations en_us.json (German) 2024-04-09 15:26:57 +01:00
­Sollace
146eef39ff New translations en_us.json (Chinese Traditional) 2024-04-09 15:26:56 +01:00
­Sollace
1914c90d1b New translations en_us.json (Chinese Simplified) 2024-04-09 15:26:55 +01:00
­Sollace
99f6ae0a13 New translations en_us.json (Russian) 2024-04-09 15:26:54 +01:00
­Sollace
b92db6dd32 New translations en_us.json (French) 2024-04-09 15:26:53 +01:00
Lightingale CI/CD
c089aec00f
Update translations (#316)
Co-authored-by: Sprinkled Frosting <sprinkledfrosting@ltgc.cc>
2024-04-09 15:05:17 +01:00
LingVarr
4418f360c8
Update ru_ru.json (#331) 2024-04-09 14:02:23 +01:00
Sollace
7e680549c7
Adjust starting size and decay rate of the black hole and add particles+item drops when decaying 2024-04-09 12:54:27 +01:00
Sollace
4a94c63e9b
Fixed seapony race appearing in the selection screen 2024-04-09 12:34:30 +01:00
Sollace
ca935ce224
Fixed error when setting race without specifying a namespace 2024-04-09 11:56:20 +01:00
Sollace
59d20f9e0f
Fix error message when trying to set an unknown race 2024-04-09 11:50:50 +01:00
Sollace
b8e2db12f0
Fixed bat ponies having both bat wings and icarus wings when wearing the wings of icarus 2024-04-09 11:48:36 +01:00
Sollace
1cab1bd16a
Fixed bat ponies having both bat and pegasus wings 2024-04-09 11:44:42 +01:00
Sollace
12748f5c6e
Fixed animations not being cancelled correctly when their timer ends. Fixes #325 2024-04-09 11:37:48 +01:00
Sollace
d5e4b69aec
Cancel velocity when changing dimensions. #329 2024-04-09 11:29:14 +01:00
Sollace
51d67d5215
Clean things up a little 2024-04-09 00:50:58 +01:00
Sollace
bd8c2f39fe
Update vortex gem texture 2024-04-09 00:50:37 +01:00
Sollace
04f8827e28
Disable the dust cloud 2024-04-09 00:21:39 +01:00
Sollace
a8f0796ad7
Added sticky keys option. Fixes #322 2024-04-08 22:13:08 +01:00
Sollace
4cb06bcc92
Move ability assignment to the races 2024-04-08 20:46:06 +01:00
Sollace
281e2ba26d
Add unique gem designs for different spells 2024-04-08 19:18:56 +01:00
Sollace
978b5e9854
Fix decay animation and improve rendering a little 2024-04-08 17:49:44 +01:00
Sollace
b84f1f046b
Add damage type for the black hole to bypass armor 2024-04-08 17:48:42 +01:00
Sollace
d6d6984955
Fix some offset issues with the dark vortex spell 2024-04-08 16:55:10 +01:00
Sollace
e465a21839
Minor fixes to Ether and some owned style changes 2024-04-08 16:53:01 +01:00
Sollace
12bc0b6973
Rewrite the dark vortex to cause less lag and adjust/apply a cap to its maximum size 2024-04-07 20:27:15 +01:00
横刀天笑(Knife smile)
b81e03a489
update zh_cn.json and HTP_CN (#319) 2024-04-06 15:10:46 +01:00
LingVarr
ea12ca7f24
Update ru_ru.json (#318) 2024-04-06 15:10:21 +01:00
Sollace
ca2be7ae85
Set the max count for fried axolotl to 1 (same as other bucket foods) 2024-04-05 23:41:51 +01:00
Sollace
7140ce6d0e
Return the empty container when eating stacked food with containers 2024-04-05 23:41:32 +01:00
Sollace
34bdd7f135
Set rock stew's max count to 1 2024-04-05 23:32:14 +01:00
Sollace
9219b07aff
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	BlockusAddon
#	build.gradle
#	gradle.properties
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellEnhancingRecipe.java
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/SpellTraits.java
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/Trait.java
#	src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java
#	src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java
#	src/main/java/com/minelittlepony/unicopia/entity/Living.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
#	src/main/java/com/minelittlepony/unicopia/recipe/URecipes.java
#	src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
#	src/main/resources/data/unicopia/loot_tables/blocks/apple_pie.json
2024-04-05 20:19:13 +01:00
Sollace
5529382e71
Move recipes to their own package 2024-04-05 18:33:24 +01:00
Sollace
8c83647004
Add cooked and rotten variants of all the fish 2024-04-05 17:10:39 +01:00
Sollace
926b8088cf
Fix some food group names 2024-04-05 15:15:14 +01:00
Sollace
d6e1a6c3b8
Fixed slime pustule not triggering a redstone update above it 2024-04-05 15:07:21 +01:00
Sollace
56e91629b1
Fix some tag references and fix diets not loading 2024-04-05 15:07:07 +01:00
Sollace
eeded18c36
Move pony diets to datagen. Summary of diets:
Unicorns:
 - have a general even preference of foods
 - Improved benefits from cooking their food before eating it
 - Can still eat raw and rotten but at a reduced yield

Earth Ponies:
 - Are vegans
 - They get the most from foraging
 - Pastries are their passion
 - If they must eat meat, they have to cook it and not let it spoil.
 - They have a sweet tooth and prefer candy, desserts, and rocks
 - Candy and rocks gives them a massive saturation boost. Maybe too much?

Pegasus
 - prefer fish over other food sources
 - Cannot eat love, or raw/rotten meat
 - Can eat raw and rotten fish but still prefers if they are cooked
 - Can safely eat fresh and cooked fish with no ill effects
 - Is less affected when eating rotten fish

Bat Ponies:
 - prefer cooked foods over raw, and meat/insects over fish
 - Doesn't like baked goods but really likes meats, fish, and insects
 - Gets food poisoning from eating rotten and raw meat
 - Can eat cooked meat and insects without negative effects
 - Becomes hyper when eating mangoes

Kirins:
 - Much like Earth Ponies, Kirins must cook their meat before they eat it
 - Cannot eat love, or raw/rotten meats and fish
 - Can eat cooked meat and insect without negative effects
 - Can eat blinding, prickly, strengthening, and glowing foraged foods without negative effects

Changelings:
 - like meat and fish but really prefer feasting on ponies' love directly from the tap
 - Doesn't like baked goods but really likes meats, fish, and insects
 - Can eat fish, meat, insects, and love without negative effects
 - Gets sick when eating foraged plants and vegetables

Hippogriffs:
 - like fish, nuts, and seeds
 - Can eat fish and prickly foods without negative effect
 - Gains more health from pinecones

Seaponies:
 - can eat seaweed, kelp, shells, and other undersea foods
 - Can eat fish without negative effect
 - Gains more health from pinecones
2024-04-05 14:06:29 +01:00
Sollace
171c786dec
Datagen food groups+
- add more variety in the foraging groups
- rebalance the probability of negative effects/food poisoning when eating the foraged things
- add groups for rotten insect
- moved fermented spider eye to the rotten insect category
- removed unused foraging_moderate category
- fixed incorrect tag reference breaking sapling eating
2024-04-04 20:22:10 +01:00
Sollace
734e75f8c8
Add proper item models and textures for the slime pustule and mysterious egg 2024-04-02 16:25:28 +01:00
Sollace
4f613ebb91
Adjust food categorizations and move some more tags to datagen 2024-04-02 11:27:38 +01:00
Sollace
a87257de83
Use the id of the food group as the name rather than the tag 2024-04-02 08:30:54 +01:00
Sollace
3bc1628fd4
Datagen loot tables and partially rewrite food 2024-04-01 23:39:21 +01:00
Sollace
77d1d62494
Fix build 2024-03-31 22:47:27 +01:00
Sollace
7d63797d4d
Jars can now hold fluids 2024-03-31 22:34:31 +01:00
Sollace
a81336ef88
Switch support for farmer's delight to farmer's delight refabricated 2024-03-31 16:47:40 +01:00
Sollace
ec9a12bdf9
Clean up tags and fix some recipe unlock conditions 2024-03-31 14:35:04 +01:00
Sollace
ea9c3bfaf9
Move more tags to datagen 2024-03-31 14:01:52 +01:00
Sollace
1503cb5773
Set butterfly spawn conditions to include more blocks 2024-03-31 02:38:59 +01:00
Sollace
2784627adc
Fix bugs and allow for storing bucketed entities in jars 2024-03-30 21:22:36 +00:00
Sollace
f0b2a8a550
Made jars placeable 2024-03-30 02:19:54 +00:00
Sollace
1fd1782051
Added chocolate oatmeal cookie
Added scone
Added recipe to craft bread from oats
Changed hay fried recipe to be vertical
2024-03-29 20:32:50 +00:00
Sollace
f500956760
- Fix hot air balloons not orienting correctly when placed
- add sandbags that you interact with to steer them
- fix various hitbox jankyness
- exclude spectators from hot air balloon collision checks
2024-03-29 20:31:49 +00:00
Sollace
f8ff162d6c
Properly copy all stack attributes when consuming the bait from a fishing rod 2024-03-29 12:31:33 +00:00
Sollace
e65838b943
Rewrite changeling ability to apply over time. Closes #312 2024-03-28 21:31:06 +00:00
Sollace
3bab3c4f56
Add villagers to the list of entities that benefit from the crystal heart. Closes #184 2024-03-28 17:13:50 +00:00
Sollace
10dc8ce6d7
Check against offline players when trying to see if a spell can modify blocks at a location. Closes #283 2024-03-28 17:05:04 +00:00
Sollace
5109b67de2
Revert seaponies back to normal if we're not able to respawn them underwater 2024-03-28 16:23:42 +00:00
Sollace
11f0bbc4e4
Move advancements back down the tree and add some advancements for seaponies and hippogriffs 2024-03-28 16:23:12 +00:00
Sollace
82b74ecb18
Added feather touch enchantment 2024-03-28 15:32:21 +00:00
Sollace
74a11086d1
Added recipe for getting pegasus feathers from gryphon feathers 2024-03-28 15:32:00 +00:00
Sollace
6b3b5c7c86
Added baited fishing rod 2024-03-28 14:51:55 +00:00
Sollace
101a560a01
Improve hot air balloon animations and fix formatting 2024-03-28 13:48:12 +00:00
Sollace
3ff7466a54
Balloons now require fuel to run 2024-03-28 13:47:54 +00:00
Sollace
fbe444b56c
Fix janky hot air balloon physics 2024-03-28 12:08:06 +00:00
Sollace
7cf32cce52
Added bowl of nuts, oatmeal cookie, and pinecone cookie 2024-03-27 19:24:06 +00:00
Sollace
c0a64a80f1
Fixed eating rock stew also consuming the bowl 2024-03-27 19:23:39 +00:00
Sollace
e931be3388
You can now harvest pinecones and acorns from spruce and oak leaves using a hoe 2024-03-27 19:23:16 +00:00
Sollace
2ae28c72d3
Fix edge sneaking when upside down 2024-03-26 22:00:43 +00:00