Commit graph

580 commits

Author SHA1 Message Date
Pyritie
eb55f20a43 remove modrinth baguettelib, update greate, add vintage improvements kubejs mod, fix all the greate rose quartz namespace changes 2025-12-14 15:35:22 +00:00
Pyritie
fe1b8585da nerfed biomass from vanilla plants, changed honey to sugar to the extractor 2025-12-14 12:37:00 +00:00
Pyritie
40a54fd1ff Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-14 02:30:54 +00:00
Pyritie
316dc2f5fb moved syngas in the vacuumizer to the top #2378
Related Work Items: #23
2025-12-14 02:30:50 +00:00
GameStar
630d39bc78
add first smr boosters (#2381)
* dfgdfgdfgdfg

* molecules

* ran lang merger

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-14 01:57:31 +00:00
Pyritie
e3be7d6d1d medicine rework 2025-12-13 23:30:51 +00:00
Mqrius
c40ffcc0bf
Move boiled eggs to food processor to deconflict with cooked egg, fix pickled egg recipe name typo (#2407)
* Move boiled eggs to food processor to deconflict with cooked egg

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

* Move boiled_egg recipe, fix pickled egg recipe name

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

---------

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-13 20:14:22 +00:00
thederpysockdude123
ea04149a63
updating tags of cover facades/domum ornamentum stuff to include treated wood planks (#2404)
* Updated tags to include treated wood planks.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Updated tags to include treated wood planks.facades.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update tags.facades.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2025-12-13 12:23:25 -06:00
Pyritie
8ed92f17f8 update changelog 2025-12-13 14:10:37 +00:00
Mqrius
4ac447cf62
Add circuit to Silicon Tetrachloride (#2387)
Fixes #2383, deconflicts with Polydimethylsiloxane (and various other recipes!)

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-13 11:57:59 +00:00
Pyritie
a9613b372f remove logging 2025-12-11 23:44:25 +00:00
Pyritie
c0ddacd1cb fix this for nether bricks too 2025-12-10 23:45:17 +00:00
Pyritie
0ec6f5da04 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-10 23:30:00 +00:00
Pyritie
f0db35c0ca fix #2373 2025-12-10 23:29:57 +00:00
Redeix
bb9c0b608c
A bunch of random stuff (#2365) 2025-12-10 01:53:28 -06:00
Pyritie
120d6e1c43 moved drinkable data to the right namespaces, renamed tfcgurman server script dir -> tfc_gurman, moved all alcohols to #tfg:alcohols instead of #tfc:alcohols, because agedalcohols is very fussy 2025-12-09 15:48:42 +00:00
Pyritie
e69ae9ff6d t2 space suit now also gives fire prot - it's not really _needed_, but it does make tfchotornot stop throwing your inventory items away 2025-12-09 15:41:48 +00:00
Pyritie
0b331b98bc moved the blackstone brick recipe 2025-12-09 00:02:06 +00:00
Pyritie
77ae0265e8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-09 00:00:25 +00:00
Pyritie
ffd474608f fix #2353 2025-12-08 23:59:55 +00:00
GameStar
5494a07dbf
Ochem stuff for Fission (#2338)
* molecules

* Update recipes.biochem.js

* will use these later

* update this

* ugh

* lang merger

* Update fructose.json

* iconsets I guess

* Update recipes.nuclear.js

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

* Update recipes.nuclear.js

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-08 23:43:30 +00:00
Pyritie
12c5cb3f8f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-08 22:55:38 +00:00
Pyritie
2e48d81cfb 2 tiny pipes instead of 1 2025-12-08 22:55:25 +00:00
GameStar
3d735015b6
someone forgot a closing brace
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-12-08 16:52:43 -06:00
Pyritie
deb466e801 added temporary workaround for the missing pipe recipes 2025-12-08 22:17:50 +00:00
Pyritie
811cf2766f move venus fluids into core 2025-12-08 19:53:36 +00:00
Pyritie
a8d1bb1505 new venus stuff 2025-12-08 12:35:11 +00:00
Pyritie
d13e933041 added mech crafter recipe for the paving cart, update changelog 2025-12-07 18:42:55 +00:00
Pyritie
a55d9a51d2 reorganize some events 2025-12-07 17:42:04 +00:00
TomPlop
6c4775d58e
Balance early power (#2319)
* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* fix

* add tfg:
2025-12-07 17:05:21 +00:00
Pyritie
be47ec87ac Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-06 15:51:49 +00:00
Pyritie
68a39f00e7 fixes #2333 2025-12-06 15:51:47 +00:00
Pyritie
285755707a whoops 2025-12-06 15:51:20 +00:00
Pyritie
98d993bcb3 give another use to small shards since the primitive guys like to drop them occasionally 2025-12-06 15:17:05 +00:00
Jeuv
c855a7cac9
Replace bronze drums & crates in recipes with new tags containing all 3 bronze drums & crates (#2328)
* Add crates and drums to bronze tag

Add bronze, bismuth bronze, and black bronze crates & drums to their own tag

* Replace bronze crates & drums with the new tag

Replaces all the bronze crates and drum with a tag containing the other 2 bronzes as well.

* Add recipe filtering to replaceInput

Add input-based recipe filtering for the replaceInput for bronze drums & crates. Also add recipe filtering for the recipes that use the moss tag.

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

---------

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-12-05 19:57:48 -06: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
095849edb0 fixed some inconsistencies with moon/mars deco plant EGH recipes 2025-12-06 00:23:24 +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
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
Pyritie
cc47fe55ce big tag/data refactor 2025-12-03 00:32:14 +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
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
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
4ac7a45e92 remove arc furnace recipes of colored steels, fix some chemistry mistakes 2025-11-30 13:40:42 +00:00