Commit graph

277 commits

Author SHA1 Message Date
Pyritie
260851074c
Feature/venus stone ores (#2961)
* langs

* fix veins

* missing knapping textures

* rename ignimbrite features

* new ores

* feature stuff

* entity tweaks
2026-02-02 23:42:42 +00:00
Pyritie
b3f43feeb3 figured out how to do emissives finally 2026-02-02 16:34:11 +00:00
Pyritie
19bf4de976 gurman update 2026-02-02 14:54:21 +00:00
Pyritie
9228cd7645 change hss-g coils, update mars quests, langs 2026-02-01 22:02:37 +00:00
Pyritie
41bfc7397c update veins 2026-02-01 18:02:34 +00:00
Pyritie
40ddd4f30e field guide for new mobs 2026-02-01 16:53:05 +00:00
Pyritie
e90cccbcc8 mars quartzite, fix tetramethoxysilane #2898 2026-01-31 14:27:25 +00:00
Pyritie
61ec1c6356 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-31 11:03:04 +00:00
Pyritie
6048c27421 some more vexxed textures 2026-01-30 22:51:46 +00:00
Yan
00e5a9b85f
Update zh_cn translation for patchouli_book of corps and bloomery (#2911)
* feat: update zh_cn translation for new drinkings

* feat: update zh_cn lang for patchouli book

* feat: update zh_cn translation for tfg patchouli_book

* feat: update zh_cn for patchouli_book corps and bloomery

* fix: fix conflicts

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-30 12:19:48 +00:00
Pyritie
79a169de20 added different oil spouts, changed ore veins a little 2026-01-29 23:35:02 +00:00
Pyritie
52f686c179 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-28 23:05:17 +00:00
Yan
025921aece
Update zh_cn translation for tfg patchouli book (#2894)
* feat: update zh_cn translation for new drinkings

* feat: update zh_cn lang for patchouli book

* feat: update zh_cn translation for tfg patchouli_book

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-28 20:59:46 +00:00
Petr211071
f0a2f56510
Ru ru translation (#2893)
* Delete Bread

* Blast furnace and bloomery
2026-01-28 20:58:29 +00:00
Pyritie
18566753fd Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-27 21:16:22 +00:00
TanJeeSchuan
32e4e90759
Feature/crop index (#2849)
* Add anchors to sunflower, canola, and flax crop entries

Added to the sunflower, canola, and flax sections in the crops Patchouli book entry.

* Add Crop Index entry to Patchouli field guide

Introduces a new 'Crop Index' entry in the  field guide, listing all crops alphabetically with clickable links

* Update crop index entry text

* Remove Crop Index Section

* Add contents section to crops Patchouli entry

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-27 14:58:24 -06:00
Pyritie
cd7926a333 bloomery block -> doors 2026-01-27 02:42:32 +00:00
Yan
d84e79abb0
Update zh_cn lang for patchouli book (#2861)
* feat: update zh_cn translation for new drinkings

* feat: update zh_cn lang for patchouli book

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-26 02:39:04 +00:00
Pyritie
8a9ecd9fdf Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-23 21:33:39 +00:00
Petr211071
1581cd3b1a
Field guide improvments (#2829)
* add read_by_default

* Add TFG crops

* Fruits and crops translation

* Earth and Mars indexes

* Create drinks.json
2026-01-23 14:34:24 -06:00
Pyritie
a23919d54b fix broken field guide, skull emoji 2026-01-23 20:11:34 +00:00
Pyritie
0e916944e5 russian ore vein tooltips 2026-01-22 00:31:03 +00:00
Pyritie
48d2e0b479 delete sylvite 2026-01-21 23:30:13 +00:00
Pyritie
f554ad64e7 langs 2026-01-19 23:07:17 +00:00
Petr211071
5f4a16d8d8
Ru ru translation (#2758)
* Sticky resin

* Add lang files and translation for irrigation

* TFG's AFC chapter tranlastion

* ArborFirmaCraft and Rnr

* Some translation

* Fix outdated chapter

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-17 12:42:59 +00:00
Pyritie
9df19277c6 bloomery update 2026-01-14 22:37:22 +00:00
Pyritie
2e10938e1c
Refactor of material recipes (#2732)
* refactor

* phew

* drive-by fix

* all done I think

* cleaned up some lines that didn't do anything, added more comments, removed log spam
2026-01-14 21:36:52 +00:00
MetenBouldry
b94347d9e1
Translate book uk_ua (#2743)
* Translate Book

Ukraine

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Delete basic_automation.json

* Up Translate

* Translate Book

* Delete kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/infinite_resources.json

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

* Delete kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/beneath/burpflower.json

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

* Translate Book uk_ua

* Del

* Book

Restructuring of the book

* Update book uk_ua

* Update primitive_alloys.json

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>

* Fix typo in blast furnace entry text

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>

* Update bloomery.json

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-14 12:34:50 -06:00
Pyritie
a27fe966a8 langs 2026-01-12 13:28:47 +00:00
Yan
05cc0a8a59
feat: update zh_cn translation for new drinkings (#2721)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-12 09:09:26 +00:00
Inceitious
882c477037
Feature/drinkable (#2708)
* Drinkable ice slush

* Update thirst value

* Added quests

* Edited some text

* a

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:48:11 -06: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
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
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
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
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
e57e1cff59 fix some warnings 2026-01-05 12:28:57 +00:00
Yan
0c56f0e7a8
feat: update zh_cn translation (#2623)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-04 23:45:29 -06:00