Commit graph

5806 commits

Author SHA1 Message Date
Redeix
29f4d54af3
Tags (#2385)
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-12-11 17:37:22 -06:00
Pyritie
e85d833bce improved tooltips, added boots 2025-12-11 01:10:31 +00:00
Pyritie
183c071f17 changed requirements for cleanroom quest 2025-12-11 00:58:26 +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
ab1fb30b85 change mv plastic quests to accept liquids 2025-12-10 23:36:23 +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
a6f8024aee some different icons for things 2025-12-10 23:28:51 +00:00
Pyritie
8541c99ab0 langs 2025-12-10 23:22:37 +00:00
Pyritie
5be37dc97f tooltips and tags for more hot/cold/light stuff 2025-12-10 23:22:23 +00:00
Pyritie
c668d32ffa maybe overpowered bastion scythe 2025-12-10 23:02:28 +00:00
Pyritie
9f6c342e8d better warning icons 2025-12-10 21:42:28 +00:00
Pyritie
ba7c2b3403
Update CHANGELOG.md
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-12-10 09:23:17 +00:00
Pyritie
99a55f9855
Update CHANGELOG.md
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-12-10 09:20:05 +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
068466301b mob effect icons + langs 2025-12-10 01:08:09 +00:00
Pyritie
f653703615 tags for hotornot 2025-12-09 18:51:02 +00:00
Pyritie
30cfcbff81 well no wonder this wasn't working 2025-12-09 18:47:08 +00:00
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