Commit graph

5351 commits

Author SHA1 Message Date
GameStar
dc22ab10bc
fix some recipe issues in EV TACZ extended mags (#2065)
* Update materials.js

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

* Update recipes.attach.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-20 21:40:09 +01:00
Pyritie
b9280ab856 more CLs 2025-10-20 21:22:39 +01:00
Pyritie
31d62c45dd changelog, added molds to tool racks 2025-10-20 21:18:03 +01:00
Spicy Noodles
7c2b67b446
Unify emitter recipes (#2059)
* Unify emitter recipes

* Fix for field generator recycling
2025-10-20 17:44:07 +01:00
Pyritie
3ec41ceb60 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-20 12:57:17 +01:00
Pyritie
2df627be1d pakku 2025-10-20 12:57:15 +01:00
Redeix
4fcbae00ac
Fridge Assets (#2062) 2025-10-20 10:59:56 +01:00
Pyritie
bbcc2d55e6
adjust claims (#2060) 2025-10-20 14:20:19 +05:00
Pyritie
fdb61f960c added dimensions 2025-10-19 17:30:27 +01:00
Pyritie
96396fb73a fix #2018, removes sorting from all sns containers and lunchboxes 2025-10-19 17:25:35 +01:00
Pyritie
138bf5efe3 fix #2055 2025-10-19 17:18:02 +01:00
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
Risuga
c196d3d82f
Update ore_processing.snbt (#2058)
Signed-off-by: Risuga <oosyrag@gmail.com>
2025-10-19 12:22:03 +01:00
WIPocket
ac8ec2a9e5
double plate stacking to 16, fixes #1952 (#2051) 2025-10-18 16:22:33 -05:00
Pyritie
cfe31092e6 cl for the rockets 2025-10-18 15:55:26 +01: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
63ea1965a8 forgor this cl 2025-10-18 13:54:41 +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
18884e6587
Update CHANGELOG.md (#2048)
Fixed inconsistent circuit numbers for specific recipes.

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-10-18 01:57:02 -05: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
Pyritie
2f1ac192af Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-17 21:19:25 +01:00
Pyritie
970a5b9fbf added I <3 tfc so maybe people will realise how awful their hp is, lol 2025-10-17 21:19:23 +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
702dcf2fda Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-16 21:30:13 +01:00
Pyritie
ef9ef41c86 langs 2025-10-16 21:30:10 +01:00
Xikaro
1239dfa910 Update build.yml 2025-10-16 14:32:52 +05:00
Xikaro
2b8fc06373 Update pakku-lock.json 2025-10-16 12:17:00 +05:00
Xikaro
76d1b688f3 Update build.yml 2025-10-16 11:24:06 +05:00
Pyritie
f488b23656 added some more mobs to europa 2025-10-15 22:31:47 +01:00
Pyritie
ad068d0202 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-15 22:03:57 +01:00
Pyritie
3be4cd61a7 fixed items not consuming power with wireless card 2025-10-15 22:03:54 +01:00
Pyritie
c49d3eb145
Merge branch 'main' into dev 2025-10-15 21:46:15 +01:00
Pyritie
4cc0cf409e 0.11.3 2025-10-15 21:43:43 +01:00