Commit Graph

2572 Commits

Author SHA1 Message Date
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
Sakura
5b75941cde additional recipes for pre-lv (#3484) 2026-03-20 14:38:21 -05: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
Pyritie
d5ce44e892 fix bronzes #3470 2026-03-19 18:34:19 +00:00
Danya
0cb614d2ce Added recycling recipes for GT Fluid/Item Hatch/Bus. LV -> IV (#3470)
* recycling recipes for bus/hatch

* +space
2026-03-19 12:27:51 -05:00
Pyritie
70d71475de Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-19 02:01:53 +00:00
Pyritie
9aafa9bcdf plen 2026-03-19 02:00:56 +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
Pyritie
879794678f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-03-19 01:37:25 +00:00
Pyritie
62962c46ca planes 2026-03-19 01:35:02 +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
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
Sakura
c2d392c7ac Copycat Pressure Plates and Recycling (#3463) 2026-03-18 12:30:29 -05: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
Pyritie
a1c0c163e9 fix some suevite recipes #3432 2026-03-16 14:51:39 +00:00
Pyritie
f4666002b8 another attempt to fix shipping containers on contraptions 2026-03-16 14:39:04 +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
63ac0011b6 fix hv voltage coils 2026-03-16 14:37:07 +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
Spicy Noodles
b0b6fcbb10 Add aircraft assembler recipes (#3410) 2026-03-15 13:13:12 -05: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
62b30d7196 #3402 2026-03-13 23:24:27 +00:00
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
Pyritie
9475aeacae slime ball 2026-03-13 21:22:12 +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
Sakura
1da44cfe62 TFC Jams use Sweeteners (#3362)
* TFC Jams now take Sweetener instead of Sugar

Signed-off-by: Sakura <sakura.kitsurugi@proton.me>

* moved code location

Signed-off-by: Sakura <sakura.kitsurugi@proton.me>

---------

Signed-off-by: Sakura <sakura.kitsurugi@proton.me>
2026-03-12 16:45:55 -05:00
Pyritie
ade116eade #3376 phantom silk is now dark cloth 2026-03-12 20:34:31 +00:00
Mqrius
aca9bb135d Fix arsenic bronze loot drops (#3386) 2026-03-12 19:12:57 +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
Thomasx0
81e8ca0bd8 repair back PR: #2770 (#3360)
Consumes Wool Hat/ Silk Cowl
2026-03-10 14:54:07 +00:00
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