Commit graph

996 commits

Author SHA1 Message Date
Pyritie
7636a38223 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-11 12:27:29 +00:00
Pyritie
6c59adbcf7 langs 2026-01-11 12:27:27 +00:00
Redeix
900e1de8e9
The big green PR (#2694)
* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* firmalife gh stuff

* chloroplasts and brick regex

* gh recipes

* pisciculture fishery

* I am going insane

* more casings = more gooder

* rotten voiding cover

* greenhouse glory

* Is this it chat

* not needed

Signed-off-by: Redeix <redeix.m@gmail.com>

* missed in conflicts

Signed-off-by: Redeix <redeix.m@gmail.com>

* consumerism

* re-add tag import

* remove unused object map

* id normalizer function

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-10 19:30:46 -06:00
Pyritie
334e435042 adjusted mars wind volume 2026-01-10 22:29:53 +00:00
Pyritie
515461560e changed blood lily to be visible all year-round (as well as in the beneath) 2026-01-10 18:41:54 +00:00
Pyritie
6b778d7ab1 langs 2026-01-10 11:55:56 +00:00
Pyritie
a1450016d3 langs 2026-01-10 00:40:47 +00:00
Pyritie
4b85045325 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-10 00:18:14 +00:00
Pyritie
73b8039ede update grammar of drinkables entry, buff tea a little 2026-01-10 00:07:48 +00:00
Petr211071
12a5e96f55
Ru ru translation (#2692)
* Sticky resin

* Add lang files and translation for irrigation

* TFG's AFC chapter tranlastion

* ArborFirmaCraft and Rnr

* Some translation

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-09 17:57:12 -06:00
FlightingFalcon
ece7a39b89
Added Drinks Entry (#2676)
* Update hazards.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Create drinks

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Rename drinks to drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

---------

Signed-off-by: FlightingFalcon <100160941@ccisd.net>
2026-01-09 22:53:54 +00:00
thederpysockdude123
fc80829058
Add files via upload (#2686)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-09 16:10:26 +00:00
Petr211071
b26bc60132
ru_ru update (#2679)
* Sticky resin

* Add lang files and translation for irrigation

* TFG's AFC chapter tranlastion

* ArborFirmaCraft and Rnr

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-09 08:38:32 +00:00
Petr211071
45c28807e2
Ru_Ru sticky resin (#2663)
* Sticky resin

* Add lang files and translation for irrigation
2026-01-08 10:42:59 +00:00
Yan
fddf28c13a
Fix category of tfg_tips/mars_tree_index from tfc:arborfirmacraft to tfc:tfg_tips (#2652)
* feat: update zh_cn patchouli books

* fix: fix category of tfg_tips/mars_tree_index from tfc:arborfirmacraft to tfc:tfg_tips

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-07 13:45:29 +00:00
Yan
6c1905558b
feat: update zh_cn patchouli books (#2644)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-07 09:27:15 +00:00
Pyritie
c2503e6b0f update russian field guide ores + langs 2026-01-07 00:27:44 +00:00
Pyritie
9ad5fe7b2d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-06 20:28:55 +00:00
Petr211071
5b1a78d92e
ru_ru translation update (and fix typo in space crops) (#2636)
* Update ru_ru dairy

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Few fixes and a bit ru_ru translation

* ru_ru translation update

* Fix typo

* ru_ru translation update

* Change Thorium back to thorinite

* Add ru_ru for categories

And change name of space crops chapter for better fitting

* ТориАнит

* ru_ru update

* Add Red Granite

* Fire brick

Replace gtceu:compressed_fireclay with tfc:ceramic/unfired_fire_brick

* typo

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-06 19:57:23 +00:00
Pyritie
65e4e9d6a3 character encoding idk? thanks git 2026-01-06 17:22:13 +00:00
Pyritie
068a3a2c1d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-06 17:21:42 +00:00
Pyritie
7e9957c000 langs 2026-01-06 17:21:30 +00:00
Jeuv
5eaa31d14f
Add Tree Indices to the TFC Guidebook (#2638)
* Added Earth Trees Index

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

* Added Mars Tree Index

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

* Fix corkscrew willow name

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

---------

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>
2026-01-06 11:14:29 -06:00
GameStar
930c06c847
basic pie charts for the ores (#2640)
* mini fixes

* pie charts for all the ores
2026-01-06 16:51:47 +00:00
Pyritie
48dff7e414 fix blockstate texture of steam fuser 2026-01-06 16:06:22 +00:00
Pyritie
8c77b72369 add some invisible blockstates to flax, rapeseed, and sunflowers, so they render properly in the EGH 2026-01-06 14:17:50 +00:00
Pyritie
d0c8bc4f61 buff crucible to 32 ingots instead of 28, standardize tooltip of small vessel #2634, langs 2026-01-06 10:20:11 +00:00
Pyritie
2b3808092e langs + field guide 2026-01-05 14:03:47 +00:00
Pyritie
d686c18336 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 12:43:43 +00:00
Pyritie
9cdd11646c quest tweaks + langs 2026-01-05 12:43:40 +00:00
Pyritie
e57e1cff59 fix some warnings 2026-01-05 12:28:57 +00:00
Pyritie
45aca7793c age=7 doesn't exist 2026-01-05 12:27:08 +00:00
Pyritie
71ad3bf3aa langs 2026-01-05 12:22:02 +00:00
Yan
0c56f0e7a8
feat: update zh_cn translation (#2623)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-04 23:45:29 -06:00
Pyritie
b50c48c035 rename the beneath boat entry 2026-01-05 02:07:20 +00:00
Petr211071
4b97a0164c
ru_ru translation update (#2622)
* Update arborfirmacraft.json

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Update beneath.json

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Marsian trees

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* remove burn warning

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

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-05 01:57:00 +00:00
Pyritie
772d859d4b changelog, langs 2026-01-05 01:42:06 +00:00
Pyritie
919bbbf0a4 DA NETHERLANDS 2026-01-05 01:22:44 +00:00
Pyritie
c9f1a8dcf5 fix filter on gurman recipes since they're still broken, tweak blast furnace tips section 2026-01-05 01:09:47 +00:00
Pyritie
f804638592 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 00:09:40 +00:00
Pyritie
434a36d0b8 added new radioactive hazard effect, langs 2026-01-04 23:59:55 +00:00
Petr211071
6aa8c08bce
FAQ field guide changes (#2618)
* Update ru_ru dairy

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Few fixes and a bit ru_ru translation

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-04 15:36:48 -06:00
Pyritie
451441f4ca langs 2026-01-04 14:54:31 +00:00
Pyritie
62c75985a6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-04 12:33:33 +00:00
Yan
481a3f028a
Update zh_cn translation for patchouli book (#2607)
* fix: update mis translations in zh_ch, change Location to 位置

* feat: add Screwdriver to the drums page.

* fix: update zh_cn translation for Blust Furnace Insulation

* fix: rename Chinese translation for

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-04 03:02:43 +00:00
Petr211071
194af1202a
Update ru_ru dairy (#2606)
Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-04 03:00:43 +00:00
Pyritie
11ca916b45 fix red sandstone again lol 2026-01-03 17:53:33 +00:00
Pyritie
e42db7c5f9 red sandstone stuff 2026-01-03 16:46:46 +00:00
Pyritie
d1aa8aff47 merge 2026-01-03 14:54:50 +00:00
Petr211071
28d24e91f0
Sns's field guide chapter ru_ru translation (#2599)
* Sns ru_ru translation

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Sns category ru translation

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Delete mob net page

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Delete sns's lunchbox page

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-03 14:53:05 +00:00