Commit graph

1627 commits

Author SHA1 Message Date
Pyritie
ff2c0e70d9 whoops 2025-09-20 19:05:53 +01:00
Pyritie
bd55751345 fixed gravel in mars stone/soil tags 2025-09-20 19:05:25 +01:00
Pyritie
63533022dc oh so that's why the icicles aren't spawning 2025-09-20 18:41:39 +01:00
Pyritie
b7adbff285 added a couple more meal bag foods 2025-09-20 18:36:35 +01:00
Pyritie
7fbcbb84cb recipes for missing create windows 2025-09-20 18:32:26 +01:00
Pyritie
ee1302e5e0 mars craters 2025-09-20 18:32:12 +01:00
Pyritie
bf4f8a8898 mars spikes + rocks feature tweaks 2025-09-20 17:32:09 +01:00
Pyritie
8e9c5c5b58 fixed coke oven hatch recycling 2025-09-20 17:22:34 +01:00
Pyritie
6f0da90ce4 merge 2025-09-20 11:53:30 +01:00
GameStar
b06e59db31
Feature/new emi categories (#1862)
* stuff

* all the stuff

* 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-20 11:51:56 +01:00
Pyritie
78436aed6f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-20 11:49:00 +01:00
Pyritie
c98bc2065b fixed the substation casing recycling again 2025-09-19 22:26:14 +01:00
Jason Nash
82b37d3903
enable minecart_furnace + 2 recipes to make it (#1860) 2025-09-19 15:38:55 -05:00
Pyritie
0201117027 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-19 21:36:20 +01:00
Pyritie
734bb0bb9e feature rearranging 2025-09-19 21:36:18 +01:00
Jason Nash
5b05b23b29
added rice & pasta to meal bags (#1864) 2025-09-19 14:18:13 -05:00
Pyritie
ba0875298c ice caves n stuff 2025-09-19 01:47:08 +01:00
Pyritie
5315111796 removed surfers from fauna 2025-09-19 01:46:59 +01:00
Pyritie
22166e7384 siiiiigh 2025-09-18 02:27:18 +01:00
Pyritie
20be34901d I'm just gonna get rid of the surfer's fauna definition, it's not playing well 2025-09-18 02:17:08 +01:00
Pyritie
5c6a94a2ec increase animal count 2025-09-18 01:26:54 +01:00
Pyritie
8b81b23201 updated tags with new rocks 2025-09-18 01:26:21 +01:00
Pyritie
e3f6e81e14 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-18 00:54:03 +01:00
Pyritie
9ca6b4f5a1 - new small desert plant
- new mars mossy boulders featuring molden's textures
- made forests even more dense
2025-09-18 00:07:13 +01:00
Pyritie
b1ea189f02 fauna! 2025-09-17 23:09:44 +01:00
Pyritie
180a48412d adjusted crimson/warped growth range 2025-09-17 23:09:32 +01:00
Adrien Vidal
b39e03fff7
Texture fixes + slab to wall chiseling (#1857) 2025-09-17 14:47:46 -05:00
Jason Nash
6b8f1446e1
remove 2 tags from moss carpets (#1849) 2025-09-17 16:51:01 +01:00
programmer3481
ee4d16a0bc
Add catwalk facades (#1854)
* make popped chorus fruit edible

* add catwalk facades

* fix crafting facades out of singular bricks

* Revert "fix crafting facades out of singular bricks"

This reverts commit 2f5acb5d48a943d24b229a17b0bf25ead8e6c291.

* fix mud brick properly

* put constants in one place
2025-09-17 16:50:45 +01:00
Adrien Vidal
0a8e68e7d0
[Molden] Stone TFG-fication continued (#1845)
* Fixed some rock type tags

* Nether mossy cobbles

* nether mossy bricks

* mossy bricks

* nether brick recipes + deepstate sets + typos

* cobble interaction index

* reformatting tables

* Region delimiters for stone blocks

* More shaped sets + deepslate recipes

+ missing landslide recipes
+ tables formatting for readability

* Other nether shaped blocks

+ A bit or reorganizing of recipes.rocks.js

* Many Space Stone Blocks

+ Stone Declaration Refactor
+ Many typo fixes
+ Moon Stone Recipes
+ Some Missing tags

* Tags Refactor + Missing Blocks

* definition fix

* remove console debugs

* Space stones cutting & Interractions

+ Breaker Duping Reformat
+ Missing Dripstone Brick
+ Missing Red Granite recipes
+ Misc bugfixes

* small fix

* Vanilla Stone + Red Sandstone Fix

+ Duper loop fix

* Undo .gitignore changes

* Venus sandstone stuff
2025-09-16 15:54:54 -05:00
Pyritie
8329174433 I still don't like this 2025-09-16 12:13:55 +01:00
Pyritie
ae255f7b93 fix double plate stack size, remove old assline overrides 2025-09-16 12:02:28 +01: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
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
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
Jason Nash
afbd5e7168
add small pipe mold to vintage press (#1823) 2025-09-14 12:09:12 -05: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
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
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