Commit Graph

2525 Commits

Author SHA1 Message Date
Bumperdo09
fe3cd9f3bb Factory gauge crafting uses diode tag (#3353) 2026-03-10 02:12:26 +00:00
Sakura
05240f4fe0 KubeJS update for Latest Steam 'n' Rails (#3340) 2026-03-10 00:04:53 +01:00
Mqrius
280d04550f Nowhere is safe 2026-03-09 21:08:57 +01:00
Mqrius
cdc72ae3af Dolphin Murder Commit 2026-03-09 20:59:28 +01:00
Pyritie
0493dbdf28 balances the sulfur in igneous felsic so it's not an infinite source of it 2026-03-08 19:35:26 +00:00
Pyritie
3fecaa822b mineable tags #3243 2026-03-08 18:34:50 +00:00
Pyritie
76eaf5903e fix wrong recipes for factory gauges 2026-03-08 18:08:35 +00:00
TomPlop
fa17907740 Fix rtm coil (#3338) 2026-03-08 13:56:47 -04:00
Pyritie
93e73b8da7 let obsidian be picked up with any tool 2026-03-08 17:54:35 +00:00
Pyritie
852df88ffd some ice tags 2026-03-08 17:54:25 +00:00
Pyritie
63bfaa6b5b fix #3298 2026-03-08 17:53:30 +00:00
Pyritie
366313b58e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-08 17:22:57 +00:00
Pyritie
05a5ada088 add zeolite as a water purifier too 2026-03-08 17:22:54 +00:00
Pyritie
397113e734 hide these 2026-03-08 17:01:42 +00:00
Pyritie
7f06e29c7c fixed a chemical imbalance and I decided I don't want this HV replacement for polysilicon 2026-03-08 16:46:16 +00:00
Pyritie
a736393055 suevite is now only from sky stone 2026-03-08 16:45:49 +00: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
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
Sakura
b8042c8f57 Added upgrade and repair recipes (#3296) 2026-03-07 20:26:59 -06:00
Pyritie
c1ec0e6b9c add arsenic bronze tools for illagers 2026-03-07 16:29:37 +00:00
Pyritie
bfc78c38fa add circuits to concrete recipes #3264 2026-03-07 15:46:01 +00:00
Pyritie
9bf29df8ad fixes missing knife-related crafting recipes, fixes uncraftable flint tools #3291 2026-03-07 15:06:11 +00:00
Pyritie
cc17e8dbe1 digger helmet upgrades 2026-03-07 14:32:15 +00:00
Pyritie
dcc5e44ec2 diamond tools use fabricator tags 2026-03-07 14:31:56 +00:00
Pyritie
05dcfe0cb2 new digger helmet recipes for #2604 2026-03-07 13:57:53 +00:00
Pyritie
567e08d58e pakku update, reverting knife change 2026-03-07 13:39:22 +00:00
Pyritie
6f7e57557d change accumulator recipe 2026-03-07 13:29:23 +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
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
Mqrius
cc5ae24cd3 Add #forge tags to fluids we want to replace (#3278) 2026-03-06 14:39:27 +00:00
Tipy
33bd5ec3a0 Fix craft gun Freedom in recipes.guns.js (#3279)
Signed-off-by: Tipy <105522881+Tipy4@users.noreply.github.com>
2026-03-06 14:06:52 +00:00
Pyritie
d02173a14d some missing recipes 2026-03-06 01:21:06 +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
c92abffe4a add back c&a accumulator 2026-03-05 22:47:32 +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
840335d637 Fix #3230 (#3242)
* Create: Copycats+ Integration

* pakku

* changelog spelling

* Fix #3230

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: Redeix <redeix.m@gmail.com>
2026-03-02 12:16:54 -06: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
Pyritie
d8e6a0ffd5 remove backpack from illager boss 2026-03-01 12:08:15 +00:00
Pyritie
6f204aadd1 oops sorry ujhik 2026-02-28 20:51:40 +00:00
Pyritie
d698517993 #3194
Related Work Items: #31
2026-02-28 18:11:01 +00:00
Pyritie
a9d9f51e3a #3222 2026-02-28 18:09:24 +00:00
Inceitious
ac0a505506 output (#3220) 2026-02-28 14:00:50 +00:00
Inceitious
a3d578eda5 Bugfix/wood refactor (#3211)
* Removed duplicate trapdoor recipe from beneath

* Removed duplicate beneath door

* Consistency

* Added stairs support from lumber to beneath, removed redundant code for bamboo

* Added more recycling recipes

* Added assembler and chisel support for mosaic

* Stonecutting recipe
2026-02-27 12:11:19 -06:00
TreyR9
c325c577db Add optional recipes for Create: Extra Gauges (#3159)
* Update main_server_script.js

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

* Add gauge recipes

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

* made it optional

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

* Code cleanup

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

* Update recipes.js formatting

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

---------

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
2026-02-27 09:57:20 +01:00
Redeix
66b1804c3e tool changes (#3192) 2026-02-25 04:14:23 -06:00
Mqrius
2c987f3b33 Floaty drum tags (#3189)
Co-authored-by: Redeix <redeix.m@gmail.com>
2026-02-24 20:26:13 -06:00
rosenlied-historia
3658dc5cc0 Add Bakelite based recipes for ULV/LV hatches/buses (#3177)
* Add Bakelite recipes for ULV/LV hatches/buses

Costs scaled based on other plastics for ULV/LV and based on MV 576L Bakelite hatch cost.

Signed-off-by: rosenlied-historia <misaki_hirano@sfu.ca>

* Fixed typo

Signed-off-by: rosenlied-historia <liliumconcordia@proton.me>

---------

Signed-off-by: rosenlied-historia <misaki_hirano@sfu.ca>
Signed-off-by: rosenlied-historia <liliumconcordia@proton.me>
2026-02-24 14:40:15 +00: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