Commit graph

4830 commits

Author SHA1 Message Date
Pyritie
9b0c729e50 pakku 2025-09-14 22:26:25 +01:00
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
a764133b8f reduced durability of wood tongs 2025-09-14 17:02:46 +01:00
Pyritie
a1446cc3a0 removes new ender covers from gt 7.2 2025-09-14 14:52:50 +01:00
Pyritie
1d7aa5349b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-14 13:29:39 +01:00
Pyritie
3d0cc597a6 fix ice soup generating free bowls 2025-09-14 13:29:31 +01:00
Pyritie
dac044939b
Merge branch 'main' into dev 2025-09-14 11:49:07 +01:00
Pyritie
f5748ac382 0.10.14 2025-09-14 11:45:54 +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
13b8a82e97 update cl 2025-09-13 23:35:17 +01:00
GameStar
231df9f6f9
Update CHANGELOG.md (#1818)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-13 23:35:09 +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
7a072d69e0 update pakku 2025-09-13 23:18:23 +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
Xikaro
8c3344600c Update pakku-lock.json 2025-09-14 00:03:11 +05: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
34139d6df8 cl 2025-09-13 16:10:27 +01:00
Jason Nash
78bbc92179
add tape measure to toolbelt (#1813) 2025-09-13 16:09:35 +01:00
Pyritie
49f91732d3 langs 2025-09-13 15:35:59 +01:00
Pyritie
192eae146d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-13 14:46:35 +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
Xikaro
a02c7d9f00 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-13 17:28:51 +05:00
Xikaro
9af8b56ea3 Update pakku-lock.json 2025-09-13 17:28:49 +05:00
TomPlop
73fe5c4e4e
Fix quest title (#1809)
* Quest rework for EV

* Fix lang file quests
2025-09-12 19:09:37 +01:00
Xikaro
ec99951e1b update: config 2025-09-12 23:06:58 +05: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
Xikaro
27f2bbb522
Merge pull request #1795 from TerraFirmaGreg-Team/dev
Release: 0.10.13
2025-09-11 19:54:10 +05:00
Pyritie
595b53093f
Merge branch 'main' into dev 2025-09-11 08:40:19 +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
d0546f2acc pakku + cl for 0.10.13 2025-09-11 08:35:59 +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
c04af52bcb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-11 01:03:39 +01:00
TomPlop
75d9e9c1ff
Quest rework for EV (#1793) 2025-09-11 01:03:30 +01:00