Commit Graph

519 Commits

Author SHA1 Message Date
Pyritie
50129ba34a oopsie woopsie 2026-03-13 22:24:54 +00:00
Pyritie
c9e7f3f5c4 repair kit refactor 2026-03-13 22:15:01 +00:00
TomPlop
eff455714c Add Large boilers and repair kit to dev (#3395)
* boiler and repair kit (#3367)

* boiler and repair kit

* update pakku

* fix recipe id

* fixes

* fix duplicate on server

* add boiler stuffs

* Repair Kit and Boilers

* bug

* more fixes

* more fixes

* Small tweaks and increase cost Steel Pipe Casing

* We gucci (#3387)

* fix

* Add a way to craft repair kit

* add recipes for boiler

* hv dynamo hatch and new recipes

* add depreciated

* Add repair kit textures and modify recipes for LST

* add langfile

* missing langfile

* Add new quests

* fix repair kit texture

* add unfired repair kit

* fix typo

* fixes
2026-03-13 20:32:00 +00:00
Pyritie
3fecaa822b mineable tags #3243 2026-03-08 18:34:50 +00:00
Sakura
0db2cae9d5 Initial EMI++ Implementation (#3285)
* Initial EMI++ Implementation, still WIP

* oops, old file

* Code refactor; additional groups

* Separated gtceu:molds into 2 types

* Added missing tags to a few mods

* Added tags to 2 tfc addons

* Brick tag fix; all brick blocks go to one group

* en_US lang file

* small fixes; tfg aqueducts are now tfc

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-03-08 15:04:43 +00:00
Pyritie
bfc78c38fa add circuits to concrete recipes #3264 2026-03-07 15:46:01 +00:00
TomPlop
9e8635c694 Fix circuits and add modification function (#3282)
* new function

* Add modify fluid just in case

* Fix circuits and add the new function to modify recipes

* more fixes
2026-03-06 17:14:16 +00:00
Pyritie
6214f4b36b Feature/mv hv rework (#3270)
* Material stat rework tool (#3040)

* first push

* add hidden tag

* Update branch (#3125)

* Add Turbine Rotors (#13)

* first push

* add hidden tag

* Add Turbine Rotors

* fix capitalization

* Inconel 718 (#14)

* fixed typo in LV initial quest (#3055)

Signed-off-by: Eilandor <eilandor@ukr.net>

* add inconel and every recipes

* Add TiCl and Nerfs to energy (#3063)

---------

Signed-off-by: Eilandor <eilandor@ukr.net>
Co-authored-by: Eilandor <eilandor@ukr.net>

* small balance

* add all the materials for MoSiB

* add mo 50 re

* Add the fix with Forge Graddle I'm lost

* weird stuffs

---------

Signed-off-by: Eilandor <eilandor@ukr.net>
Co-authored-by: Eilandor <eilandor@ukr.net>

* Feature/material stats (#3136)

* Add Turbine Rotors (#13)

* first push

* add hidden tag

* Add Turbine Rotors

* fix capitalization

* Inconel 718 (#14)

* fixed typo in LV initial quest (#3055)

Signed-off-by: Eilandor <eilandor@ukr.net>

* add inconel and every recipes

* Add TiCl and Nerfs to energy (#3063)

---------

Signed-off-by: Eilandor <eilandor@ukr.net>
Co-authored-by: Eilandor <eilandor@ukr.net>

* small balance

* add all the materials for MoSiB

* add mo 50 re

* Add the fix with Forge Graddle I'm lost

* weird stuffs

* start adding sic

* fix cutter

* fix

* fix conflict

* fix names

---------

Signed-off-by: Eilandor <eilandor@ukr.net>
Co-authored-by: Eilandor <eilandor@ukr.net>

* add gt modern utilities

* Feature/mv hv rework (#3144)

* Finally all the tools are working

* plunger

* revert change on tool function

* fix numerous call

* no coffe yet

* Mv hv rework redstone fluid (reopened because git moment) (#3049)

* Redstone Etching Fluid

* region comments

* oops, acid might be acidic

* .customStill() for redstone tri p-toluenesulfonate

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* sillycon stuff

* rearranged material + modification files

* added missing mortars

* item tag models for tools

* add config for gtmutils

* change how electric tools are made, so it's based off flags

* Feature/mv hv rework (#3160)

* Finally all the tools are working

* plunger

* revert change on tool function

* fix numerous call

* no coffe yet

* trying to pin point the issue

* merge issue

* cast iron

* merge issue

* cast iron

* ok

* fix conflict

* some fast fix

* Kanthal Coil and swap PE to SR for circuits components

* small update to MV Chapter

* change colors of sterling silver and rose gold

* Add Ceramic Circuit board (#3163)

* Finally all the tools are working

* plunger

* revert change on tool function

* fix numerous call

* no coffe yet

* trying to pin point the issue

* merge issue

* cast iron

* merge issue

* cast iron

* ok

* fix conflict

* some fast fix

* Kanthal Coil and swap PE to SR for circuits components

* small update to MV Chapter

* add ceramic circuit board sic

* add quartz crucible

* stuff

* mostly done with recipes for boules

* Solders to mv hv rework (#3168)

* Add new solders

* Refactor circuit recipes

* Use GT Thallium

* Clarify no tin alternative in ZPM

* Remaining assembly line recipes

* Make processes more interestinger

* Add dusty lorandite

* lang

* Hide higher tier solder

* Fix merge weirdness

---------

Co-authored-by: Xikaro <os.valerievich@yandex.ru>

* Feature/mv hv rework (#3171)

* Finally all the tools are working

* plunger

* revert change on tool function

* fix numerous call

* no coffe yet

* trying to pin point the issue

* merge issue

* cast iron

* merge issue

* cast iron

* ok

* fix conflict

* some fast fix

* Kanthal Coil and swap PE to SR for circuits components

* small update to MV Chapter

* add ceramic circuit board sic

* Add a whole lot

* fix

* enable mo_si_b

* casing change

* it can't require kanthal coils to cook if it's a kanthal coil ingredient

* recipes + boule texture

* more stuff for the boule-inator

* fix circuits/change gas fuel for non renewable Reformate/fix gem slurries

* change reformate

* add tag to lens

* tags for precision fab

* fix boule tags, formatting

* tweak coils a little, more to come

* Add Artisan Table recipes and MV Chapter rework (#3216)

* add glass lens

* Artisan table and MV Chapter

* change rockets and space suits, add sic_sic and move stuffs around

* cleanroom more expensive/fix rods/fix ultimet/adding fluids

* add desh tempered for HV coils

* fix cleanroom

* lower cleanroom cost

* Add Mo50Re to the rocket engine

* Change Desh and Armacolite

* nichrome coil stuff

* make ore proc use more water

* perlite to distilled

* add alloy smelter recipe for rubber using sulfur power as well

* fix typo

* Change to rutile

* etching fluids

* Fix a lot of stuffs (#3234)

* lots

* change circuit board

* Remove that one that isn't necessary

* Des trucs

* That was hard to fix

* More quests stuffs

* Add MoSiB Line

* fix

* oups

* class artisan table

* Add Rocket Insulation T1

* Adding SiC SiC

* Add Rocket Insulation T1 (#3247)

* Add Rocket Insulation T1

* Adding SiC SiC

* Fix for Fluid Pipes

* Fluid pipe rework stat to be determined yet

* Prepare the field for removing item pipes

* removed some random pipes to test

* Add SiC Rotors and some changes to Material Stats

* fix no damage on tool

* buff materials damage by 2

* Buff tools

* Hide plastic soft hammer

* remove plunger too

* remove the transition item

* remove useless tag and add some langfile

* SiC SiC and many small things - buff tools (#3253)

* Add SiC Rotors and some changes to Material Stats

* fix no damage on tool

* buff materials damage by 2

* Buff tools

* Hide plastic soft hammer

* remove plunger too

* remove the transition item

* remove useless tag and add some langfile

* more langfile

* Add MV Quests

* new langfile for HV

* new quests

* fix quests

* fix the board lang

* Lots of quests stuffs (#3258)

* Add MV Quests

* new langfile for HV

* new quests

* fix quests

* fix the board lang

* Add fluids and fix circuits

* fix circuit boards

* water boiler

* Small changes to exotic materials

* diamond tipped tools

* diamond tipped tools - lang part 1

* remove quartz crucible to core

* Finish GTModern Utilities Integration for now

* Allow the ability to craft the inert furnace

* add some quest fix

* cleanup material files

* fix merge conflict

---------

Signed-off-by: Eilandor <eilandor@ukr.net>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Mqrius <Nuntius.Marii@Gmail.com>
Co-authored-by: Eilandor <eilandor@ukr.net>
Co-authored-by: Xtrial-01 <fenek.pantofelek@gmail.com>
Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@yandex.ru>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2026-03-05 22:27:44 +00:00
Pyritie
d698517993 #3194
Related Work Items: #31
2026-02-28 18:11:01 +00:00
Pyritie
7ac349ad06 remove some base stone dust concrete recipes in favour of our stone dusts tag 2026-02-23 01:04:26 +00:00
Inceitious
8caf6c3ca8 Bugfix/refactor wood (#3155)
* Shifted this to recipes.wood

* Hot fix

* Removed as unnecessary

* Removed recipes for treated wood items

* Recycling support for more items and removed duplicate recipes for planks
2026-02-22 20:59:28 +00:00
TomPlop
876bae9605 Ammo oil (#3137)
* buff ammo shells

* Fix Heavy oil not being distillable at LV
2026-02-21 17:41:45 +00:00
Pyritie
e986dba59d change hv cutter to ultimet instead of diamond, fix recycling 2026-02-21 15:58:19 +00:00
Pyritie
f56a2c3f20 add a way to convert annealed copper back into regular 2026-02-21 15:58:02 +00:00
TomPlop
66cee6d192 Fast fix (#3126)
* Fix Abs recipe

* Fix ABS

* more small fixes
2026-02-21 01:27:59 +00:00
Pyritie
85a6548d9a make a bunch of quests optional, remove steam extractor 2026-02-18 20:24:44 +00:00
Inceitious
d12b776e81 Refactor/wood (#3002)
* Need to organise this better next time

* Shifted

* Need to rewrite this in the future

* Adding events

* First iteration

* Revert back to iriginal

* Added global tag

* Consolidated the recycling index

TODO: Fix the amount of dust it gives, 1 log gives 4 dust, but 2 planks (equivalent of 1 log) gives 16 dust...

* Bamboo lumber

* Remove unnecessary recipes

* bamboo lumber

* 2nd reiteration

* Improved sprite

* TFG Mosaic Wood Builder

* Indentation

* Removed displayname
2026-02-18 09:31:30 +00:00
Pyritie
3a0c104936 swap spout recipe from rubber foils to plates 2026-02-16 14:16:24 +00:00
Nebby
a7a01a96b7 High Tier saws can silk harvest ice (#3019)
* High Tier saws can silk harvest packed ice

* Update changelog
2026-02-10 11:53:48 +00:00
Pyritie
7d0868379e fix #3003 2026-02-08 12:53:44 +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
92a4574c88 fix a dupe with hp steam miners/rock breakers 2026-02-03 11:50:05 +00:00
Pyritie
f678f084d4 fix recycling of laser cable 2026-02-02 18:23:28 +00:00
Pyritie
dd3e90f428 fix recycling for laser pipes 2026-02-02 15:11:54 +00:00
Pyritie
fb87520e22 fix concrete dupe #2948, fix other stone recycling recipes 2026-02-02 13:11:12 +00:00
Pyritie
952370e6da actually removes a bunch of recycling recipes for disabled items 2026-02-02 00:46:48 +00:00
Pyritie
e7eaef730f clean out some more missing recipe removals 2026-02-02 00:07:51 +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
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
Pyritie
c30ebf249b add kinetic bridge #2881, pakku 2026-01-31 15:24:40 +00:00
Pyritie
d4da49043a #2913 fixes missing heat data for some tag prefixes 2026-01-31 14:49:06 +00:00
Pyritie
03d5ba581b add gt magnet quest to lv 2026-01-27 14:23:10 +00: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
Pyritie
5052714c84 fix gt glass lens 2026-01-23 22:31:46 +00:00
Pyritie
65daa7cddb remove any other stone dust recipes 2026-01-22 20:57:47 +00:00
Pyritie
40fedfa17e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-22 20:37:28 +00:00
Pyritie
feda51f459 some glass alloy smelter unification 2026-01-22 20:32:06 +00:00
thederpysockdude123
07058f77e7 added Ad Astra airlock to valid cleanroom doors (#2808)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-22 19:02:59 +00:00
thederpysockdude123
df03ccbeb7 removed netherrack dust centrifuging that doesn't actually exist (#2804)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-22 17:54:23 +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
88eee093be #2740 and #2759 2026-01-19 22:21:06 +00:00
Pyritie
7df74b47b3 fixed recycling issues from the material rewrite, updated everything to the new recycling helper method 2026-01-18 14:30:55 +00:00
Pyritie
ac426c01c2 minor spelling mistake 2026-01-15 22:59:57 +00:00
Pyritie
e3a365fa84 who is peat and why does he have a use? 2026-01-15 22:58:10 +00:00
Pyritie
2e10938e1c Refactor of material recipes (#2732)
* refactor

* phew

* drive-by fix

* all done I think

* cleaned up some lines that didn't do anything, added more comments, removed log spam
2026-01-14 21:36:52 +00:00
Inceitious
8c6551dda6 Feature/tidying recipes (#2733)
* Added tags to support recycling

* Cleaned up recipe bloat for recycling

* Merged loops

* Remove constant

* Remove constant

* I think this is what you mean

* Updated tags

* Sorry!

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-14 13:04:59 -06:00
Pyritie
241b80a4a0 migrate everything over to linuxUnfucker() 2026-01-12 15:32:18 +00:00
Pyritie
e74043472d cleanup this recycling file 2026-01-12 14:53:58 +00:00
Inceitious
563bf2306a Incorrect tiering for extractor for Bis and Black Bronze (#2684)
* Incorrect tiering for extractor for Bis and Black Bronze

Bismuth Bronze and Black Bronze wrong tiering in extractor
Added some documentation

* Update recipes.materials.js

* Updated

* Updated

* Unified tiering

* Revert "Unified tiering"

This reverts commit ea9e00d2bca8f70c2f95bb1362766edcc9e29498.

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:46:10 -06:00