Commit graph

3022 commits

Author SHA1 Message Date
Pyritie
3c66e5cf5e update to gtm 7.2.1 2025-10-26 12:23:02 +00:00
Pyritie
a10622fa00 removed another log 2025-10-26 12:22:56 +00:00
Pyritie
5a92686b6f fixed active formation plane recipe 2025-10-26 12:08:49 +00:00
Pyritie
7ffef11f0e fixed polished blackstone recipes, removed logging 2025-10-26 12:08:37 +00:00
Pyritie
98f4f65fc7 langs 2025-10-26 11:35:10 +00:00
GameStar
253135b21b
Add tacz ammo boxes (#2104)
* stuff

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-25 14:41:45 -05:00
Pyritie
adb5af57f6 sure why not, axes too 2025-10-25 18:47:01 +01:00
Adrien Vidal
19ba075539
aqueduct recipes fix (#2101) 2025-10-25 18:21:53 +01:00
Pyritie
ff338d8135 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-25 18:21:13 +01:00
Pyritie
8a68449d17 workaround for swords not working to mine cobwebs #2075 2025-10-25 18:21:09 +01:00
GameStar
3999ec3e4a
correct tacz ammo stack sizes (#2103)
* Update index_modifiers.js

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-25 11:58:47 -05:00
Pyritie
c20aabde94 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-25 17:20:08 +01:00
The Compendium System / The Atlassian Collective
9943370b28
Flax Bundles (#2080)
* yay flax bundle

* yay flax recipes and scraped flax pile

* more flax stuffs

* yay vintage improvements isn't useless now

* the one missing letter of doom

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-25 16:56:17 +01:00
Pyritie
04bdfd1600 add comment 2025-10-25 15:22:36 +01:00
Pyritie
4ec4b71649 added fission components to kjs 2025-10-25 15:22:18 +01:00
Pyritie
4bc380ff46 fixed wrong category on recipe 2025-10-25 15:04:39 +01:00
Pyritie
44d174e6d4 langs 2025-10-25 10:46:45 +01:00
Pyritie
8776c146f0 closes #2095 2025-10-24 22:54:53 +01:00
SverhRazum-Nah
b33ace70c7
Update recipes.miscellaneous.js (#2096)
Polycap and phantom string and fabric was on circuit 0 with zero reason

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-10-24 15:11:31 -05:00
Pyritie
33c00b0575 fixed universal wireless terminal coming with the other terminals pre-installed 2025-10-24 13:06:11 +01:00
Redeix
3f8bc5c312
circuits just ask for too much (#2093) 2025-10-24 02:28:38 -05:00
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