Commit graph

2901 commits

Author SHA1 Message Date
TomPlop
a22293e66e
Buff the Tungsten Bismuth Rotor (#2078)
The HSS-G was available at the same time and better in all regards.

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-10-22 13:41:14 +01:00
Pyritie
367c29285e langs 2025-10-22 10:58:34 +01:00
Pyritie
a32327847a added a third rope coil back to the grappling hook 2025-10-22 10:32:46 +01:00
Pyritie
a2dee63297 langs 2025-10-22 10:24:58 +01:00
Pyritie
b200270cb3 modified biome temperature in case it's what's making a certain server host put snow on the moon 2025-10-22 10:19:13 +01:00
Pyritie
604b335fe1 just have both surfers so we don't have to deal with eggs being weird 2025-10-21 22:14:46 +01:00
Pyritie
b1e2da127d added one more quest 2025-10-21 18:42:00 +01:00
Pyritie
1a44e7010a fix typo 2025-10-21 16:28:52 +01:00
Pyritie
35ecaf0c2a fix t2 rocket alloy so it doesn't dupe, remove small dusts 2025-10-21 16:13:35 +01:00
Pyritie
b2fe101e19 tweak icon sets of nuclear materials 2025-10-21 16:13:24 +01:00
Pyritie
7adc06188a quests + langs 2025-10-21 16:13:10 +01:00
Pyritie
1f830ae9cf veins 2025-10-21 13:54:27 +01:00
Pyritie
54dc948f5d added a missing overlay for bright/shiny dusts 2025-10-21 13:30:52 +01:00
Pyritie
66ca0b27a8 tweak color of FOOF 2025-10-21 13:26:02 +01:00
Pyritie
de6a852443 added another stonecutter recipe for the markings so it's more obvious which item is the start point 2025-10-21 13:08:14 +01:00
Pyritie
82b9cc7036 emi categories 2025-10-21 12:59:17 +01:00
Pyritie
9f095d7a82 langs 2025-10-21 12:59:02 +01:00
Pyritie
befeb81f02 does this hide potions? 2025-10-21 12:58:49 +01:00
Pyritie
35d667e50a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-21 12:23:09 +01:00
Pyritie
0c2cba8811 ore indexes 2025-10-21 12:23:06 +01:00
Pyritie
cfbd258102
Mars sandstorms (#2067)
* changes for some sand layer/pile stuff

* Martian wind (#1883)

* add texture for wind

* add multiple martian wind types

* fix semiheavy concurrent with tfg core

* rename wind to match convention

* fix blockstate registration error

* why is this even turned on by default

* translate code regions + placeholder bundle recipe

* add mars climate controller

* add debug stick functions

* cleanup

* add layer block models

* add jsons

* cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>

* refactor

* undo bundle

* added a bunch of missing snow pile tags

* item model changes

* more snow piled tags

* add dust storm severity biome tags

* some cleanup

* and uncomment again

* real math hours

* more math tweaks

* comment out debug code

* comment this file

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>
Co-authored-by: Zippity <i.wa.anderson.86@gmail.com>
2025-10-21 12:21:18 +01:00
Pyritie
9b55d7ce9a langs 2025-10-21 12:17:12 +01:00
Redeix
3240a84af1
fission textures mk1 (#2073) 2025-10-21 02:47:08 -05:00
Pyritie
f3f69dbdd6 fixed wrong spring being used for crimson/warped/glacian pressure plates 2025-10-20 21:49:08 +01:00
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
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
Redeix
4fcbae00ac
Fridge Assets (#2062) 2025-10-20 10:59:56 +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
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