Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,472 Commits 4 Branches 84 Tags
783a87b2ff2fca786d6164c1b400e34065d65bdf
Commit Graph

6472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pyritie
783a87b2ff fix #2909 2026-01-29 23:50:11 +00:00
Pyritie
79a169de20 added different oil spouts, changed ore veins a little 2026-01-29 23:35:02 +00:00
Pyritie
941c5848a3 #2862 sedimentary carbonate dust to flux 2026-01-29 12:21:30 +00:00
Pyritie
af398a45d8 #2900 add shapeless recipes to convert old stone dusts into new 2026-01-29 12:17:47 +00:00
Pyritie
a3cbbc0dcf Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-29 12:07:52 +00:00
Pyritie
e080411447 fix #2899 2026-01-29 12:07:47 +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
Pyritie
34039b2517 langs 2026-01-28 23:05:13 +00:00
Pyritie
6c8931300a pakku, fix lv hermetic casing typo 2026-01-28 23:04:44 +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
ashlen
5504e548eb feat: add food automation quest (#2888) 2026-01-28 00:55:19 +00:00
Pyritie
ec477c70d8 flying up high enough now sends you into orbit 2026-01-28 00:54:03 +00:00
Pyritie
22262aac78 alternative for lv hermetic casing 2026-01-28 00:21:42 +00:00
Pyritie
b4fd0e023f fix the recipe of pressing nothing into fluix gems 2026-01-28 00:04:49 +00:00
Pyritie
989d572eb9 gurman updates 2026-01-27 23:42:34 +00:00
Pyritie
edad4cc7e4 fix chorus fruit in greenhouse 2026-01-27 23:42: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
Pyritie
68e79a1009 fix belt sander speed to match what's in the ponder 2026-01-27 21:16:19 +00:00
Madeline Vergani
e32a797368 Noodle and Cereal Box icon sets (#2875) 
* Create a new material icon set `noodle` and give it to vanadium

* Create the `cereal_box` material set for ostrum

* Make Osmium Iodide be a cereal box

* Add a model for radioactive hot ingots
 2026-01-27 15:01:05 -06: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
Coox1e
941c22ff92 Pure fertilizer utility patch (#2884) 
* Added pure fertilizers at 100%

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

* Changed pure compost recipes to match their updated value

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

* Changed pure recipes to LV

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

---------

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>
 2026-01-27 14:56:24 -06:00
Pyritie
c0ae890ecf fix dupe with ad astra steel trapdoor 2026-01-27 15:04:48 +00:00
Pyritie
03d5ba581b add gt magnet quest to lv 2026-01-27 14:23:10 +00:00
Pyritie
cd7926a333 bloomery block -> doors 2026-01-27 02:42:32 +00:00
Pyritie
9b31d2439a move PE to MV, langs, tweak some quests and add another MV phenolic board recipe 2026-01-27 01:12:22 +00:00
Pyritie
3d2a5bc962 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-27 00:21:57 +00:00
Pyritie
f324e7e6da New content for ULV + LV (#2873) 
* require black steel plates before the forge hammer, add some blue steel things post-deployer that require a colored steel anvil, start refractory clay dust

* first draft of bakelite, new phenolic boards, new cupro coils

* add another page to the medicine quest

* cl

* backup of lv quests

* quest stuff and some recipe tweaks

* tweak

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
 2026-01-26 18:10:22 -06:00
Paradalope
1190408623 Update data.equipment.js (#2872) 
name of the branch, adds the resistances for the lavaproof blue steel boots (not the diving boots), which were previously missing.
 2026-01-26 18:05:48 -06:00
dependabot[bot]
efb19e9567 Bump actions/checkout from 6.0.1 to 6.0.2 in the dependencies group (#2871) 
Bumps the dependencies group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 6.0.1 to 6.0.2
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-01-26 23:19:23 +00:00
Pyritie
91fa880e82 cl 2026-01-26 13:38:24 +00:00
Pyritie
8e2fa9164d add another page to the medicine quest 2026-01-26 13:31:50 +00:00
Pyritie
25dae7eada langs and emi 2026-01-26 03:55:21 +00:00
Redeix
809bca72cf fix render type and changelog 2026-01-25 20:52:47 -06: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
Redeix
75b0cea000 Artisan Table (#2857) 
* artisan table merging (#2766)

* these should be good

* Update recipes.miscellaneous.js

* little typo

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* fix typo, my bad gang

* fix charnia

* fixed recycling issues from the material rewrite, updated everything to the new recycling helper method

* I'll move these eventually

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* artisan table assets

* asset update

* Update recipes.artisan_table.js

* asset update

* lang

* tag refactor

* waiter! more assets please

* recipes

* done?

* I forgor

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2026-01-25 19:22:50 -06:00
silllil
af57d9a37c changed the colors required for different coloured bricks (#2859) 
Co-authored-by: Lily Oelbeck <lily.alina.oelbeck@stud.th-luebeck.de>
 2026-01-26 00:48:52 +00:00
Pyritie
84368b249c fix music for realsies 2026-01-25 22:21:07 +00:00
Pyritie
4b8b03ebee fixed rolling mill not creating horseshoes 2026-01-25 19:52:33 +00:00
Pyritie
91f41fc8d7 does this fix music? 2026-01-25 18:57:38 +00:00
Pyritie
1f3e72206d put this deprecated tooltip on the FE p2p tunnel 2026-01-25 17:07:25 +00:00
Pyritie
6f55cde40f steam alloy smelter glass batch recipes #2853 2026-01-25 16:58:06 +00:00
Pyritie
2f0b30cede music! 2026-01-24 18:54:53 +00:00
Pyritie
e6a32b5b2e add missing borax recipe, remove some other greate crap 2026-01-24 18:54:48 +00:00
Pyritie
de8695439b merge 2026-01-24 16:11:48 +00:00
Pyritie
77f52551f2 fix steel dupe via steel supports 2026-01-24 16:09:50 +00:00
Pyritie
07bc872b0e update greate, pakku 2026-01-24 15:51:08 +00:00
TanJeeSchuan
32e451eb56 Fix swapped tags for rosin saplings and leaves (#2840) 
* Fix swapped tags for rosin saplings and leaves

Corrected the tags of sapling and leaf items to the 'tfg:rosin_saplings' and 'tfg:rosin_leaves'.

* remove comment

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2026-01-24 15:46:25 +00:00
Pyritie
d89ea91873 make vanadium magnetite meltable #2834 2026-01-24 15:40:33 +00:00
Pyritie
e02c36bb9d fix #2836 
Related Work Items: #28
 2026-01-24 15:28:16 +00:00