Commit graph

1073 commits

Author SHA1 Message Date
Pyritie
535fe8ff2d fix culling on magma blocks 2026-02-03 21:17:06 +00:00
Pyritie
abef642e66 bunch o venus stuff 2026-02-03 15:51:45 +00:00
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
8a46a01b7c Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 17:44:30 +00:00
Pyritie
af01de9a2c langs 2026-02-02 17:44:28 +00:00
TomPlop
928c7129aa
Heat battery (#2955)
* heat battery and tooltips

* Add tooltip back

* fix tooltip
2026-02-02 17:32:49 +00:00
Pyritie
b3f43feeb3 figured out how to do emissives finally 2026-02-02 16:34:11 +00:00
Pyritie
96951a7b11 fix some warnings 2026-02-02 15:46:57 +00:00
Pyritie
b5bbce607c emi again 2026-02-02 15:25:42 +00:00
Pyritie
ff64df0d1d langs, emi categories 2026-02-02 15:16:00 +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
27cab596a9 add double rocket to quests 2026-02-01 21:07:46 +00:00
Pyritie
79f5afe347 langs, quest for toolbelt 2026-02-01 19:14:16 +00:00
Pyritie
4db618ff37 langs 2026-02-01 19:02:33 +00:00
Pyritie
5872199c7a emi tabs 2026-02-01 18:25:35 +00:00
Pyritie
41bfc7397c update veins 2026-02-01 18:02:34 +00:00
Pyritie
fbbb9715d9 langs 2026-02-01 17:47:29 +00:00
Pyritie
849f6409d5 Merge branch 'dev' into feature/wab-1.4 2026-02-01 17:37:25 +00:00
Pyritie
40ddd4f30e field guide for new mobs 2026-02-01 16:53:05 +00:00
TomPlop
50eff2f5b9
Fission energy rework (#2931)
* everything should be fine

* Balance early power (#6)

* balance update

* Add textures

* last balance tweaks

* more balance

* Fix conflicts

* Balance early power (#8)

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* Isotopic solvent stuff (#10)

* push

* fix iconset issue

* adding all the textures change

* add more stuffs

* Push recipes

* new stuffs

* add stuffs

* more changes

* add textures and some recipes

* tons of change

* fix texture

* add textures and other stuffs

* more recipes

* add recycling for fission rods

* more recipes

* fix fluid textures

* comment out FLiBe again and balance rods

* fix fluids

* some latest fix

* fix more texture

* more recipe changes

* more recipes

* some last minute balance changes

* add quests

* fix conflict

* more fixes

* fix components

* var to const

---------

Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
2026-02-01 10:52:11 -06:00
GameStar
8b1403031e
double rockets (#2910)
* first things

* yes

* legally distinct rockets

* Update tags.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-31 14:42:37 -06:00
Pyritie
80198e0a4c langs 2026-01-31 14:41:06 +00:00
Pyritie
b1fddab3e9 cleanup rock loot tables 2026-01-31 14:27:52 +00:00
Pyritie
e90cccbcc8 mars quartzite, fix tetramethoxysilane #2898 2026-01-31 14:27:25 +00:00
Pyritie
0aa56d5a90 small chromite groundcover texture 2026-01-31 11:03:39 +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
Pyritie
34039b2517 langs 2026-01-28 23:05:13 +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
18566753fd Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-27 21:16:22 +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
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
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
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
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
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