Commit graph

737 commits

Author SHA1 Message Date
Pyritie
b9e14a46e0 tags for damage types #2868
Related Work Items: #28
2026-02-02 13:50:27 +00:00
Pyritie
fb87520e22 fix concrete dupe #2948, fix other stone recycling recipes 2026-02-02 13:11:12 +00:00
Pyritie
0135b40c95 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 12:23:30 +00:00
Mqrius
bfc385ea8a
Fix method overload (#2946)
There was never actually any overload?
2026-02-02 12:22:24 +00:00
Redeix
961786b8ee
egh update (#2950)
* egh update

* changelog and config

* add spore blossom, remove beneath leaves (those are for mars)

Signed-off-by: Pyritie <pyritie@gmail.com>

* Update tags.beneath.js

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-02-02 12:21:48 +00:00
Pyritie
f92ce6e6df lowered the % of tiny dusts from ores 2026-02-02 12:02:16 +00:00
thederpysockdude123
63b3ad76bb
Added roe to the mealbags whitelist (#2945)
* Added roe to the mealbags whitelist

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* much more epic solution :D

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-02-01 18:18:04 -06:00
Pyritie
8fe763fcce Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 00:07:54 +00:00
thederpysockdude123
92e1c653a6
Added a couple recipes to egh (#2944)
* added a couple recipes to EGH

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* some tag stuff to get it working lol

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-02-01 23:40:16 +00:00
Pyritie
08065dc12a fix raw oil vacuumizer recipe 2026-02-01 23:30:01 +00:00
Pyritie
9228cd7645 change hss-g coils, update mars quests, langs 2026-02-01 22:02:37 +00:00
Pyritie
90d0c8e915 more rockwool for the RTM coils 2026-02-01 20:03:03 +00:00
Pyritie
a74407c10c tidy colors and isotopes 2026-02-01 19:02:40 +00:00
TomPlop
3b3ae9c4f0
Oupsi Oupsi (#2937)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2026-02-01 18:18:26 +00:00
Pyritie
d8bebc627c rename mars food tags 2026-02-01 18:04:33 +00:00
Pyritie
849f6409d5 Merge branch 'dev' into feature/wab-1.4 2026-02-01 17:37:25 +00:00
Pyritie
365acb1e9e recipes and fauna data 2026-02-01 17:21:10 +00:00
TomPlop
50eff2f5b9
Fission energy rework (#2931)
* everything should be fine

* Balance early power (#6)

* balance update

* Add textures

* last balance tweaks

* more balance

* Fix conflicts

* Balance early power (#8)

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* Isotopic solvent stuff (#10)

* push

* fix iconset issue

* adding all the textures change

* add more stuffs

* Push recipes

* new stuffs

* add stuffs

* more changes

* add textures and some recipes

* tons of change

* fix texture

* add textures and other stuffs

* more recipes

* add recycling for fission rods

* more recipes

* fix fluid textures

* comment out FLiBe again and balance rods

* fix fluids

* some latest fix

* fix more texture

* more recipe changes

* more recipes

* some last minute balance changes

* add quests

* fix conflict

* more fixes

* fix components

* var to const

---------

Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
2026-02-01 10:52:11 -06:00
Coox1e
45ac3cb2a4
Added furnace recipe for dead grass to match drying recipe (#2935)
Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>
2026-02-01 12:35:04 +00:00
Inceitious
98241ed899
Bugfix/blast property (#2920)
* Removing blast property

* extractor recipes

* Hid unused molten fluids

* Updated hidden fluids

* Removed molten rocket alloy

* Typo and removed molten desh
2026-01-31 14:43:47 -06:00
GameStar
8b1403031e
double rockets (#2910)
* first things

* yes

* legally distinct rockets

* Update tags.js

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-31 14:42:37 -06:00
Pyritie
34c4bb5fb4 stuff and things 2026-01-31 18:50:46 +00:00
Pyritie
5a43e40aa4 removed armor welding bonus cuz it's complicated #2841 2026-01-31 14:50:18 +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
328241e593 change small wood gear to lumber instead of sticks 2026-01-30 22:51:58 +00:00
Pyritie
0d64c4df4f #2876 2026-01-30 00:47:38 +00:00
Pyritie
a0085fa56b fix #2905 2026-01-29 23:50:17 +00:00
Pyritie
79a169de20 added different oil spouts, changed ore veins a little 2026-01-29 23:35:02 +00:00
Pyritie
941c5848a3 #2862 sedimentary carbonate dust to flux 2026-01-29 12:21:30 +00:00
Pyritie
af398a45d8 #2900 add shapeless recipes to convert old stone dusts into new 2026-01-29 12:17:47 +00:00
Pyritie
6c8931300a pakku, fix lv hermetic casing typo 2026-01-28 23:04:44 +00:00
Pyritie
22262aac78 alternative for lv hermetic casing 2026-01-28 00:21:42 +00:00
Pyritie
b4fd0e023f fix the recipe of pressing nothing into fluix gems 2026-01-28 00:04:49 +00:00
Pyritie
edad4cc7e4 fix chorus fruit in greenhouse 2026-01-27 23:42:29 +00:00
Coox1e
941c22ff92
Pure fertilizer utility patch (#2884)
* Added pure fertilizers at 100%

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

* Changed pure compost recipes to match their updated value

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

* Changed pure recipes to LV

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

---------

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>
2026-01-27 14:56:24 -06:00
Pyritie
9b31d2439a move PE to MV, langs, tweak some quests and add another MV phenolic board recipe 2026-01-27 01:12:22 +00:00
Pyritie
f324e7e6da
New content for ULV + LV (#2873)
* require black steel plates before the forge hammer, add some blue steel things post-deployer that require a colored steel anvil, start refractory clay dust

* first draft of bakelite, new phenolic boards, new cupro coils

* add another page to the medicine quest

* cl

* backup of lv quests

* quest stuff and some recipe tweaks

* tweak

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-26 18:10:22 -06:00
Paradalope
1190408623
Update data.equipment.js (#2872)
name of the branch, adds the resistances for the lavaproof blue steel boots (not the diving boots), which were previously missing.
2026-01-26 18:05:48 -06: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
6f55cde40f steam alloy smelter glass batch recipes #2853 2026-01-25 16:58:06 +00:00
Pyritie
77f52551f2 fix steel dupe via steel supports 2026-01-24 16:09:50 +00:00
Pyritie
80f2354480 fix kaolinite recipe conflict 2026-01-24 13:59:30 +00:00
Pyritie
a844e50284 drinkable concrete 2026-01-23 21:31:48 +00:00
Pyritie
2167fcdb6a fix #2827
Related Work Items: #28
2026-01-23 20:22:29 +00:00
Pyritie
a183ed64f2 fix mossy cobble not collapsing 2026-01-23 20:16:41 +00:00
Pyritie
5f064b841f make gt oreproc much faster (except the thermafuge) 2026-01-22 23:01:36 +00:00
Pyritie
2f90e7ad2b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-21 23:30:20 +00:00
Pyritie
48d2e0b479 delete sylvite 2026-01-21 23:30:13 +00:00
Pyritie
1e42ed442a
. (#2796) 2026-01-21 22:40:31 +00:00