Commit graph

971 commits

Author SHA1 Message Date
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
Pyritie
d7d590ee7b lunchbox capsule recipe tweaks 2025-06-12 10:11:58 +01:00
Redeix
d12d2001c3
Update lunch box recipe (#1159)
* - Added loot table to piglin disguise and updated its texture.
- Reformated lootjs file

* - Update pakku-lock.json

* Update recipes.js

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

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-12 08:27:08 +01:00
Pyritie
cc26bf9fca latex balance changes 2025-06-11 20:30:22 +01:00
Pyritie
24da0baeb6 fixed steel millstone not actually needing steel, fixed its recycling recipe 2025-06-10 21:21:30 +01:00
Pyritie
6e9f2401ac lunchbox adjustments 2025-06-10 17:09:00 +01:00
Pyritie
601e92427b more lunchbox stuff 2025-06-10 17:06:59 +01:00
Pyritie
01ce7e19fb moved backpack size data to its own file, added lunchbox size data 2025-06-10 16:58:06 +01:00
Pyritie
e1aec5977c fixes warnings about metal bars in the cutter 2025-06-10 16:36:03 +01:00
Pyritie
a845d76657 added recipes for tfc-lunchbox! 2025-06-10 16:32:43 +01:00
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
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
443ea6996a forgor one of the giselle recipes 2025-06-09 23:33:00 +01:00
Pyritie
bfc4a46f68 remove ad-astra-giselle-addon, tweak netherite spacesuit recipes 2025-06-09 23:21:36 +01:00
Pyritie
5d3f50daeb fix railways cap decolor recipe 2025-06-09 21:51:53 +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
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