Commit graph

2046 commits

Author SHA1 Message Date
Pyritie
2a61036c5b fix cobalt brass illager tools missing properties 2025-12-13 15:13:01 +00:00
Pyritie
e5a4a356b3 remove c&a accumulator 2025-12-13 14:47:35 +00: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
73d7bd46ed whoops 2025-12-13 03:01:08 +00:00
Pyritie
a65289562d new belts! 2025-12-13 03:00:58 +00:00
Pyritie
a9017c622a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-12 22:10:38 +00:00
Epicificator
2a9f70e35e
add acetic acid and vinegar conversion (#2390)
* add acetic acid and vinegar conversion

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* add circuit condition to prevent conflicting with dye recipes

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* changed machine to mixer, and voltage tier to mv

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

---------

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>
2025-12-12 15:35:44 -06:00
Pyritie
a9613b372f remove logging 2025-12-11 23:44:25 +00:00
Pyritie
e85d833bce improved tooltips, added boots 2025-12-11 01:10:31 +00:00
Pyritie
1ed6ffb51f added machine recipes for tongs 2025-12-11 00:45:22 +00:00
Pyritie
3f8bd83a1a fixed some dupes? 2025-12-11 00:43:31 +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
Pyritie
5be37dc97f tooltips and tags for more hot/cold/light stuff 2025-12-10 23:22:23 +00:00
Redeix
bb9c0b608c
A bunch of random stuff (#2365) 2025-12-10 01:53:28 -06:00
Pyritie
ebb7fecf20 improvements to the hot or not levitation 2025-12-10 01:08:27 +00:00
Pyritie
f653703615 tags for hotornot 2025-12-09 18:51:02 +00: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
a06e877943 fix #2339 2025-12-08 21:52:57 +00:00
Pyritie
811cf2766f move venus fluids into core 2025-12-08 19:53:36 +00:00
Pyritie
dd1463acdf update to forge 47.4.13, fix aged sake, fix cleanroom doors, fix butyraldehyde 2025-12-08 19:36:35 +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
0f49fcf056 old 2025-12-07 18:36:38 +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
a1226ae80b add venus biomes to create picky wheels whitelist 2025-12-06 16:54:45 +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
a457746781 inf fire for venus 2025-12-06 15:51:34 +00:00
Pyritie
285755707a whoops 2025-12-06 15:51:20 +00:00
Pyritie
f2f2722c98 hide binding chains 2025-12-06 15:18:06 +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
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