Commit graph

851 commits

Author SHA1 Message Date
Pyritie
6862c7a7d4 langs 2025-12-13 22:27:26 +00:00
Pyritie
546c598bc4 add item models for pills 2025-12-13 22:12:14 +00:00
Pyritie
22ed55306a electric greenhouse renderer 2025-12-13 18:11:56 +00:00
Redeix
35a14ab62c
particles (#2401) 2025-12-13 11:59:20 +00:00
Pyritie
a65289562d new belts! 2025-12-13 03:00:58 +00:00
Pyritie
24bd4b9fca langs 2025-12-12 22:11:14 +00:00
Pyritie
e85d833bce improved tooltips, added boots 2025-12-11 01:10:31 +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
8541c99ab0 langs 2025-12-10 23:22:37 +00:00
Pyritie
9f6c342e8d better warning icons 2025-12-10 21:42:28 +00:00
Redeix
bb9c0b608c
A bunch of random stuff (#2365) 2025-12-10 01:53:28 -06:00
Pyritie
068466301b mob effect icons + langs 2025-12-10 01:08:09 +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
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
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
9293d92bcd langs, quests 2025-12-08 22:30:53 +00:00
Pyritie
0ae9ad4cf4 fix https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/2348 2025-12-08 21:18:25 +00:00
Pyritie
752802bacf langs 2025-12-08 20:58:16 +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
ab4bfe8b2f langs 2025-12-07 19:07:26 +00:00
Pyritie
675833414d some quest tweaks and langs 2025-12-07 18:09:33 +00:00
Pyritie
5393d09f06 langs 2025-12-07 17:41:55 +00:00
Pyritie
c866c70905 langs 2025-12-07 17:23:19 +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
902fb3b1fe Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-07 15:13:30 +00:00
Pyritie
781eacbb6f increase indicator depth of mica vein, swap indicators of graphite and coal veins 2025-12-07 15:13:27 +00:00
Pyritie
e903731aa3 langs 2025-12-07 15:09:07 +00:00
Petr211071
d19f4ad3e9
Fix ru translation of primitive_alloys.json (#2337)
Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2025-12-06 19:40:18 +00:00
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
e2d01b6536 add new icon set, thank you cosmic frontiers 2025-12-06 00:29:06 +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
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
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
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
Pyritie
66d3d6338a langs + emi cats for coal_liquefaction_tower 2025-11-30 22:28:33 +00:00
Pyritie
8cd32a0f60 nicer icon for wax tag 2025-11-30 21:29:18 +00:00
Pyritie
1ce426ffdd added new blubber image 2025-11-30 18:27:19 +00:00
Pyritie
6d025a8ae1 added extra info to EMI ore vein tab 2025-11-30 15:59:50 +00:00
Pyritie
ed6365bc3c quests and langs 2025-11-30 13:40:49 +00:00
Pyritie
f9626427b6 langs 2025-11-29 23:36:11 +00:00
Pyritie
34866230ba remove tfc-gurman field guide pages 2025-11-29 10:44:43 +00:00
Pyritie
d779c5c92e tarkianite vein 2025-11-29 01:01:38 +00:00
Pyritie
c522c23214 swap boiler emi tab order 2025-11-28 10:35:11 +00:00