Commit graph

1583 commits

Author SHA1 Message Date
Pyritie
85fc6c2129 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-13 23:35:20 +01:00
Pyritie
a9f799f238 fix recipe conflict with paper extra and music label 2025-09-13 23:34:07 +01:00
Pyritie
6b5e27540d fix mars ore vein IDs 2025-09-13 23:15:52 +01:00
Jason Nash
fd5fa0d39d
added forge:cobblestone to facade_materials (#1817) 2025-09-13 22:43:02 +01:00
KonSola5
033b411363
Item sizes (#1778)
* Item sizes and some helpful tags

* Try putting item sizes in a KJS script (NOT TESTED)

* Move Greate tags to KJS, add sizes for various pipes and cables

* Whoops, accidentally overrode tiny pipe size

* Air duct sizes

* Prettier config and tags moved to JS
- Added `.prettierrc` file, which configures the tab width and code wrapping point for the Prettier formatter.
- Moved remaining tags from JSON to JS files.

* Delete floating carpet tag JSON

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>

---------

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-13 13:46:20 -05:00
GameStar
dd5fa10ae1
add machine processing for flax (#1814)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-13 13:17:45 -05:00
Pyritie
8d57d613b4 added recipe to make wooden crates out of bronze screws 2025-09-13 14:46:04 +01:00
Pyritie
da5f4f5887 fixes #1785 2025-09-13 14:45:17 +01:00
GameStar
582bb3e06f
Somebody did an oopsie (#1794)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-10 21:26:07 -05:00
Pyritie
9059d6762e got recycling working for the substation. Somehow. Don't ask, idk either 2025-09-11 00:16:30 +01:00
TomPlop
be612c8fec
Balance stuffs (#1790) 2025-09-10 22:03:42 +01:00
Pyritie
5a17891a39 fix ad astra wood window panes recipe 2025-09-09 23:55:49 +01:00
Pyritie
fef9da7d42 added missing recipes for macaw's barbed wire fences, replaced some of its other inputs with tags 2025-09-09 23:43:19 +01:00
Pyritie
efe6d0c7dc crackrack now uses netherrack dust 2025-09-09 23:30:48 +01:00
Pyritie
eae57fdb6a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-09 23:11:47 +01:00
Pyritie
abee8b04e9 whoops 2025-09-09 23:11:38 +01:00
TreyR9
9bb312679b
Bulk Boiling (#1784)
Added Vat recipe for boiling salt water into salt, if any of the salt water-related recipes break in the future then this is the likely culprit

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
2025-09-09 16:58:27 -05:00
Pyritie
be3669a17d gave the tools some random damage 2025-09-09 22:10:22 +01:00
Pyritie
d6fcdb7931 more illager loot table changes, added earlier craftable tipped arrows 2025-09-09 21:55:10 +01:00
Pyritie
2e0406e8d6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-09 21:27:46 +01:00
Pyritie
6a7a342ff7 mist? or beast? 2025-09-09 21:27:44 +01:00
Pyritie
7805e8bcb1 loot tweak 2025-09-09 21:25:58 +01:00
Pyritie
a273790245 primitive creatures update! 2025-09-09 21:20:20 +01:00
TreyR9
301701edfb
Update recipes.js (#1779)
Consistency change for sugar water in the vat/mixer

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
2025-09-09 11:24:59 -05:00
Pyritie
aa12ac3f43 fix stone stuff 2025-09-09 11:51:09 +01:00
TomPlop
f2aae5356a
Fix recipe Ostrum Fab (#1771)
Forgot to change the name

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-09-09 01:27:14 -05:00
Redeix
3661f3c903
Update recipes.js (#1772)
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-09 01:22:30 -05:00
Redeix
2a3a179d48
naughty naughty (#1768) 2025-09-09 00:34:57 -05:00
Redeix
568db16430
Dna syringes and stainless steel needle (#1759)
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-09-09 00:17:04 -05:00
Adrien Vidal
96188e761d
TFG-fication of all exotic stone types (#1764)
* Deepslate, Blackstone and Dripstone + hammer crushing refactor

* crackrack and space stones

* tags + stonecutting + fixes

* Moon deepslate set + QoL recipes + tags fixes

* pyroxenite tags

* Update tags.js

* Update constants.js

* Update constants.js

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-09-09 00:16:27 +01:00
Pyritie
8424682586 fixed smooth stone not collapsing #1732 2025-09-08 16:55:57 +01:00
Pyritie
91cd35e91a added recipe for bone meal to white dye #1757 2025-09-08 16:08:48 +01:00
Pyritie
7759242baf refactor of soulbinding stuff, added recipes for the t2 suit 2025-09-08 15:28:15 +01:00
Pyritie
adcf5cbd6a ok tom 2025-09-08 14:44:26 +01:00
Pyritie
46ded056ed fix missing item in quartz sand centrifuging #1717 2025-09-08 14:42:24 +01:00
Pyritie
f1b9b03896 whoops 2025-09-08 14:42:10 +01:00
Pyritie
abef8191e1 added a tag for wraptor/sniffer wool 2025-09-08 14:35:46 +01:00
Pyritie
f8f7de77e0 fix methanol recipe conflict #1731 2025-09-08 14:31:52 +01:00
Pyritie
5abfc852ad fixed the quantum link recipe being impossible 2025-09-08 14:26:16 +01:00
Pyritie
d8b79ac952 redstone integrator -> redstone relay #1737 2025-09-08 14:21:48 +01:00
Pyritie
9b124a2065 added missing space suit tags to quarktech, though I don't think it'll let you breathe in space #1751 2025-09-08 14:13:18 +01:00
Pyritie
fb5b214321 moved stone dust tags 2025-09-08 14:12:21 +01:00
Pyritie
4643205589 https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/1696 2025-09-08 00:42:15 +01:00
Pyritie
d758e40db6 fixes #1685 2025-09-08 00:34:10 +01:00
Pyritie
e062d7ed5d fixed some of the bigger dupes until gt gets their shit together 2025-09-08 00:30:36 +01:00
GameStar
af01173039
temperature changing foods (#1753)
* update sack mod

* Update wan_ancient_beasts-server.toml

* stuff

* lang

* images

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-06 21:35:42 +01:00
Pyritie
1e7bd48c02 underground deco tags 2025-09-06 18:55:21 +01:00
Pyritie
c90627ecd1 redid forest definitions 2025-09-06 18:55:12 +01:00
Pyritie
332e537f48 simplification 2025-09-06 16:35:13 +01:00
Pyritie
906bb4ba86 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-06 14:28:40 +01:00