Commit graph

909 commits

Author SHA1 Message Date
Pyritie
afc88dda91 changelog, added blood lily to klayze loot 2025-06-19 13:09:46 +01:00
Pyritie
0b05648189 fixed a few other steel items being extractable in LV 2025-06-19 12:11:06 +01:00
Indi
40e8874887
Whitelisted molds and pumps for Beneath Hellforge (#1183)
Signed-off-by: Indi <JEngelmannPE@gmail.com>
2025-06-17 20:31:15 +01:00
Redeix
2c24ad385d
Revert "Active/food (#1176)" (#1177)
This reverts commit 6c3fce648b.
2025-06-16 23:57:48 -05:00
Redeix
6c3fce648b
Active/food (#1176)
* rearranged food recipes into hopefully a good format?

* custom gregtech machines and logic to handle TFC recipes (#1160)

* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>

* Add placeholder assets for food machines (copied from gtceu)

* remove greenhouse definition from kubejs

* change greenhouse recipe

* Rework recipes file

---------

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* update greenhouse quest

* update greenhouse tooltip

* comment out coconut milk

* langs

* tooltip fix

* wrong food lang

* recipe fixes

* Add some more food recipes (#1166)

* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>

* Add placeholder assets for food machines (copied from gtceu)

* remove greenhouse definition from kubejs

* change greenhouse recipe

* Rework recipes file

* Modify food recipes

* Add some more recipes

* add more recipes and tidy up food recipe file

* change incorrect string

---------

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* - Food changes

---------

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
2025-06-16 23:54:59 -05:00
Pyritie
553c3a9702 mushroom blocks now drop way less mushroom 2025-06-17 01:10:10 +01:00
Pyritie
dff7fd6196 material and rose quartz stuff 2025-06-16 20:32:09 +01:00
Pyritie
08b2a33443 fixed ice capsule recipe not filling it up completely 2025-06-16 18:48:34 +01:00
Pyritie
8bc9247b24 nerfed durability of wooden tongs, slightly tweaked their recipe 2025-06-16 17:42:01 +01:00
Pyritie
35148eaf36 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-16 17:12:56 +01:00
Pyritie
b2cc4beba1 fixed some VI/rolling mill recipes that were still generating for removed items 2025-06-16 17:12:53 +01:00
Jean Roberto de Souza
e35c34040d
Migmatite conflict fix (#1153)
* Migmatite conflict fixe

Tbh I can hardly call this a good fix, but tbh with Stonecutter coming back this might even be meaningless

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

* Update Migmatite

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

* Update recipes.rocks.js

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-16 11:03:14 -05:00
Pyritie
712f8a33c7 fixes #1162 2025-06-16 16:54:28 +01:00
Pyritie
6a6f72829a removed gems tag from flint 2025-06-16 16:50:01 +01:00
Pyritie
5b0e9bda98 fixes #1165 2025-06-16 16:47:43 +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
5d3f50daeb fix railways cap decolor recipe 2025-06-09 21:51:53 +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
7dc2130819 fixes #1134 2025-06-07 11:13:55 +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
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
7a3c5647b3 removed sparks_on_sulfur tag 2025-06-01 21:32:45 +01:00
Pyritie
2027047130 reverted the sugars change 2025-06-01 18:26:42 +01:00
Pyritie
08b8cf7f1c changed the sugars recipe to just work for everything 2025-06-01 18:24:11 +01:00
Spicy Noodles
d83a774a63
TFC sugar recipes use tfg:sugars tag and kaolin dupe fix (#1099) 2025-06-01 12:21:31 -05:00
Jean Roberto de Souza
a85f4dafe3
Winemaking Recipes (#1111)
* Winemaking recipes

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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-01 12:06:03 -05:00
Pyritie
9bea38834b fixes #1108 2025-05-31 19:34:26 +01:00
Pyritie
58a4c3ee55 Changed materials of steam grinder/oven, HS greate things, HV cutter 2025-05-31 15:14:53 +01:00