Commit graph

4843 commits

Author SHA1 Message Date
Pyritie
d65b2b5dcd Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-16 11:11:40 +01:00
Pyritie
957f8aa511 updated cl 2025-09-16 11:11:35 +01:00
Xikaro
7ef8685135 блэт 2025-09-16 15:04:29 +05:00
Pyritie
6ffdde3705 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-15 22:00:08 +01:00
Pyritie
143fdab6fa added berserker 2025-09-15 21:58:59 +01:00
Jacky
8feeefb9d1
melting recipe fixes (#1837)
Co-authored-by: Newlumberjack <12345678+YourName@users.noreply.github.com>
2025-09-15 14:22:32 -05:00
Jacky
e3b5b34017
QOL updates for the EMI, fixed the mutiblock overlap (#1830)
* QOL updates for the EMI, fixed the mutiblock overlap

removed left over settings (oops)

Signed-off-by: Jacky <newlumberjack@nljack.xyz>

removed left over settings (oops)

Signed-off-by: Jacky <newlumberjack@nljack.xyz>

* this file is not needed

Signed-off-by: Pyritie <pyritie@gmail.com>

* revert these

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Jacky <newlumberjack@nljack.xyz>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Newlumberjack <12345678+YourName@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-09-15 19:17:58 +01:00
Pyritie
674d4c0e08
Feature/norse houses (#1836)
* starting illager structure stuff

* structure climates

* idk

* mostly finished the nordic living houses? the structures are still being placed at the bottom of rivers though

* some more

* torch loot table

* tweaks

* mud bricks in the water sounds like a bad idea

* what does adapt_noise do?

* ruined houses done!

* some loot table tweaks

* change the burials to be terrain matching

* make these more common

* remove the air block processor on paths

* up the max distance so further-off buildings get illagers too

* oh I think this was causing the underwater issue
2025-09-15 19:15:31 +01:00
Jason Nash
5274fc65f5
Jute net to be made with Flax (#1833)
* #1815 - Jute net to be made with Flax

* Revert "#1815 - Jute net to be made with Flax"

This reverts commit 60465d798d25b8b76bd2a617fe0a83abf758c0e0.

* #1815 - Jute net to be made with Flax

this time with the correct file

* Using `id` not `output`

* created global list of materials use for equipment

* updated to use `global.EQUIPMENT_METALS`

* updated horse armor to use burlap
2025-09-15 16:04:24 +01:00
Pyritie
024440e645 shifted up some of the new dust icons by 1px 2025-09-15 14:38:48 +01:00
Pyritie
013c490aee fiddling with illager spawns 2025-09-15 12:51:33 +01:00
Pyritie
d19ef93a55 fix #1826 2025-09-15 12:31:37 +01:00
Pyritie
8c858253f1
proper mars rock layers (#1829)
* rock layer stuff for the next kjs-tfc release

* fix mars sea level

* mob tweaks

* lookin cool joker

* desaturated the amaranita mushrooms

* desaturated purple polypore

* features for the "bush" trees so they're always placed touching a log

* moved these out of the forest so it's less crowded

* upd8

* moved these to OCEAN_FLOOR

* moved the bushes to normal features instead of forests

* attached plants, bush adjustments

* updates with new gravel

* disable tinting on fallen leaves
2025-09-14 22:32:00 -05:00
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