Commit graph

484 commits

Author SHA1 Message Date
Pyritie
65daa7cddb remove any other stone dust recipes 2026-01-22 20:57:47 +00:00
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
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
88eee093be #2740 and #2759 2026-01-19 22:21:06 +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
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
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
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
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
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
8562c8a195 I think this is less confusing 2026-01-10 00:17:58 +00:00
Redeix
6a5de3c172
Sowey fow cwashing dev
I didnt mwean tooo

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-09 00:47:55 -06:00
Redeix
70c25711f1
I guess this makes it support fluids?
Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-08 00:53:26 -06:00
Redeix
0a19d09a43
Volcanic Glass Tube Casting (#2667)
No glass batch to tube recipe. Tubes can only be made from glass dust which is a bit annoying. I figured volcanic glass makes sense since its high temp? idk

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2026-01-08 00:49:22 -06: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
667f447ca9 changed recipes for single block steam turbines 2026-01-06 17:21:40 +00:00
Pyritie
a283ca7b9a why are blaze cakes here 2026-01-06 15:28:14 +00:00
Pyritie
4307b2e4f6 fixed not being able to craft new pills 2026-01-05 14:59:22 +00:00
Pyritie
60afdc7f55 fix ladder consistency #2616 2026-01-05 00:16:02 +00:00
Pyritie
f804638592 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 00:09:40 +00:00
Pyritie
434a36d0b8 added new radioactive hazard effect, langs 2026-01-04 23:59:55 +00:00
Inceitious
95002cbe5c
Update recipes.materials.js (#2613)
Minor change of lamps from 576mb to 144mb
2026-01-04 13:13:44 -06:00
Xtrial-01
37b6c42940
Remove leftover gt reconstituted stone recipes | Add recipes for new Create:Hypertubes items (#2615)
* Reconstituted Stone recipe descrepancies removal

* create: hypertubes redstone detector and tube scanner attachements recipes

* nvm kjs/damage/kjs/stone stays
2026-01-04 13:12:47 -06:00
Pyritie
2a00a4b4c6 venus 2026-01-03 16:46:56 +00:00
Pyritie
29782635b5 change magnesium dioboride cooling 2026-01-02 20:27:30 +00:00
Pyritie
3a590aca60
Feature/steam multis (#2574)
* init

* langs?

* more steam multis
2025-12-31 23:59:28 +00:00
Pyritie
21e9f7f49c actual working sealed barrel recipes for developing film 2025-12-27 00:09:33 +00:00
Pyritie
9e27221791 #809 finally got around to changing loose to cobble 2025-12-26 22:17:05 +00:00
Pyritie
cc3b650396 preemptively moving this to mercury 2025-12-24 23:20:01 +00:00
Pyritie
7fafc92d3c unification of metal bars 2025-12-24 21:34:31 +00:00
Pyritie
34edeccdf6 fix bud indicator loot tables and crafting recipe #2499 2025-12-23 17:52:12 +00:00
Pyritie
8e77b5dfc5 Added a recipe to craft old gregtech facades into ones with a new texture 2025-12-21 18:08:59 +00:00
Pyritie
6de6777850 fixs #2478 2025-12-20 15:16:05 +00:00
Pyritie
1493fd9c6f fix rose quartz lens tag, fix rose quartz russian lang 2025-12-19 13:04:59 +00:00
Pyritie
0a16e94ab1 oh yeah there's a tag prefix for this now 2025-12-15 22:53:20 +00:00
Pyritie
1a798b6185 cleanup 2025-12-15 19:26:01 +00:00
Pyritie
77abafee3e fix recipe collision with vanilla stone plates 2025-12-15 18:37:19 +00:00
Pyritie
3896d00977 migrate all vintageimprovements recipes to the new kjs format 2025-12-14 17:32:25 +00:00
Pyritie
eb55f20a43 remove modrinth baguettelib, update greate, add vintage improvements kubejs mod, fix all the greate rose quartz namespace changes 2025-12-14 15:35:22 +00:00
Pyritie
dd1463acdf update to forge 47.4.13, fix aged sake, fix cleanroom doors, fix butyraldehyde 2025-12-08 19:36:35 +00:00
Pyritie
a55d9a51d2 reorganize some events 2025-12-07 17:42:04 +00:00
TomPlop
6c4775d58e
Balance early power (#2319)
* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* fix

* add tfg:
2025-12-07 17:05:21 +00:00
Pyritie
cc47fe55ce big tag/data refactor 2025-12-03 00:32:14 +00:00
Pyritie
a7aef94e01 fix moon helium depleted yield being bigger than the minimum yield 2025-12-02 19:36:38 +00:00