Commit graph

1997 commits

Author SHA1 Message Date
Pyritie
77fbe3003b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-03 23:05:18 +00:00
Pyritie
8cdce5c826 fixed small wrought iron gear melting into wrought iron and not cast iron 2025-12-03 23:05:14 +00:00
applenper
f900e517af
Tallow and fish oil changes for 0.11.9 (#2318)
* reverted tallowate to fish oil, added tallow to biodiesel recipe, removed tallow to fish oil recipe

* added tallow boiler recipe, buffed fish oil extraction from fish

* added tallow to firmalife:oils

* added tallow ethanol and methanol biodiesel recipes
2025-12-03 13:16:52 +00:00
Jeuv
c5ca371764
Reworked the Reinforced Hang Glider (#2314)
* Reinforced glider recipes

Made the reinforced hang glider cheaper (late LV) + added assembler recipes to repair it

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>

* Update quest book

Update the quest book entry for the Reinforced Hang Glider, to go with the new recipes.

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>

* Revert "Update quest book"

This reverts commit 933170c412414c7034d641216fff3359efab935e.

---------

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-03 01:27:32 +00:00
Pyritie
cc47fe55ce big tag/data refactor 2025-12-03 00:32:14 +00:00
Pyritie
a7aef94e01 fix moon helium depleted yield being bigger than the minimum yield 2025-12-02 19:36:38 +00:00
Pyritie
d9774c2dda move over some seed oils 2025-12-02 19:33:31 +00:00
Pyritie
1545f19ce6 big refactor of a lot of the recipe files! 2025-12-02 19:12:36 +00:00
Pyritie
bda35f7f6c useless recipe 2025-12-01 21:37:16 +00:00
Pyritie
5ecd67c42d made spring water drinkable 2025-12-01 15:16:16 +00:00
Pyritie
5a9c671384 remove stocks from any_water tag 2025-12-01 14:59:53 +00:00
Pyritie
adfea6d7bb added brewery recipes for LV syngas 2025-12-01 14:58:14 +00:00
Pyritie
0c566a045a added back old OLA recipes for now 2025-12-01 14:58:01 +00:00
Pyritie
aa22fda898 swapping OLA from gtceu to tfg namespace, some cleanup, langs 2025-12-01 14:38:48 +00:00
TomPlop
72ae40a2b4
Rework Early Game Fuel (#2309)
* Add materials and multiblock

* try to fix conflict

* Fix conflict

* Fix conflict

* Rework tungsten line (#5)

* fix materials

* Update Ostrum to core

* Fix conflict

* fix conflict

* Fix fucking conflict

* Upload more changes

* Add more things

* Introduce new gas fuel

* Add Anthracite

* Add Syngas early game and more modifications

* More fixes

* Add textures to fluid
2025-12-01 13:42:45 +00:00
Spicy Noodles
616a146246
Perfect Tungsten Line Looping (#2267)
* Fix soda ash looping

* Rebalance tungstic acid quantity

* Update tungsten line quests to reflect changes

* Factor in the remaining 1B oxygen

* Revert quest changes

* Keep base GT salt -> sodium bicarbonate

---------

Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-12-01 10:01:26 +00:00
Tyler
b655e00823
expand the Facade Whitelist (#2299)
* expand the Facade Whitelist

1. add Reconstituted Stone blocks (likely missing due to oversight)
2. fixes Domum Ornamentum Bricks missing (due to a typo)

Both groups seem intended to be whitelisted. Of the variants, only the "normal" Reconstituted Stone is already whitelisted (due to being a **storage block**).

This PR adds each missing Reconstituted Stone variant individually, but using `forge` or `minecraft` tags for stone/bricks (rather than the `tfc` tag) may be better. I'm unfamiliar with the best & recommended practices.

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>

* Update tags.facades.js

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>

* add Reconstituted Stone blocks

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>

---------

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>
2025-12-01 00:36:25 +00:00
Pyritie
53c5a20489
TFC Gurman integration (#2298)
* started working on tfc-gurman integration

* updated recipes, should be mostly good now?

* pizza adjustments

* meal bag tags

* ugh these crafting table foods are gonna take 5ever

* milk curdling and automation for new cheeses

* moved these

* Update tags.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-12-01 00:35:55 +00:00
Pyritie
8a5812b831 added effects to gurman drinks 2025-11-30 21:29:29 +00:00
Pyritie
bea681b44c fix typo with cooked toxlacanth not counting as meat 2025-11-30 18:44:13 +00:00
Pyritie
a44092f73f why was this 6 anyway? 2025-11-30 18:38:31 +00:00
Pyritie
fa21019c38 add flint clubs to tool racks #2308 2025-11-30 18:22:46 +00:00
Pyritie
d1d7c859ba fix #2305, also buffed its loot 2025-11-30 18:21:05 +00:00
Pyritie
c3017574b3 adding tooltips to lots of item/fluid containers 2025-11-30 17:46:53 +00:00
Pyritie
67f24dc797 added oil spout features 2025-11-30 14:04:33 +00:00
Pyritie
4ac7a45e92 remove arc furnace recipes of colored steels, fix some chemistry mistakes 2025-11-30 13:40:42 +00:00
Pyritie
7b2d0c827b update tfc ambiental 2025-11-30 11:59:17 +00:00
Pyritie
57ee808716 increased the amount of fat in the world 2025-11-29 23:27:55 +00:00
applenper
2788f9bbc9
changed coloured blast steel recipes to be mv (#2306) 2025-11-29 19:43:52 +00:00
Spicy Noodles
9a119a6692
Zirconium balancing (#2307) 2025-11-29 19:41:52 +00:00
Pyritie
24bb4ba266 why is the ae2 ingredient buffer so expensive? 2025-11-29 11:14:29 +00:00
Pyritie
1ef4d4ae72 tweak empty fuel rod recipe 2025-11-29 10:57:41 +00:00
Pyritie
929262415a fix summoned endermen dying in space 2025-11-29 10:54:00 +00:00
Pyritie
d779c5c92e tarkianite vein 2025-11-29 01:01:38 +00:00
Pyritie
930082492f removed duplicate analog lever recipe 2025-11-28 17:06:18 +00:00
Pyritie
4cac603d75 remove oilsands VI centrifuging 2025-11-28 16:56:59 +00:00
Pyritie
a09aa72fa7 add food proc recipe for cocoa butter, fix #2287 2025-11-28 10:56:36 +00:00
Pyritie
657f626a12 add raw and light oil to blaze burners, add them both + cooking oils to gt boilers 2025-11-28 10:35:29 +00:00
Pyritie
b4e779113e fix some typos 2025-11-27 23:56:23 +00:00
Pyritie
662bc0a087 oil in a small boiler! 2025-11-27 23:56:15 +00:00
Pyritie
5cebe94c03 fix typo 2025-11-27 16:37:34 +00:00
Pyritie
7a0b734411 ok so those were null for a reason 2025-11-27 13:24:50 +00:00
Pyritie
655a2010a5 and for diorite... 2025-11-27 13:02:42 +00:00
Pyritie
00582deaec fix typos with new backpack upgrade changes 2025-11-27 12:48:18 +00:00
Pyritie
245ed94c8a fix empty outputs for macerating andesite stairs 2025-11-27 12:17:00 +00:00
Pyritie
acd28dc04d fix #2294 and #2295 2025-11-27 12:03:39 +00:00
Pyritie
b83fac89b7 remove old boiler balancing 2025-11-27 00:53:09 +00:00
Pyritie
f4a4cfc94d fixed some norite items crushing into nothing 2025-11-27 00:26:40 +00:00
Pyritie
67a2e9355f remove dangling greate wax recipes for vanilla honey + blocks 2025-11-27 00:00:53 +00:00
Morgan Arnold
849b1ac1c8
Update gating of Sophisticated Backpacks upgrades (#2282)
* Update gating of Sophisticated Backpacks upgrades

This commit makes the pickup upgrade and the advanced pickup upgrade from Sophisticated Backpacks accessible at LV. It also makes the magnet upgrade and the advanced magnet upgrade harder to obtain, requiring MV.

Signed-off-by: Morgan Arnold <62062835+CrashAndSideburns@users.noreply.github.com>

* Move pickup upgrade to ULV, magnet upgrade to LV

Signed-off-by: Morgan Arnold <62062835+CrashAndSideburns@users.noreply.github.com>

---------

Signed-off-by: Morgan Arnold <62062835+CrashAndSideburns@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-11-24 15:14:17 -06:00