Commit graph

2266 commits

Author SHA1 Message Date
Pyritie
89030d3564
Stone dust rework (#2782)
* geology

* starting some loot table stuff

* more stuff

* swap some rocks

* refactor

* phew

* drive-by fix

* all done I think

* remove sylvite

* oh yeah baby it's all coming together

* cleaned up some lines that didn't do anything, added more comments, removed log spam

* blah blah

* fix drying mat

* fix ladders

* tfc, beneath, and moon stuff done...? this is gonna take 5ever

* a

* some sand stuff, more stone types

* wrong way around

* unifying various brick block recipes

* remove shaped create deco brick recipes

* some progress on block creation

* we got into the create world screen!

* getting somewhere

* Reloaded with no KubeJS errors!

* new assets

* I thiiiink that's about everything

* fix some stonecutting

* recipe declared but never used
2026-01-19 22:39:15 +00:00
Pyritie
72226deac0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-19 22:26:36 +00:00
Pyritie
88eee093be #2740 and #2759 2026-01-19 22:21:06 +00:00
Pyritie
624d7de7e0 change fern loot tables to add straw 2026-01-19 22:15:56 +00:00
Pyritie
766b2f1948 red elk now drop more meat when killed with a butchery knife, and also they drop bladders rarely (10%, same as deer) #2778 2026-01-19 22:13:51 +00:00
Pyritie
bd1efd7d40 #2759 more latex plants 2026-01-19 21:37:30 +00:00
Inceitious
ce7302a8ab
Consumes Wool Hat/ Silk Cowl (#2770) 2026-01-19 11:06:32 -06:00
Pyritie
0a648ac68d remove create additions fluid tags 2026-01-19 14:11:55 +00:00
Pyritie
fb34e947e0 fix overzealous tfc recipe removing 2026-01-19 14:01:59 +00:00
Pyritie
05ed8cdfe8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-19 11:34:34 +00:00
Inceitious
bb51d1626d
Added beneath wood compat (#2771)
* Added beneath wood compat

* crimson is a softwood

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-19 11:33:47 +00:00
Pyritie
cfa0a14122 #2771 made me check which wood was which, and what the hell happened here 2026-01-19 11:32:50 +00:00
Pyritie
47d44a6b5c tiny cleanup 2026-01-18 16:51:13 +00:00
Pyritie
c60e64ae51 foils are 1/4, not 1/8 2026-01-18 14:49:54 +00:00
Pyritie
bdd741208c merge 2026-01-18 14:31:51 +00:00
Pyritie
7df74b47b3 fixed recycling issues from the material rewrite, updated everything to the new recycling helper method 2026-01-18 14:30:55 +00:00
Pyritie
ba38ab65d7 fix charnia 2026-01-18 13:04:57 +00:00
Pyritie
77c9aa2f46 fix typo, my bad gang 2026-01-18 11:48:26 +00:00
GameStar
7adc25e104
little typo
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2026-01-17 22:04:44 -06:00
awfulworldkid
98cd6a74f1
Adds new AE2 smart cable recipe & changes AE2 items to use smart cables (#2756)
* Add smart cable recipe & change recipes to use smart cables

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

* Change a recipe from cable to smart cable

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

* fix smart cable recipes to use tag

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

* see above fix

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>

---------

Signed-off-by: awfulworldkid <awfulworldkid@gmail.com>
2026-01-17 15:39:18 +00:00
Pyritie
9e93ce8602 #2753 2026-01-17 12:29:09 +00:00
Pyritie
ed144cb8fe remove WAB structures 2026-01-17 12:00:45 +00:00
Pyritie
7df7e73301 make glowstone mineable with a pick 2026-01-17 11:55:04 +00:00
Pyritie
f02c40fc99 disable electrolsis of clay this way instead 2026-01-17 11:54:53 +00:00
Pyritie
ac426c01c2 minor spelling mistake 2026-01-15 22:59:57 +00:00
Pyritie
e3a365fa84 who is peat and why does he have a use? 2026-01-15 22:58:10 +00:00
Pyritie
91c65c75f7 added wrapped locometal to facades #2726 2026-01-14 22:43:58 +00:00
Pyritie
9df19277c6 bloomery update 2026-01-14 22:37:22 +00:00
Pyritie
cff9ab16f1 add portable cells and drums to the railgun blacklist 2026-01-14 21:58:30 +00:00
Pyritie
c5f8fd771b lunchbox 2026-01-14 21:56:05 +00:00
Pyritie
2e10938e1c
Refactor of material recipes (#2732)
* refactor

* phew

* drive-by fix

* all done I think

* cleaned up some lines that didn't do anything, added more comments, removed log spam
2026-01-14 21:36:52 +00:00
Inceitious
8c6551dda6
Feature/tidying recipes (#2733)
* Added tags to support recycling

* Cleaned up recipe bloat for recycling

* Merged loops

* Remove constant

* Remove constant

* I think this is what you mean

* Updated tags

* Sorry!

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-14 13:04:59 -06:00
Pyritie
e9506d17d0 added some uses to mars charnia, to mirror kelp 2026-01-13 17:33:51 +00:00
Redeix
e9e4ad90cf
Greenhouse Rework Finishing Touches (#2719)
* asset changes

* recipe changes

* lang and quests

* fixes

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-13 11:11:07 +00:00
Xtrial-01
f7cd09c4a0
hypertube recipe (#2723) 2026-01-12 20:30:58 +00:00
Pyritie
241b80a4a0 migrate everything over to linuxUnfucker() 2026-01-12 15:32:18 +00:00
Pyritie
e74043472d cleanup this recycling file 2026-01-12 14:53:58 +00:00
Pyritie
1fceb61e43 fix helve hammer blows being < 1 #2584 2026-01-12 13:58:08 +00:00
Pyritie
8026bfed69 reduce frequency of wolf sounds at night, make crickets etc look for grass plants instead of grass blocks #2680 2026-01-12 13:56:51 +00:00
Pyritie
9870970c89 fix #2714 2026-01-12 13:44:45 +00:00
Pyritie
543128e6e8 blockrunner compat 2026-01-12 09:59:54 +00:00
Inceitious
96b0e79aff
Feature/tfc tools integration (#2716)
* Bugfix/Scraping Knives

Code should be more robust now

* Recycling

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 22:01:08 -06:00
Pyritie
7e2816c917 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-12 01:04:08 +00:00
Pyritie
9fb45e2e0c changelog, fix invar crucible alloying, add tooltip to ice slush 2026-01-12 01:04:03 +00:00
Inceitious
882c477037
Feature/drinkable (#2708)
* Drinkable ice slush

* Update thirst value

* Added quests

* Edited some text

* a

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:48:11 -06:00
Inceitious
563bf2306a
Incorrect tiering for extractor for Bis and Black Bronze (#2684)
* Incorrect tiering for extractor for Bis and Black Bronze

Bismuth Bronze and Black Bronze wrong tiering in extractor
Added some documentation

* Update recipes.materials.js

* Updated

* Updated

* Unified tiering

* Revert "Unified tiering"

This reverts commit ea9e00d2bca8f70c2f95bb1362766edcc9e29498.

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:46:10 -06:00
thederpysockdude123
17be437196
Added alloy smelter recipes for jar lids (#2705)
* added alloy smelter recipes for jar lids

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* remove TFC jar lid anvil recipe

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* new jar lid recipe

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* recipes changed for consistency

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.metals.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.metals.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.metals.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.removes.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:41:56 -06:00
Redeix
900e1de8e9
The big green PR (#2694)
* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* firmalife gh stuff

* chloroplasts and brick regex

* gh recipes

* pisciculture fishery

* I am going insane

* more casings = more gooder

* rotten voiding cover

* greenhouse glory

* Is this it chat

* not needed

Signed-off-by: Redeix <redeix.m@gmail.com>

* missed in conflicts

Signed-off-by: Redeix <redeix.m@gmail.com>

* consumerism

* re-add tag import

* remove unused object map

* id normalizer function

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-10 19:30:46 -06:00
Pyritie
012da662f2 fix some mars plants self-destructing 2026-01-10 21:31:20 +00:00
Pyritie
277f8b8973 actually the bee is from firmalife 2026-01-10 20:46:39 +00:00