Commit graph

5785 commits

Author SHA1 Message Date
Pyritie
28a657494f some leftover items 2025-12-09 18:46:55 +00:00
Pyritie
e66af4ddaa Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-09 15:50:39 +00:00
Pyritie
d10723d5b7 which also means we can get rid of our overrides now 2025-12-09 15:50:36 +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
0db5dd7267 stop this cherry icon from rotting 2025-12-09 15:47:54 +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
7896b5f7fd doubled the durability of space suits 2025-12-09 15:40:22 +00:00
Pyritie
01b78ac088
Merge branch 'main' into dev 2025-12-09 12:26:33 +00:00
Pyritie
c04b3eacb0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-09 12:23:54 +00:00
Pyritie
445809cc87 0.11.10 2025-12-09 12:23:52 +00:00
Pyritie
d45156ef30 adjusted spawn weights for primitive illagers 2025-12-09 11:48:55 +00:00
Pyritie
6cea8ec77b fixed some line breaks in tooltips 2025-12-09 11:48:20 +00:00
Pyritie
904c9389fc langs 2025-12-09 11:35:16 +00:00
Yan
1f6f8a8570
Add Screwdriver to the drums' patchouli page (#2356)
* fix: update mis translations in zh_ch, change Location to 位置

* feat: add Screwdriver to the drums page.

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2025-12-09 10:52:06 +00:00
Redeix
0d75405aee
why doesnt rhino just have classes? (#2355) 2025-12-09 00:11:17 -06: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
961a97f2e2 changelog 2025-12-09 00:00:23 +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
9293d92bcd langs, quests 2025-12-08 22:30:53 +00: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
4e9e94eb45 fix some warnings 2025-12-08 21:18:31 +00:00
Pyritie
0ae9ad4cf4 fix https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/2348 2025-12-08 21:18:25 +00:00
Pyritie
2f24f08cdb added the smart filter quest over here too 2025-12-08 20:58:28 +00:00
Pyritie
752802bacf langs 2025-12-08 20:58:16 +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
d652769ad8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-08 12:41:35 +00:00
Pyritie
bba8ce1396 langs 2025-12-08 12:41:32 +00:00
Pyritie
a8d1bb1505 new venus stuff 2025-12-08 12:35:11 +00:00
Pyritie
042bd9870f remove noisium (apparently it's discontinued because it barely does anything) 2025-12-08 12:31:59 +00:00
Pyritie
15c2031a62 forgot to add this to the last changelist, my bad 2025-12-07 23:16:35 +00:00
Xikaro
e0949ca831
Merge pull request #2343 from TerraFirmaGreg-Team/dev
Release: 0.11.9
2025-12-08 03:08:20 +05:00
Pyritie
702c90d7f2
Merge branch 'main' into dev 2025-12-07 22:06:02 +00:00
Pyritie
d638feae22 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-07 22:02:43 +00:00
Pyritie
4ecbb2debd 0.11.9 2025-12-07 22:02:41 +00:00
TomPlop
40515b4a42
Fix quests (#2342) 2025-12-07 19:18:26 +00:00
Pyritie
dc07bd881d two to one hatches on the coal liquefaction tooltip 2025-12-07 19:08:03 +00:00
Pyritie
ab4bfe8b2f langs 2025-12-07 19:07:26 +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
675833414d some quest tweaks and langs 2025-12-07 18:09:33 +00:00
Pyritie
a55d9a51d2 reorganize some events 2025-12-07 17:42:04 +00:00
Pyritie
5393d09f06 langs 2025-12-07 17:41:55 +00:00
Pyritie
c866c70905 langs 2025-12-07 17:23:19 +00:00