958 Commits

Author SHA1 Message Date
8283a8c285 Port gregitas certus to waffer chain 2026-03-23 10:28:32 +01:00
Pyritie
793f22202c add replaceme blocks for the heat exchanger 2026-03-21 23:39:40 +00:00
TomPlop
10e6a0d950 Remove the Heat Exchanger (#3500)
* move heat exchanger to core

* add deprecetad heat exchanger

* forgot quests change

* oups

* fix titanium requiring nichrome coils

* temp
2026-03-21 14:45:04 -04:00
Sakura
74b951af3c added all missing gem slurries (#3501) 2026-03-21 14:38:35 -04:00
Pyritie
805153cb5b remove invar saw as well 2026-03-19 20:09:09 +00:00
Pyritie
971c13f42b put arsenic bronze on the ice saw blacklist 2026-03-19 20:08:03 +00:00
Sakura
d48caceb7d SNR Fixes and ALT Menu Improvement (#3462)
* Upload tfg_excludes.zip and recipe.removes.js

* Rest of the changes
2026-03-19 02:00:45 +00:00
TomPlop
a7ce921321 Add more slurries and balance boilers (#3460)
* More changes on slurries

* more stuffs for slurries

* more slurries

* Nerf Silicon Carbide duration

* fix quests and add circuit to gem slurries

* remove gt boiler

* try to fix lang repo

* fix a lot of stuffs
2026-03-19 00:28:49 +00:00
Sakura
c2d392c7ac Copycat Pressure Plates and Recycling (#3463) 2026-03-18 12:30:29 -05:00
Pyritie
df2e52d524 tin smelting changes 2026-03-17 15:23:54 +00:00
Pyritie
a5628ade21 fix rene-41 but for realsies 2026-03-17 15:23:17 +00:00
Pyritie
a5a74ac4b2 fix rene-41 mol conservation #3446 2026-03-17 15:17:03 +00:00
DrEthan77
62b64d0054 Added correct tag (#3445) 2026-03-17 12:34:47 +00:00
Pyritie
69de82464e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-16 14:37:12 +00:00
Pyritie
03ae7e13ae komatiite should crush into red sand, not white 2026-03-15 22:52:54 +00:00
Ujhik
18d3b9e4b5 feat: Added bison and seal loottable and bison raw and cooked meats (#3396)
* feat: Added bison and seal loottable and bison raw and cooked meats

* fix: lang in tools and bison meat in rich stock and as burguer meat
2026-03-14 12:23:29 -05:00
Pyritie
9727aa3169 lower some fluid temps 2026-03-14 00:38:54 +00:00
TomPlop
441fac9f7b langfile and ilmenite 2026-03-13 16:56:06 -04: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
Mqrius
795b476ec6 Fix jam sandwich food processor recipes (#3390) 2026-03-12 19:37:34 -05:00
Pyritie
47e9e25723 like this #3365 2026-03-12 17:03:53 +00:00
TomPlop
a6c3951c6f fix_screwdriver_recipes 2026-03-11 15:24:28 -04:00
DrEthan77
51ce6625cb Spindle Rework (#3345)
* Initial Commit

I basically cloned how the rod mold was added and adapted it to be the spindle head.
Ive gotten everything except how to add a tag to fluid copper and how to actually make the casting recipe work.

* Response to PR comments

Merged all recipes into the recipes.cloth file, and added anvil and casting recipes.
2026-03-10 15:07:41 -05:00
Sakura
05240f4fe0 KubeJS update for Latest Steam 'n' Rails (#3340) 2026-03-10 00:04:53 +01:00
Oleksandr Mazur
e74502d50f Fix: made separate LCR/CR aluminium sulfate recipes and sodium sulfate electrolyzer path (#3302)
* Fix: made separate LCR/CR aluminium sulfate recipes and sodium sulfate electrolyzer path

* Removed sodium sulfate electrolyzer recipe and enabled decomposition instead

* Update material.recipes.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
2026-03-08 16:44:38 +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
360d2ddbf8 add missing durability multiplier to stone, flint, arsenic bronze, and steel 2026-03-08 11:07:52 +00:00
TomPlop
2573910613 Fix tools (#3329)
* update pakku

* fix recipe id

* fixes

* fix duplicate on server

* fix tools

* hide neutronium
2026-03-08 11:03:16 +00:00
Mqrius
e46740ac72 Pull constant from TFGMaterialFlags (#3330)
Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2026-03-08 10:46:50 +00:00
Pyritie
0a0fd52d58 fixes some tool stuff 2026-03-07 18:33:16 +00:00
Pyritie
c1ec0e6b9c add arsenic bronze tools for illagers 2026-03-07 16:29:37 +00:00
Pyritie
33157e66c1 comment 2026-03-07 15:14:55 +00:00
Pyritie
9bf29df8ad fixes missing knife-related crafting recipes, fixes uncraftable flint tools #3291 2026-03-07 15:06:11 +00:00
Tipy
718fa107a2 Various fixes (#3288)
* A typo in the meat tag has been fixed.

Typo in the tag for meat from the wan_ancient_beasts mod has been fixed; meat can now once again be used to lure the entity from wan_ancient_beasts.

Signed-off-by: Tipy <105522881+Tipy4@users.noreply.github.com>

* Fixed the crafting recipe for two items.

bitwise_xnor_gate and morered:hexidecrubrometer have circuit 5

Signed-off-by: Tipy <105522881+Tipy4@users.noreply.github.com>

* fix(kubejs/space_general): fixed the recipe for tfg:aes_insulation_sheet (roll → 9 sheets unpacking) and separated circuit (0/1) to remove the recipe conflict.

fix(kubejs/space_general): fixed the recipe for tfg:aes_insulation_sheet (roll → 9 sheets unpacking) and separated circuit (0/1) to remove the recipe conflict.

Signed-off-by: Tipy <105522881+Tipy4@users.noreply.github.com>

* Fixed the recipeId butraldehyde → butyraldehyde in ADD_CIRCUIT, so the circuit now applies to the correct recipe.

Fixed the recipeId butraldehyde → butyraldehyde in ADD_CIRCUIT, so the circuit now applies to the correct recipe.

Signed-off-by: Tipy <105522881+Tipy4@users.noreply.github.com>

* Replaced flibe with tfg:flibe in material components → removed WARN not a known Material.

Replaced flibe with tfg:flibe in material components → removed WARN not a known Material.

Signed-off-by: Tipy <105522881+Tipy4@users.noreply.github.com>

---------

Signed-off-by: Tipy <105522881+Tipy4@users.noreply.github.com>
2026-03-06 23:19:28 +00:00
Mqrius
c005769ed5 Fix NPE when foxes eat food with return item (#3277) 2026-03-06 09:23:39 +00:00
Pyritie
b71c188475 move desh cooling to hv chem bath, fix the wrong rock dust for perlite, fix aluminum sulfate missing its chemical formula 2026-03-06 00:32:26 +00:00
Pyritie
7ce66645ef added tags for wire cutter heads 2026-03-05 23:35:50 +00:00
Pyritie
c92abffe4a add back c&a accumulator 2026-03-05 22:47:32 +00:00
Pyritie
825accd13b fix startup crash 2026-03-05 22:36:21 +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
Sakura
9f6e7eda4b Create: Copycats+ Integration (#3232)
* Create: Copycats+ Integration

* pakku

* changelog spelling

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: Redeix <redeix.m@gmail.com>
2026-03-01 20:43:28 -06:00
lysteryale
10ea0c7ccf Vintage Alcohols (#3233)
* Vintage Alcohols

Vintage Alcohols without langs since im scared

* Update drinks.json
2026-03-01 20:20:37 -06:00
Redeix
66b1804c3e tool changes (#3192) 2026-02-25 04:14:23 -06:00
Gustavo
f0c813f2d5 Datagen (#3045)
* casings

* removed gen assets

* remove more blockstates

* move sample rack

* growth monitor

* remove sand piles

* remove duplicate JSON

* remove fish roe

* remove duplicate models

* remove more duplicate models

* add uhv universal circuit back

* "fix" fluix trim

* fix typo on tooltip

* fix egh casing

* add missing inactive hydroponics casing textures

* un-"fix" the fluix trim

* remove whatever a "mars snow pile" is, fix volcanic ash

* fix volcanic ash

* tags for volcanic ash

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2026-02-24 13:56:54 +00:00
Pyritie
dd4f142d2f gurman update 2026-02-22 22:53:14 +00:00
Pyritie
5acad92e54 fix some tongs melting into unobtainable materials #3145 2026-02-22 13:56:26 +00:00
Pyritie
0590e97b25 don't know why you can't just electrolyze this, it's simple enough 2026-02-21 14:28:12 +00:00
Pyritie
c86ea8fd5e fix #3099 2026-02-21 13:31:40 +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