Commit graph

952 commits

Author SHA1 Message Date
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
Pyritie
c11e13c949 fixes #1149 2025-06-09 18:46:30 +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
Jean Roberto de Souza
8beb9ba090
Conflict issues fix (#1141)
* 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>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-06-08 22:21:46 +01:00
Pyritie
0ab1572392 added a bunch of circuits to create's assembler recipes 2025-06-07 23:29:34 +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
4615f3564a mysterious cube recipe 2025-06-07 20:06:20 +01:00
Pyritie
adc9932c2e removed FE cables 💔 2025-06-07 18:52:45 +01:00
Pyritie
6cb1602455 more recipe tweaks 2025-06-07 17:59:51 +01:00
Pyritie
b36a2c1741 oh yeah there's no etrium ore 2025-06-07 17:06:43 +01:00
Pyritie
3ccc700676 ore vein updates 2025-06-07 16:57:39 +01:00
Pyritie
04a57e48db Merge branch 'dev' into feature/space 2025-06-07 11:24:51 +01:00
Pyritie
7dc2130819 fixes #1134 2025-06-07 11:13:55 +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
54a942204f solar panel tweaks 2025-06-06 23:42:05 +01:00
Pyritie
b861df57fc removed duplicate white flag recipe 2025-06-06 23:30:00 +01:00
Pyritie
604f2080f3 ad astra recipe tweaks and finishing up 2025-06-06 23:25:30 +01:00
Pyritie
c488425108 rabbit spawn tweaks, removed endermites because they're screwing with other mob spawns 2025-06-06 22:03:01 +01:00
Pyritie
fa48cb0176 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-06-06 21:47:27 +01:00
Pyritie
9ee86e8ecf fixed rabbit spawns 2025-06-06 21:47:25 +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
9a22f5ad71 biome mob tweaks again 2025-06-06 01:36:45 +01:00
Pyritie
07f984c288 yumy popped chorus fruit (needs a cooking recipe) 2025-06-06 01:22:48 +01:00
Pyritie
9579a7b52d item sizes for ad astra 2025-06-06 01:22:11 +01:00
Pyritie
6e32e5974f loot tables and tags for moon endermen 2025-06-06 01:21:49 +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
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
3f172255ac added high quality fabric tags to phantom silk and nylon 2025-06-04 20:01:04 +01:00
Pyritie
9de617d8b1 you can now use anthracite to superheat blaze burners like coke 2025-06-04 12:09:45 +01:00
Pyritie
02132ca387 removed moon spikes 2025-06-03 01:14:05 +01:00
Pyritie
30382b7346 added sand piles, added new sandy biome that replaces lunar_plains sometimes 2025-06-03 01:13:18 +01:00
Pyritie
076775bfc5 Merge branch 'dev' into feature/space 2025-06-02 23:07:47 +01:00
Redeix
6a26c9b6e2
- Added loot table to piglin disguise and updated its texture. (#1123)
- Reformated lootjs file
2025-06-02 22:17:52 +01:00
Pyritie
e8938115ca fixed assembler crafting recipe for item silos 2025-06-02 21:15:40 +01:00
Pyritie
003ecb6489 removed dead firmalife event 2025-06-01 23:36:37 +01:00
Pyritie
7a3c5647b3 removed sparks_on_sulfur tag 2025-06-01 21:32:45 +01:00
Pyritie
95c99d761b moved these into a different file 2025-06-01 21:19:24 +01:00
Pyritie
b90e389e86 existing greenhouse recipes now require to be on earth 2025-06-01 21:19:07 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +01:00