Commit graph

2484 commits

Author SHA1 Message Date
Pyritie
a585e47ffb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-14 19:29:46 +01:00
Pyritie
dcb41f9030 norse structure updates 2025-09-14 19:29:41 +01:00
Jason Nash
afbd5e7168
add small pipe mold to vintage press (#1823) 2025-09-14 12:09:12 -05:00
Pyritie
a1446cc3a0 removes new ender covers from gt 7.2 2025-09-14 14:52:50 +01:00
Pyritie
3d0cc597a6 fix ice soup generating free bowls 2025-09-14 13:29:31 +01:00
Pyritie
8f5b0d02a6 fix #1819 2025-09-14 11:41:00 +01:00
Pyritie
8aa758ec2c langs 2025-09-14 11:35:11 +01:00
Pyritie
fed920feb5 data-driven wooden barrel/bucket tags! #1796 2025-09-14 01:33:16 +01:00
Pyritie
5eadc5f432 fixed missing helve recipes for newer tfc materials 2025-09-13 23:56:48 +01:00
Pyritie
5e97244193 fixed millstone tier for black bronze #1786 2025-09-13 23:56:01 +01:00
Pyritie
85fc6c2129 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-13 23:35:20 +01:00
Pyritie
9e6d7f7e09 fix missing texture for placed potin ingots/plates 2025-09-13 23:34: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
Pyritie
a0b2cde155 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-13 20:26:26 +01:00
Pyritie
9cf5cc71f4 langs 2025-09-13 20:26:15 +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
49f91732d3 langs 2025-09-13 15:35:59 +01: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
Pyritie
45d7dc015d added persistance nbt tag 2025-09-12 00:49:34 +01:00
Pyritie
e04364ba1d started work on the intact houses 2025-09-12 00:22:06 +01:00
Pyritie
79a8c52e21 jigsaws for mobs 2025-09-12 00:21:52 +01:00
Pyritie
4958d12a89 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-11 08:36:11 +01:00
Pyritie
fc1e53f99f langs 2025-09-11 08:32:12 +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
e73f06aee2 quest langs 2025-09-11 01:03:58 +01:00
Pyritie
d8dae2b192 moon ore vein tweaks 2025-09-11 00:51:17 +01: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
a64a678838 langs, fixed a few nether brick items being hidden 2025-09-09 14:36:33 +01:00
Pyritie
65d2915038 excluded lunchbox and mob net field guide pages 2025-09-09 13:34:40 +01:00
Pyritie
ae699faf1e remove priority 2025-09-09 11:59:41 +01:00
Pyritie
9107a122c4 fix missing empty syringe model 2025-09-09 11:56:23 +01:00
Pyritie
aa12ac3f43 fix stone stuff 2025-09-09 11:51:09 +01:00