Commit graph

577 commits

Author SHA1 Message Date
d86b4816d7 merged from upstream 2026-02-17 22:42:19 +02:00
Pyritie
c9d25f756b ore veins 2026-02-16 12:49:18 +00:00
Pyritie
607e7ffcc8 buffed wines 2026-02-15 13:11:48 +00:00
Ujhik
20e2417e15
bugfix: Aged alcohols now are drinkable when player water is full (#3001) 2026-02-09 01:05:07 -06:00
Pyritie
4ddab5e7be fix #2990 2026-02-08 11:54:31 +00:00
Pyritie
7e4547353e alignment with tfc 1.21 2026-02-07 14:22:00 +00:00
Bumperdo09
82114352d8
Add Curios Face Slot (For Engineers Goggles and Face Mask) (#2992)
* Add Curios Face Slot

Curio face slot for create goggles and GT face mask.
GT night vision goggles would need extra work to get working in the curio slot

* InventoryHUD config for face curio slot
2026-02-05 23:33:55 -06:00
Pyritie
aee36ca59e fix basalt columns 2026-02-03 21:17:14 +00:00
Pyritie
5b3ff2ab4d salt flat tweak 2026-02-03 20:43:08 +00:00
Pyritie
811956bf8c salt adjustments 2026-02-03 16:02:17 +00:00
Pyritie
abef642e66 bunch o venus stuff 2026-02-03 15:51:45 +00:00
Pyritie
c76c4a0f2f fix dupe with toolbelt and sns containers #2926 2026-02-03 11:52:17 +00:00
Pyritie
8fd7cf3847 improvements to jagged tablelands + some skew for the rock layers 2026-02-03 01:34:28 +00:00
Pyritie
5aa82d80af make chorus flowers drop 100% of the time, but now more are required 2026-02-03 01:34:00 +00:00
Pyritie
260851074c
Feature/venus stone ores (#2961)
* langs

* fix veins

* missing knapping textures

* rename ignimbrite features

* new ores

* feature stuff

* entity tweaks
2026-02-02 23:42:42 +00:00
Pyritie
19bf4de976 gurman update 2026-02-02 14:54:21 +00:00
Pyritie
41bfc7397c update veins 2026-02-01 18:02:34 +00:00
Pyritie
849f6409d5 Merge branch 'dev' into feature/wab-1.4 2026-02-01 17:37:25 +00:00
Pyritie
b2fe5d351a add them to biomes 2026-02-01 17:20:59 +00:00
Pyritie
4ce5226af9 fix it for realsies 2026-02-01 16:21:03 +00:00
Pyritie
90535daf1a add new skulls to mars, update loot tables, add new recipes, hide items 2026-02-01 16:05:14 +00:00
Pyritie
b1fddab3e9 cleanup rock loot tables 2026-01-31 14:27:52 +00:00
Pyritie
e90cccbcc8 mars quartzite, fix tetramethoxysilane #2898 2026-01-31 14:27:25 +00:00
Pyritie
ffaced187f more loot for piglin brutes 2026-01-31 14:25:46 +00:00
Pyritie
bc15723eca add loot table for piglin brutes 2026-01-31 11:56:52 +00:00
Pyritie
79a169de20 added different oil spouts, changed ore veins a little 2026-01-29 23:35:02 +00:00
Pyritie
ec477c70d8 flying up high enough now sends you into orbit 2026-01-28 00:54:03 +00:00
Redeix
75b0cea000
Artisan Table (#2857)
* artisan table merging (#2766)

* these should be good

* Update recipes.miscellaneous.js

* little typo

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* fix typo, my bad gang

* fix charnia

* fixed recycling issues from the material rewrite, updated everything to the new recycling helper method

* I'll move these eventually

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* artisan table assets

* asset update

* Update recipes.artisan_table.js

* asset update

* lang

* tag refactor

* waiter! more assets please

* recipes

* done?

* I forgor

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-25 19:22:50 -06:00
Pyritie
84368b249c fix music for realsies 2026-01-25 22:21:07 +00:00
Pyritie
91f41fc8d7 does this fix music? 2026-01-25 18:57:38 +00:00
Pyritie
2f0b30cede music! 2026-01-24 18:54:53 +00:00
Pyritie
a844e50284 drinkable concrete 2026-01-23 21:31:48 +00:00
Pyritie
8d17dca5c6 move saltpeter chem reactor to a circuit 2026-01-23 21:12:18 +00:00
Pyritie
8fba57695e fix drinks giving too much hydration 2026-01-23 21:10:24 +00:00
66b4cc861f Removed vanilla mob spawn and beneath entrance 2026-01-23 14:52:20 +02:00
Pyritie
6ce28447f5 bump up moon animal spawns a bit 2026-01-23 00:49:57 +00:00
Pyritie
48d2e0b479 delete sylvite 2026-01-21 23:30:13 +00:00
Pyritie
a5d858319c reduced the frequency of ambient biome additions sounds 2026-01-21 22:24:24 +00:00
Pyritie
efb87cfb14 fixed geodes causing collapses 2026-01-21 20:32:53 +00:00
Pyritie
89030d3564
Stone dust rework (#2782)
* geology

* starting some loot table stuff

* more stuff

* swap some rocks

* refactor

* phew

* drive-by fix

* all done I think

* remove sylvite

* oh yeah baby it's all coming together

* cleaned up some lines that didn't do anything, added more comments, removed log spam

* blah blah

* fix drying mat

* fix ladders

* tfc, beneath, and moon stuff done...? this is gonna take 5ever

* a

* some sand stuff, more stone types

* wrong way around

* unifying various brick block recipes

* remove shaped create deco brick recipes

* some progress on block creation

* we got into the create world screen!

* getting somewhere

* Reloaded with no KubeJS errors!

* new assets

* I thiiiink that's about everything

* fix some stonecutting

* recipe declared but never used
2026-01-19 22:39:15 +00:00
Pyritie
624d7de7e0 change fern loot tables to add straw 2026-01-19 22:15:56 +00:00
Pyritie
9df19277c6 bloomery update 2026-01-14 22:37:22 +00:00
Pyritie
9153cb084b fixed missing raw oil in blaze burner fuels 2026-01-14 22:33:39 +00:00
Inceitious
882c477037
Feature/drinkable (#2708)
* Drinkable ice slush

* Update thirst value

* Added quests

* Edited some text

* a

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:48:11 -06:00
Pyritie
edd6d3eb51 fix #2687 2026-01-10 22:32:01 +00:00
Pyritie
73b8039ede update grammar of drinkables entry, buff tea a little 2026-01-10 00:07:48 +00:00
Mqrius
5985f389b2
Give Mars tree leaves distance property (#2661)
* Make TFG copies of Mars foliage
They still return the original items.

* Change strophar supports to match item color

* Change soundType to shroomlight

---------

Co-authored-by: Xikaro <os.valerievich@ya.ru>
2026-01-08 16:25:19 -06:00
Pyritie
f4aa5f0614 does this stop the earth bug spawns? 2026-01-07 22:52:42 +00:00
Pyritie
c2503e6b0f update russian field guide ores + langs 2026-01-07 00:27:44 +00:00
Pyritie
53f8443fc0 bumped animal spawns on the moon 2026-01-04 14:46:15 +00:00