Commit graph

608 commits

Author SHA1 Message Date
Pyritie
75a6d3d875 fixed colored steel from having higher tier blast furnace recipes, now they can all just use the basic one too 2025-06-10 16:32:32 +01:00
Pyritie
31d21075e3 antigravity! and zip gun tags 2025-06-10 02:13:48 +01:00
Pyritie
5b462bbb28 compressed airs! 2025-06-10 02:13:26 +01:00
Pyritie
cf7fc7f4d1 Merge branch 'dev' into feature/create-6 2025-06-09 21:15:33 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +01:00
Pyritie
917da8d00e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-09 21:01:11 +01:00
Pyritie
5be2eb1d99 welcome back stonecutter 2025-06-09 21:01:09 +01:00
Jean Roberto de Souza
2b3a1d8ee2
Conductor (#1144)
* Remove Scaffolding Frame recipe

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

* Update Scaffolding Frame recipe

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

* Fix Glass Jar conflict 

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

* Conductor Tags

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

* Conductor Recipes

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

* Update constants.js

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

* Update recipes.js

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

* update id

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>
2025-06-09 19:34:05 +01:00
GameStar
158f2c112c
gregtech facade crafting (#1145)
* Update recipes.js

* Whitelist Tag from Redeix

* Update tags.js

* fixed create copper blocks tag

* added more  blocks to facades

* Fixed industrial iron

* changed facades to tfg

* changed tag to tfg

* updated tag to tfg from ae2
2025-06-09 16:56:02 +01:00
Pyritie
a830260b71 chorus/lightbloom stuff 2025-06-07 23:03:41 +01:00
Pyritie
29a713cb6c asurine dust + centrifuge recipes 2025-06-07 21:29:41 +01:00
Pyritie
2180da4932 cc recipe tweaks 2025-06-07 20:06:27 +01:00
Pyritie
adc9932c2e removed FE cables 💔 2025-06-07 18:52:45 +01:00
Pyritie
5805f9c082 fixed ad astra's lamps so they actually emit light lmao 2025-06-07 18:26:58 +01:00
Pyritie
7075f7eff1 we love material unification 2025-06-07 18:13:04 +01:00
Pyritie
3ccc700676 ore vein updates 2025-06-07 16:57:39 +01:00
Pyritie
69b4d83067 added recipes for ae2 deco blocks, stone dust centrifuge recipes for the moon 2025-06-07 00:58:45 +01:00
Pyritie
6a27fa98ca what if we just added recipes for these? 2025-06-06 23:45:25 +01:00
Pyritie
604f2080f3 ad astra recipe tweaks and finishing up 2025-06-06 23:25:30 +01:00
Pyritie
2129d9611d more work on deco blocks, needs checking 2025-06-06 13:21:16 +01:00
Pyritie
0e9d72137d merge 2025-06-06 12:17:28 +01:00
Pyritie
07f984c288 yumy popped chorus fruit (needs a cooking recipe) 2025-06-06 01:22:48 +01:00
Pyritie
97f41f827a remove cheese block 2025-06-06 01:20:42 +01:00
Pyritie
637dfda744 updated ore field guide 2025-06-05 22:45:02 +01:00
Pyritie
b446f9b45f started recipes for some deco blocks 2025-06-05 13:09:15 +01:00
Pyritie
d8a3a956f7 ad astra recipe tweaks 2025-06-05 12:35:54 +01:00
Pyritie
686831a719 Merge branch 'dev' into feature/create-6 2025-06-05 12:25:01 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Pyritie
ecbc791b30 better recipes for bars, doors, trapdoors 2025-06-04 23:23:45 +01:00
Pyritie
1f507feefa changed copper diving equipment durability to match copper armor, all diving equipment now copies any forging bonuses 2025-06-04 21:59:56 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +01:00
Pyritie
e13960638f fixed greenhouse perfect OC 2025-06-04 21:14:15 +01:00
Pyritie
435f514db2 increased durability of blue steel diving suit 2025-06-04 12:41:23 +01:00
Pyritie
4ac7cc16a2 added perfect OC to the elec greenhouse 2025-06-04 12:30:58 +01:00
Pyritie
e1bbc3a708 forgor to add lunar sands to the moon biome list 2025-06-03 20:16:03 +01:00
Pyritie
1ae52e5506 removed brittle charcoal 2025-06-01 23:36:29 +01:00
Pyritie
8a283343e4 Merge branch 'dev' into feature/create-6 2025-05-29 21:01:44 +01:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
2ec6704d27 buffed blue steel construction wand again 2025-05-27 20:12:38 +01:00
Pyritie
0421951b84 implements #1057 2025-05-27 20:11:13 +01:00
Pyritie
0c2a7164b5 Merge branch 'dev' into feature/create-6 2025-05-21 21:00:20 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
c6d30fb0f8 removed small black steel gear 2025-05-18 22:42:48 +01:00
Pyritie
5bf1d24f1f removed raw ore block recipes 2025-05-18 21:40:46 +01:00
Pyritie
6fd8da5557 remove netherite tools 2025-05-18 18:00:56 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
Pyritie
c3994e36f0 Merge branch 'dev' into feature/create-6 2025-05-18 12:22:27 +01:00
Pyritie
761f396080 removed obsidian framed pressure plate - idk what it even does, but it's causing crashes
fixes #1006
2025-05-14 20:59:01 +01:00
Pyritie
96aae3ae33 finished adding spikes for all rocks 2025-05-13 16:24:00 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00