Commit graph

3022 commits

Author SHA1 Message Date
Pyritie
15025af2c0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-19 17:15:57 +01:00
Pyritie
df61ed4963 fix #2002 + #2012 2025-10-19 17:15:54 +01:00
Pyritie
3f599cc69a fix #2022 2025-10-19 16:50:50 +01:00
Yan
45b227f37d
Add language entry "Large Boilder" for quest/gregtech_energy (#2056)
* doc: Add zh_cn translation for patchouli_books

* feat: Add quest/gregtech_energy/Large Boilers to language files

* feat: remove unreviewed contents

* feat: remove unreviewed contents

* fix: fix typo

* fix: fix Large Boilers

* fix: update task for Large Boilers

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2025-10-19 12:29:16 +01:00
WIPocket
ac8ec2a9e5
double plate stacking to 16, fixes #1952 (#2051) 2025-10-18 16:22:33 -05:00
Pyritie
53eb9767c7 food balancing 2025-10-18 15:29:07 +01:00
Pyritie
a2217c20c8 fix #2049
Related Work Items: #20
2025-10-18 13:56:49 +01:00
Pyritie
0c0a18833b illage changes 2025-10-18 13:51:32 +01:00
Pyritie
115a7a42eb lang 2025-10-18 13:45:46 +01:00
Pyritie
dc4cf6ba5c emi categories 2025-10-18 13:41:43 +01:00
Pyritie
d2c4e4b0af some cleanup with the alloy smelter category, removed vanilla glass bottles 2025-10-18 13:41:28 +01:00
Pyritie
d7518d98c6 added nugget molds and oils to dino nugs 2025-10-18 13:41:15 +01:00
Redeix
d940579c82
Updated circuit utility wrapper (#2047) 2025-10-18 01:54:43 -05:00
Pyritie
7f07089a99 added an aged beer recipe for slightly better grain yields 2025-10-18 01:33:08 +01:00
Pyritie
e1bca6ef13 langs 2025-10-18 01:30:15 +01:00
Pyritie
ccaf9c686e remove stone dust 2025-10-18 01:30:03 +01:00
Pyritie
47a5799f3f fix recipe collision 2025-10-18 01:29:55 +01:00
Pyritie
b3fdbd1571 added dinosaur nuggies 2025-10-18 01:11:32 +01:00
Risuga
ad43a71723
Fixes for #2043 (#2045)
* Update recipes.js

Signed-off-by: Risuga <oosyrag@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Risuga <oosyrag@gmail.com>

---------

Signed-off-by: Risuga <oosyrag@gmail.com>
2025-10-17 12:03:58 -05:00
Jason Nash
4fda1cfb47
Feature/create tags (#2044)
* unhide

geez Pyrite way to forget the packages!

* added tag for jar sorting
2025-10-17 00:47:34 +01:00
Pyritie
adc665ff45 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-17 00:29:40 +01:00
Pyritie
c3260434b8 unhide these 2025-10-17 00:29:38 +01:00
Risuga
1d89d6f5d9
Normalize ladders as fuel (#2043)
* double ladders from sticks

Signed-off-by: Risuga <oosyrag@gmail.com>

* half ladders from lumber

Signed-off-by: Risuga <oosyrag@gmail.com>

* 1/3 ladder burn time 

Signed-off-by: Risuga <oosyrag@gmail.com>

* wood frame burn time

Signed-off-by: Risuga <oosyrag@gmail.com>

* remove ladders and wood frames as boiler fuel

Signed-off-by: Risuga <oosyrag@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Risuga <oosyrag@gmail.com>

---------

Signed-off-by: Risuga <oosyrag@gmail.com>
2025-10-16 22:59:41 +01:00
Pyritie
ef9ef41c86 langs 2025-10-16 21:30:10 +01:00
Pyritie
f488b23656 added some more mobs to europa 2025-10-15 22:31:47 +01:00
Pyritie
3be4cd61a7 fixed items not consuming power with wireless card 2025-10-15 22:03:54 +01:00
Pyritie
4cc0cf409e 0.11.3 2025-10-15 21:43:43 +01:00
Pyritie
709ac27752 remove radioactive 2025-10-15 21:32:50 +01:00
Pyritie
14e4473eef Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-15 21:08:41 +01:00
Jason Nash
176cc3c9c9
additional pineapple fiber recipe (#2029)
* additional pineapple fiber recipe

* typo

* use food processor & use nitrogen
2025-10-15 21:08:34 +01:00
Pyritie
ad2cba1cf2 missing ostrum iodide lang 2025-10-15 21:02:24 +01:00
Pyritie
3566aef9ed langs 2025-10-15 20:51:42 +01:00
Pyritie
5226ceebcd fix recipe ID swap, fix chemical formula 2025-10-15 20:51:27 +01:00
TomPlop
2a97ad0b72
Change Fission Progression (#2040) 2025-10-15 20:37:10 +01:00
Pyritie
f5ad5f091c
feature/europa-noise (#2038)
* committing here because I made something cool and I don't want to lose it

* adjusted height

* better

* good enough

* good enough for now
2025-10-15 20:16:10 +01:00
TomPlop
5094e1ff72
Nuclear changes and new quests description (#2037)
* Add dimension locked

* Remove soda ash CR recipe and add dense lead from Implosion

* Adding new quests description
2025-10-15 09:15:05 +01:00
Pyritie
9fa8d4dab6 tag cleanup 2025-10-14 16:02:36 +01:00
Pyritie
47e7d34936 fixed dino nests not adapting to the terrain 2025-10-14 11:08:01 +01:00
Pyritie
6ffe8c79d7 swap surfer entity IDs, fix dino nest structure so it doesn't spawn over water, some other tweaks 2025-10-14 01:08:43 +01:00
Pyritie
627ef389aa fix spawn eggs again 2025-10-13 23:07:24 +01:00
Pyritie
927ef75107 langs 2025-10-13 23:07:11 +01:00
Pyritie
a27a7acbcf apparently the netherite backtank is NOT trimmable 2025-10-13 20:32:00 +01:00
Pyritie
c2d6df8468 fixed spawn egg textures, added surfer/soarer 2025-10-13 19:11:14 +01:00
Pyritie
142f6ad537 fix https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/2032 2025-10-13 18:54:55 +01:00
Pyritie
2bd0523380 added ulv super tanks/drums and 4a hv dynamo 2025-10-13 14:22:38 +01:00
Pyritie
2ed3935705 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-12 18:31:07 +01:00
Pyritie
fa0871ab07 langs 2025-10-12 18:30:34 +01:00
Pyritie
f2d105401e add back recipe for this pedestal 2025-10-12 18:30:01 +01:00
Pyritie
51573b0db2 fix glacio/europa marker 2025-10-12 18:29:52 +01:00
Adrien Vidal
37f5a812f7
Stone tfgfication pt3.5 (#2017)
* Quartz + Create Stone Support

+ Blackstone uniform model

* loose to gravel packer recipes

* Cobble unpacking recipes

---------

Signed-off-by: Adrien Vidal <vidal.adrien2@gmail.com>
2025-10-12 11:48:45 -05:00