Commit graph

1886 commits

Author SHA1 Message Date
Pyritie
b1da4adad6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-30 23:00:58 +00:00
Pyritie
f51861c4c9 oops missed the fission recipe call 2025-10-30 22:14:41 +00:00
Pyritie
4335ecf066 remove leftover mech press -> curving press conversion recipe 2025-10-30 15:20:38 +00:00
GameStar
64d28c7efd
Tweak the spawn of tfg earth crops (#2125)
* this was broken I guess

* tweak these so they are a little less

idk they still seem to spawn everywhere lol

* these are better lol

* is this not in tools?
2025-10-29 22:46:00 -05:00
theMegaTech
9479e23309
syrup buff (#2126)
* tapping recipes

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>

* update the field guide

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>

---------

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>
2025-10-29 22:44:52 -05:00
TomPlop
f2b15b18ed
Fixes for 0.11.6 (#2123)
* Casings and nerf apt

* Change Rotor Holder recipes

* nerf refrigerant pellet duration
2025-10-29 22:44:32 +00:00
GameStar
1a3e868f69
fixing graphite frame block interaction (#2122)
* Update events.js

* Update CHANGELOG.md

* Update CHANGELOG.md
2025-10-29 13:07:25 +00:00
Pyritie
f833fbb456 made a couple more foods allowable in meal bags 2025-10-28 19:43:42 +00:00
Pyritie
68ca4775ba aged alcohol update, pakku 2025-10-28 17:23:19 +00:00
Xtrial-01
a07c9acd75
Few quick bug fixes (#1999, #2111 and #2112) (#2119)
* T2 Rocket Alloy ABS recipes

Adds Alloy Blast Smelter recipe for t2 rocket alloy and Vacuum Freezer recipe for cooling molten t2 rocket alloy.

* #2111 Fix

Changes salves recipes from Aminophenol to Phenol

* #2112 Fix

Adds cobalt brass wrench to "Tools of the Trade" quest smart filter

* #1999 Fix

Adds assembler recipes for converting item busses to railgun item busses

* recipes.space.js optimization

---------

Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-10-28 12:02:22 -05:00
Pyritie
0ecd6fbed1 don't need recipes to use the canner, it can already do that 2025-10-28 13:54:49 +00:00
Xtrial-01
8983acfd2a
T2 Rocket Alloy ABS recipes (#2109)
Adds Alloy Blast Smelter recipe for t2 rocket alloy and Vacuum Freezer recipe for cooling molten t2 rocket alloy.

Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-27 19:06:16 -05:00
Pyritie
2a2d2da626 added normal tfc bowl dough recipes 2025-10-27 21:39:28 +00:00
Pyritie
84387af048 fixed some recycling tag issues 2025-10-26 18:09:53 +00:00
Pyritie
185fd40f1f added a couple more 2025-10-26 17:55:28 +00:00
Pyritie
dd3215d440 big honkin recycling overhaul #1576 2025-10-26 17:49:37 +00:00
Pyritie
6c01dde185 fixed some afc wood types not having stripping recipes 2025-10-26 14:38:12 +00:00
Pyritie
6f11d85d19 migrate AA fluid conditions to the new gtm condition 2025-10-26 12:52:59 +00:00
Pyritie
f64ee1d067 hide mars ice 2025-10-26 12:52:41 +00:00
Pyritie
b82c3fd443 just gonna disable the curd food processor recipe until it's fixed 2025-10-26 12:52:00 +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
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
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
Pyritie
a32327847a added a third rope coil back to the grappling hook 2025-10-22 10:32:46 +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
35ecaf0c2a fix t2 rocket alloy so it doesn't dupe, remove small dusts 2025-10-21 16:13:35 +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
befeb81f02 does this hide potions? 2025-10-21 12:58:49 +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
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
Pyritie
138bf5efe3 fix #2055 2025-10-19 17:18:02 +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