Commit graph

6449 commits

Author SHA1 Message Date
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
Pyritie
e9e6530a61 fix large miners and deepslate/red granite loot tables 2026-01-24 15:27:11 +00:00
Pyritie
80f2354480 fix kaolinite recipe conflict 2026-01-24 13:59:30 +00:00
Pyritie
7a3648e17c Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-23 22:31:48 +00:00
Pyritie
5052714c84 fix gt glass lens 2026-01-23 22:31:46 +00:00
Pyritie
13bc6a26e6
Merge branch 'main' into dev 2026-01-23 21:36:34 +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
Pyritie
e4fe7ee8ea 0.11.18 2026-01-23 21:33:36 +00:00
Pyritie
a844e50284 drinkable concrete 2026-01-23 21:31:48 +00:00
Pyritie
8d17dca5c6 move saltpeter chem reactor to a circuit 2026-01-23 21:12:18 +00:00
Pyritie
8fba57695e fix drinks giving too much hydration 2026-01-23 21:10:24 +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
2167fcdb6a fix #2827
Related Work Items: #28
2026-01-23 20:22:29 +00:00
Pyritie
a183ed64f2 fix mossy cobble not collapsing 2026-01-23 20:16:41 +00:00
Pyritie
a23919d54b fix broken field guide, skull emoji 2026-01-23 20:11:34 +00:00
Pyritie
9b4adec5a0 langs 2026-01-23 19:46:47 +00:00
Pyritie
53ab136758 add create stock bridge, add missing recipes for certus/fluix deco blocks 2026-01-23 01:43:41 +00:00
Pyritie
6ce28447f5 bump up moon animal spawns a bit 2026-01-23 00:49:57 +00:00
Pyritie
046b8f464f let's buff horsepower because fuck water wheels 2026-01-22 23:54:50 +00:00
Pyritie
5f064b841f make gt oreproc much faster (except the thermafuge) 2026-01-22 23:01:36 +00:00
Pyritie
0838fab0bd pakku, changelog 2026-01-22 22:42:59 +00:00
Pyritie
2ee4a8cf3c tweak oil textures 2026-01-22 22:42:50 +00:00
Pyritie
3412188f58 langs 2026-01-22 21:12:47 +00:00
Pyritie
cc8dc5d12a #2803
Related Work Items: #20
2026-01-22 21:04:17 +00:00