857 Commits

Author SHA1 Message Date
Pyritie
194d664fd7 boiler conversion 2026-03-22 00:03:46 +00:00
Pyritie
a1cb6a4ad2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-22 00:02:26 +00:00
Pyritie
793f22202c add replaceme blocks for the heat exchanger 2026-03-21 23:39:40 +00:00
Sakura
111452cae8 Opal Slurry (#3503)
* opal slurry

* funny byproduct
2026-03-21 23:37:30 +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
Spicy Noodles
25772e1c8c Make redstone etching fluid consistent with GT dusts (#3486)
Co-authored-by: TomPlop <tomdidome@gmail.com>
2026-03-21 13:41:18 -05:00
Sakura
74b951af3c added all missing gem slurries (#3501) 2026-03-21 14:38:35 -04:00
Gustavo
8f179fe2ef Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-21 16:41:06 +11:00
Gustavo
68e0cdd688 fix switch statement 2026-03-21 16:41:00 +11:00
Danya
577522fa88 item drop (Dry ice) (#3480)
* recycling recipes for bus/hatch

* +space

* add drop for dry ice

* loot table for dry ice

* remove trash
2026-03-19 23:03:52 -05: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
Pyritie
05f4050aef undo f9c627b22e 2026-03-18 23:15:27 +00:00
lysteryale
3a4b639a5a add tag to vintage alcohols (#3464)
added tfg:alcohols to vintage alcohols
2026-03-18 19:03:01 +00:00
Spicy Noodles
f9c627b22e Allow tfc bricks to stonecut into other brick variants (#3431)
* Allow tfc bricks to stonecut into other brick variants

* Use proper ID
2026-03-18 11:41:36 +00:00
Ujhik
ffe1b6cc0d feat: lemming, jerboa, mongoose loot (#3452) 2026-03-17 21:40:15 +00:00
Pyritie
df2e52d524 tin smelting changes 2026-03-17 15:23:54 +00:00
Pyritie
a5a74ac4b2 fix rene-41 mol conservation #3446 2026-03-17 15:17:03 +00:00
Pyritie
6a1dc6d243 fix chorus insulation implosion compressor recipe #3411 2026-03-17 14:55:40 +00:00
Pyritie
82e54b43f9 cleaned up a bunch of stonecutter recipes, fixed suevite macerating #3156 2026-03-17 14:53:10 +00:00
Pyritie
102d1433e2 this should make them craftable I think? 2026-03-16 14:56:00 +00:00
TomPlop
c9ee749329 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-16 10:32:16 -04:00
TomPlop
80fbf7324e fix cuircuit conflicts 2026-03-16 10:32:14 -04: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
8d9ac8a3de Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-14 13:06:40 +00:00
Pyritie
c8005e0eb1 some more blocks for gt facades 2026-03-14 11:27:05 +00:00
Mqrius
211e55e21f Remove both milling and crushing recipes (#3403)
Adding to crushing is handled automatically by Greate's integration
2026-03-14 10:21:03 +00:00
Pyritie
80db1c20ff remove weak inconel 718 to nugget recipe #3400 2026-03-13 23:25:45 +00:00
Pyritie
c9e7f3f5c4 repair kit refactor 2026-03-13 22:15:01 +00:00
TomPlop
fb6fe7856e fix diamond tipped tools and add assembler 2026-03-13 16:47:11 -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
ade116eade #3376 phantom silk is now dark cloth 2026-03-12 20:34:31 +00:00
TomPlop
c87a8beeb5 exclude_diamond_tipped 2026-03-11 15:23:13 -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
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
TomPlop
fa17907740 Fix rtm coil (#3338) 2026-03-08 13:56:47 -04: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
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
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