Commit graph

6331 commits

Author SHA1 Message Date
Pyritie
bd1efd7d40 #2759 more latex plants 2026-01-19 21:37:30 +00:00
Pyritie
785200eb9c Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-19 14:21:51 +00:00
Pyritie
0a648ac68d remove create additions fluid tags 2026-01-19 14:11:55 +00:00
Pyritie
fb34e947e0 fix overzealous tfc recipe removing 2026-01-19 14:01:59 +00:00
Mqrius
42fa3ba271
Fix backups to hourly again
Got broken in commit fa5c1c6, release 0.11.15
Also removing the free space needed flag.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2026-01-19 12:56:58 +01:00
Pyritie
05ed8cdfe8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-19 11:34:34 +00:00
Inceitious
bb51d1626d
Added beneath wood compat (#2771)
* Added beneath wood compat

* crimson is a softwood

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-19 11:33:47 +00:00
Pyritie
cfa0a14122 #2771 made me check which wood was which, and what the hell happened here 2026-01-19 11:32:50 +00:00
Mqrius
d1f1ff212b Add space foods to tfc:foods 2026-01-18 23:34:31 +01:00
Pyritie
47d44a6b5c tiny cleanup 2026-01-18 16:51:13 +00:00
Pyritie
c60e64ae51 foils are 1/4, not 1/8 2026-01-18 14:49:54 +00:00
Pyritie
bdd741208c merge 2026-01-18 14:31:51 +00:00
Pyritie
7df74b47b3 fixed recycling issues from the material rewrite, updated everything to the new recycling helper method 2026-01-18 14:30:55 +00:00
Pyritie
ba38ab65d7 fix charnia 2026-01-18 13:04:57 +00:00
Pyritie
77c9aa2f46 fix typo, my bad gang 2026-01-18 11:48:26 +00:00
GameStar
7adc25e104
little typo
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2026-01-17 22:04:44 -06:00
Pyritie
99f6981bc0 Merge branch 'main' into dev 2026-01-18 00:57:12 +00:00
Pyritie
e6fc5c67e5 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-18 00:56:46 +00:00
Pyritie
05738e334c removing the glowing from framed glowstone 2026-01-18 00:56:44 +00:00
awfulworldkid
98cd6a74f1
Adds new AE2 smart cable recipe & changes AE2 items to use smart cables (#2756)
* Add smart cable recipe & change recipes to use smart cables

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

* Change a recipe from cable to smart cable

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

* fix smart cable recipes to use tag

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

* see above fix

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

---------

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>
2026-01-17 15:39:18 +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
9e93ce8602 #2753 2026-01-17 12:29:09 +00:00
Pyritie
ed144cb8fe remove WAB structures 2026-01-17 12:00:45 +00:00
Pyritie
7df7e73301 make glowstone mineable with a pick 2026-01-17 11:55:04 +00:00
Pyritie
f02c40fc99 disable electrolsis of clay this way instead 2026-01-17 11:54:53 +00:00
Pyritie
ac426c01c2 minor spelling mistake 2026-01-15 22:59:57 +00:00
Pyritie
e3a365fa84 who is peat and why does he have a use? 2026-01-15 22:58:10 +00:00
Pyritie
e6f7b5e4ee sound tweaks 2026-01-15 22:41:53 +00:00
Pyritie
ec62c392dd fix GENERATE_BELL 2026-01-15 21:31:45 +00:00
Pyritie
02c4479a38 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-15 21:26:28 +00:00
Pyritie
906e0402be pakku update, also add ae2 cosmolite dark theme 2026-01-15 21:26:26 +00:00
Xikaro
4c5c04d6cc Update ranks.snbt 2026-01-15 07:04:48 +05:00
Pyritie
91c65c75f7 added wrapped locometal to facades #2726 2026-01-14 22:43:58 +00:00
Pyritie
9df19277c6 bloomery update 2026-01-14 22:37:22 +00:00
Pyritie
9153cb084b fixed missing raw oil in blaze burner fuels 2026-01-14 22:33:39 +00:00
Pyritie
cff9ab16f1 add portable cells and drums to the railgun blacklist 2026-01-14 21:58:30 +00:00
Pyritie
c5f8fd771b lunchbox 2026-01-14 21:56:05 +00:00
Pyritie
8556a19e3f update pakku 2026-01-14 21:46:34 +00:00
Pyritie
73f232433d fix #2729 2026-01-14 21:42:50 +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
Inceitious
8c6551dda6
Feature/tidying recipes (#2733)
* Added tags to support recycling

* Cleaned up recipe bloat for recycling

* Merged loops

* Remove constant

* Remove constant

* I think this is what you mean

* Updated tags

* Sorry!

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-14 13:04:59 -06: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
Mqrius
c9a2395ee9
Update CHANGELOG.md
Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2026-01-14 11:13:51 +01:00
Maxiffon
2e87d36b4b
Added patchouli translation for the buildinggadgets2 mod (#2737)
* Add files via upload

langs (patchouli_books)

Signed-off-by: Maxiffon <39791678+Maxiffon@users.noreply.github.com>

* Update basics.json

Signed-off-by: Maxiffon <39791678+Maxiffon@users.noreply.github.com>

---------

Signed-off-by: Maxiffon <39791678+Maxiffon@users.noreply.github.com>
2026-01-14 08:32:26 +00:00
Pyritie
e9506d17d0 added some uses to mars charnia, to mirror kelp 2026-01-13 17:33:51 +00:00
Pyritie
a593d40d93 langs 2026-01-13 17:11:08 +00:00
Pyritie
50028491eb update emi categories 2026-01-13 17:10:50 +00:00
Pyritie
ce3c14ae6d remove sylvite 2026-01-13 17:09:08 +00:00
Redeix
e9e4ad90cf
Greenhouse Rework Finishing Touches (#2719)
* asset changes

* recipe changes

* lang and quests

* fixes

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-13 11:11:07 +00:00
Xtrial-01
f7cd09c4a0
hypertube recipe (#2723) 2026-01-12 20:30:58 +00:00