Commit graph

3127 commits

Author SHA1 Message Date
Pyritie
ae7bfba2be langs 2025-12-06 01:34:39 +00:00
Pyritie
706ec2f11b a little more tweakin 2025-12-06 01:19:30 +00:00
Pyritie
9440b40878 tidied some quests, added a new one for ulv supers, langs 2025-12-06 01:05:29 +00:00
Pyritie
deb744ca5e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-06 00:29:11 +00:00
Pyritie
e2d01b6536 add new icon set, thank you cosmic frontiers 2025-12-06 00:29:06 +00:00
Pyritie
095849edb0 fixed some inconsistencies with moon/mars deco plant EGH recipes 2025-12-06 00:23:24 +00:00
Pyritie
a0bc4528eb create:non_movable block tag was missing some things 2025-12-05 20:16:39 +00:00
Mqrius
534cafd236
Remove hydration from freezedried food (#2325)
* Remove hydration from freezedried food

Change all freezedried food to give no hydration. Freezedrying removes all moisture from food, so it shouldn't fix your thirst.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* Remove .meal() from freeze dried fruit

Freeze dried fruit are not dynamic food items so they can't have .meal().  Their hydration is already set to 0 in item creation.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

---------

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-05 09:21:55 +00:00
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
5b612d88fd whoops 2025-12-02 19:49:22 +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
a3096dd5c9 move around some files 2025-12-02 19:20:01 +00:00
Pyritie
1545f19ce6 big refactor of a lot of the recipe files! 2025-12-02 19:12:36 +00:00
Pyritie
0916fd2e21 big tidying of startup scripts! 2025-12-01 23:39:42 +00:00
Pyritie
bda35f7f6c useless recipe 2025-12-01 21:37:16 +00:00
Pyritie
a936958583 fixed warped/crimson trees only growing on mars mycelium and not mars dirt 2025-12-01 18:28:47 +00:00
Pyritie
5ecd67c42d made spring water drinkable 2025-12-01 15:16:16 +00:00
Pyritie
06e7df4cdf changed texture of ME stocking input buses/hatches to match the hulls used to craft them 2025-12-01 15:16:03 +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
Yan
8167daf544
fix: update mis translations in zh_ch, change Location to 位置 (#2310)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2025-12-01 09:58:51 +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
d6cf64c67b turns out jump boost 1 is basically useless 2025-11-30 22:39:05 +00:00
Pyritie
66d3d6338a langs + emi cats for coal_liquefaction_tower 2025-11-30 22:28:33 +00:00
Pyritie
e7e095505e added tooltips for drinks 2025-11-30 22:27:44 +00:00
Pyritie
305287f98c fix drinkable defs for teas 2025-11-30 21:50:02 +00:00
Pyritie
8a5812b831 added effects to gurman drinks 2025-11-30 21:29:29 +00:00
Pyritie
8cd32a0f60 nicer icon for wax tag 2025-11-30 21:29:18 +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
1ce426ffdd added new blubber image 2025-11-30 18:27:19 +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
6d025a8ae1 added extra info to EMI ore vein tab 2025-11-30 15:59:50 +00:00
Pyritie
908c27909a tark tweaks 2025-11-30 15:37:26 +00:00
Pyritie
67f24dc797 added oil spout features 2025-11-30 14:04:33 +00:00
Pyritie
ed6365bc3c quests and langs 2025-11-30 13:40:49 +00:00
Pyritie
4ac7a45e92 remove arc furnace recipes of colored steels, fix some chemistry mistakes 2025-11-30 13:40:42 +00:00
Pyritie
2051750257 made tarkianite more lenient 2025-11-30 12:07:05 +00:00