Commit graph

512 commits

Author SHA1 Message Date
Pyritie
5a6b9bb6eb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-10 14:28:08 +00:00
Pyritie
dfd673c369 cleaned up a bunch of regexes 2026-02-10 14:07:06 +00:00
Nebby
a7a01a96b7
High Tier saws can silk harvest ice (#3019)
* High Tier saws can silk harvest packed ice

* Update changelog
2026-02-10 11:53:48 +00:00
Pyritie
792f524884 #3009 added recipes for smelting seaweed/kelp to soda ash (no tom it doesn't make soda ash infinite) 2026-02-09 16:54:10 +00:00
Pyritie
2efa0180a8
Greate splashing update (#2995)
* update to greate 0.0.65

* update greate and pakku, add circuits to fan recipes

* that doesn't work

* add ore deposits too
2026-02-07 11:20:59 +00:00
Redeix
3eb0a5810b
updated recycling recipes for wood (#2986) 2026-02-05 09:20:37 +00:00
Pyritie
26dfa184e6 added missing bear meat to pandas 2026-02-05 00:28:23 +00:00
Pyritie
16df93f188 add tags for lighters 2026-02-04 23:13:08 +00:00
OLOXpl
643facfdd4
dust to balls (#2943)
yes
2026-02-03 23:19:54 +00:00
Pyritie
19bf4de976 gurman update 2026-02-02 14:54:21 +00:00
Redeix
961786b8ee
egh update (#2950)
* egh update

* changelog and config

* add spore blossom, remove beneath leaves (those are for mars)

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

* Update tags.beneath.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-02-02 12:21:48 +00:00
OLOXpl
36125f7d5d
Dye mixing (#2938)
* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818

* Revert "Update recipes.dyes.js"

This reverts commit b06ed24bf42fafc4233c6c6278fa5199e5542bfd.

* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818
attempt nr 2

* barrel recipe

barrel recipes and fix due to my colour blindness (;

---------

Signed-off-by: OLOXpl <125832723+OLOXpl@users.noreply.github.com>
2026-02-01 15:45:44 -06:00
OLOXpl
9e0c303438
Update recipes.dyes.js (#2925)
* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818

* Revert "Update recipes.dyes.js"

This reverts commit b06ed24bf42fafc4233c6c6278fa5199e5542bfd.

* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818
attempt nr 2
2026-02-01 17:43:07 +00:00
Pyritie
b1fddab3e9 cleanup rock loot tables 2026-01-31 14:27:52 +00:00
Pyritie
438a2349c3 #2904
Related Work Items: #29
2026-01-30 00:49:28 +00:00
Pyritie
989d572eb9 gurman updates 2026-01-27 23:42:34 +00:00
Coox1e
941c22ff92
Pure fertilizer utility patch (#2884)
* Added pure fertilizers at 100%

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

* Changed pure compost recipes to match their updated value

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

* Changed pure recipes to LV

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>

---------

Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>
2026-01-27 14:56:24 -06:00
Pyritie
f324e7e6da
New content for ULV + LV (#2873)
* require black steel plates before the forge hammer, add some blue steel things post-deployer that require a colored steel anvil, start refractory clay dust

* first draft of bakelite, new phenolic boards, new cupro coils

* add another page to the medicine quest

* cl

* backup of lv quests

* quest stuff and some recipe tweaks

* tweak

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-26 18:10:22 -06:00
Pyritie
e6a32b5b2e add missing borax recipe, remove some other greate crap 2026-01-24 18:54:48 +00:00
Pyritie
2167fcdb6a fix #2827
Related Work Items: #28
2026-01-23 20:22:29 +00:00
Pyritie
5f064b841f make gt oreproc much faster (except the thermafuge) 2026-01-22 23:01:36 +00:00
Pyritie
48d2e0b479 delete sylvite 2026-01-21 23:30:13 +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
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
fb34e947e0 fix overzealous tfc recipe removing 2026-01-19 14:01:59 +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
9df19277c6 bloomery update 2026-01-14 22:37:22 +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
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
9fb45e2e0c changelog, fix invar crucible alloying, add tooltip to ice slush 2026-01-12 01:04:03 +00: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
68cfeca7fa rock salt and sylvite are actually the same thing 2026-01-10 00:33:34 +00:00
Pyritie
936a098ff1 add tfc powders to dye tags 2026-01-10 00:33:23 +00:00
Inceitious
11544b1cce
Feature/new greens and browns (#2653)
* New greens and browns

* huh

* Revert "huh"

This reverts commit 75d84143c447f8c3eba8efbbaabfc693de7510e6.

* huh
2026-01-07 12:03:12 -06:00
Pyritie
db3428c20b add way to craft large gears in an anvil 2026-01-06 12:08:56 +00:00
Pyritie
e0391bbaef add more fluids to the non-placeable tag 2026-01-05 12:55:07 +00:00
Pyritie
be0e8c0510 fix #2603 2026-01-04 13:03:05 +00:00
Pyritie
2de2c7793e depots are now forge insulation 2025-12-31 01:15:50 +00:00
Pyritie
63aae3191b fix some powder recipes 2025-12-28 11:39:30 +00:00
Pyritie
d8866f9738 fix forge fuels tag 2025-12-26 22:34:55 +00:00
Pyritie
c41ec4dd5f fix unusable tfc stone knives that you can find in some ruins 2025-12-25 17:04:51 +00:00
Pyritie
d6d73c27ab fix not being able to use aged alcohols to make vinegar #2519 2025-12-25 16:46:14 +00:00
Pyritie
7fafc92d3c unification of metal bars 2025-12-24 21:34:31 +00:00
Xtrial-01
5f30ee7c0c
adds fertilizer values for various gt dusts (#2501) 2025-12-23 12:04:58 -06:00
Pyritie
c725428991 added milks to the placeable fluid blacklist 2025-12-22 22:45:28 +00:00
Pyritie
b093d321de Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-22 01:43:52 +00:00
bigtho80
04d5639053
Prevent placement of alcohol buckets (#2491)
* Prevent alcohol bucket usage on right click

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

* Rename cancelalcoholbucket to cancelalcoholbucket.js

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

* rename cancelalcoholbucket.js into nonplaceableliquid.js and edit to add tfc:nonplaceable tag

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

* Add non-placeable liquid items to event

Added various non-placeable liquid items to the event.

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

---------

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>
2025-12-21 14:42:46 -06:00
Pyritie
f885552aeb oh neutral is moderate temp + not an acid, gas etc 2025-12-21 18:19:52 +00:00
Pyritie
9a9083c9f7 change the usable in pot/vat tags to moderate fluids and not all liquids 2025-12-21 18:19:10 +00:00