Commit graph

2293 commits

Author SHA1 Message Date
Pyritie
40fedfa17e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-22 20:37:28 +00:00
Pyritie
feda51f459 some glass alloy smelter unification 2026-01-22 20:32:06 +00:00
thederpysockdude123
07058f77e7
added Ad Astra airlock to valid cleanroom doors (#2808)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-22 19:02:59 +00:00
thederpysockdude123
df03ccbeb7
removed netherrack dust centrifuging that doesn't actually exist (#2804)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-22 17:54:23 +00:00
Pyritie
2f90e7ad2b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-21 23:30:20 +00:00
Pyritie
48d2e0b479 delete sylvite 2026-01-21 23:30:13 +00:00
Pyritie
1e42ed442a
. (#2796) 2026-01-21 22:40:31 +00:00
Pyritie
f93e33ab8e fix pitcher plants and torchflowers self destructing on mars 2026-01-21 22:36:54 +00:00
Pyritie
0c146a673f buff mars greenhouses so they output the same amount of logs as earth trees 2026-01-21 22:22:40 +00:00
Pyritie
6c9418949f fix casting into ingot molds #2794 #2789 2026-01-21 22:00:07 +00:00
Pyritie
a1c0270267 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-21 21:26:51 +00:00
thederpysockdude123
fd76389591
re-added glass dust recipe for glass tubes (#2795)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-21 21:16:25 +00:00
Pyritie
6294607616 change hellbricks recipe to match new texture 2026-01-21 21:05:55 +00:00
Redeix
8ea2c45d77 Merge remote-tracking branch 'origin/dev' into dev 2026-01-21 00:35:35 -06:00
Redeix
682788970c pisciculture rebalance 2026-01-21 00:35:11 -06:00
Pyritie
dcd5e8be5f fix timing with forming press compared to bender 2026-01-20 16:12:21 +00:00
Pyritie
c3d2b5df64 quartz autoclave consistency 2026-01-20 12:54:47 +00:00
Pyritie
bba55fdd3f move all the rubber/latex-related recipes into one file, removed mixer vulcanized latex recipe, buffed fluid solidifier sticky resin recipe 2026-01-20 12:38:51 +00:00
Pyritie
bb3508cca4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-20 12:13:23 +00:00
Pyritie
36a9dc5099 add anthracite as boiler fuel, add more items to the grain tag for soups #2785 2026-01-20 11:38:46 +00:00
Jean Roberto de Souza
74414c4074
Vacuumizer recipes for recipes with latex (#2693)
* Vacuumizer recipes for recipes with latex

This will add a way to make recipes that utilize latex on the Vacuumizer, following the sugestion made on #2691.

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Add latex mixing recipes for vulcanized latex and sticky resin

Added create recipes for mixing latex to vulcanized latex and sticky resin.

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Remove latex recipes from vintage improvements

Removed latex ingredients recipes and related processing.

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Refactor mixing recipe syntax for latex and resin

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2026-01-19 19:48:03 -06:00
Pyritie
5595cf6899 fix merge issue? 2026-01-19 23:46:08 +00:00
Pyritie
4ed4f8ac1a this will make that one person that uses chalks very happy #2772 2026-01-19 23:46:02 +00:00
Pyritie
653583e39b #2773
Related Work Items: #277
2026-01-19 23:26:37 +00:00
Pyritie
69cde26b65 reduced required rpm for the VI centrifuge because it works badly on low tps servers 2026-01-19 23:23:22 +00:00
Pyritie
c67320ffae merge 2026-01-19 23:06:32 +00:00
Pyritie
46b74fb19b change fish machine to require EV circuits, move the quest 2026-01-19 22:52:49 +00:00
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