Commit graph

3498 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
09641378a3 fixed using the wrong battery in the ultimate battery recipe 2025-06-10 11:38:55 +01:00
Redeix
a17784d63b
Update CHANGELOG.md
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-09 22:57:43 -05:00
Pyritie
d44f713041 lang 2025-06-10 02:17:16 +01:00
Pyritie
32268b9d31 Merge branch 'dev' into feature/space 2025-06-10 02:16:10 +01:00
Pyritie
31d21075e3 antigravity! and zip gun tags 2025-06-10 02:13:48 +01:00
Pyritie
b93ff500d0 whatever this is 2025-06-10 02:13:38 +01:00
Pyritie
5b462bbb28 compressed airs! 2025-06-10 02:13:26 +01:00
Pyritie
0d62bfb3e6 langs 2025-06-10 01:03:39 +01:00
Pyritie
faa21ecbab removed giselle quest 2025-06-09 23:33:14 +01:00
Pyritie
443ea6996a forgor one of the giselle recipes 2025-06-09 23:33:00 +01:00
Pyritie
e77ca60a26 revert new raw iron texture 2025-06-09 23:21:48 +01:00
Pyritie
bfc4a46f68 remove ad-astra-giselle-addon, tweak netherite spacesuit recipes 2025-06-09 23:21:36 +01:00
Redeix
8145a468f3
Updated changelog (#1152)
* Update piglin_disguise_block.json

Fixed loot table for piglin disguise 

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-09 22:15:16 +01:00
Redeix
64c4cce30a
Update piglin_disguise_block.json (#1151)
Fixed loot table for piglin disguise

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-09 22:11:34 +01:00
Pyritie
5d3f50daeb fix railways cap decolor recipe 2025-06-09 21:51:53 +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
84041d2e00 changelog 2025-06-09 21:08:50 +01:00
Pyritie
f9d2130192 changelog 2025-06-09 21:05:26 +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
Pyritie
86a35b7386 turned on the EMI default recipe button by default 2025-06-09 20:50:40 +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
1a5867d956 fixes #1107 2025-06-09 18:59:05 +01:00
Pyritie
fd7ae525ff langs 2025-06-09 18:52:20 +01:00
Pyritie
d3a47fa04f changelog 2025-06-09 18:51:11 +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
2a0f11bd15
Include ElytraServers/Greate-Encased-Cogwheel-Drop-Fix (#1148) 2025-06-09 16:54:04 +01:00
TomPlop
e4014d1d6e
Small fixes for Empty Jar, Beekeeper quest and Assembler Chute (#1142)
* Fix Chute Assembler recipe

* Fix quest tips beekeper

* Fix for wine and jar alloy smelter conflicting recipe

* fix to fit #1141

* mistakes were made

* Fix jetpack 1 quest mv

* Mistake again

* Revert the fix on chute
2025-06-08 22:22:01 +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
55a27896c4 moon noise tweaks 2025-06-07 21:55:34 +01:00
Pyritie
65b9055e34 does this fix the weird squares with structures? 2025-06-07 21:29:57 +01:00
Pyritie
29a713cb6c asurine dust + centrifuge recipes 2025-06-07 21:29:41 +01:00
Pyritie
80e25ff6d9 langs 2025-06-07 20:34:25 +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
fdfca2ecc8 langs 2025-06-07 19:17:01 +01:00
Pyritie
ce1f8a4b80 adjusted the brightness of the generated raw ore textures 2025-06-07 19:04:02 +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
6cb1602455 more recipe tweaks 2025-06-07 17:59:51 +01:00
Pyritie
cb60215f5a tfc-ambiental tooltips for space suits 2025-06-07 17:59:39 +01:00
Pyritie
c359174053 langs 2025-06-07 17:52:32 +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