Commit graph

1030 commits

Author SHA1 Message Date
Pyritie
d551b40d3a tweaked glowstone, added purpur recipes, changelog 2025-06-21 10:57:49 +01:00
Pyritie
02303f349b fixed recipe conflict with mushroom blocks 2025-06-21 10:57:11 +01:00
Pyritie
d3f0bcd6d6 added space suit fabric 2025-06-21 10:56:44 +01:00
Pyritie
6f8a70ef54 added dry ice to calorie paste recipe 2025-06-20 23:58:11 +01:00
Pyritie
ca87c96ee7 no circuit needed here 2025-06-20 23:57:07 +01:00
Redeix
5ef550f0c2
changed dry ice and calorie paste recipes (#1201)
* - Lots of food stuff

* Updated Changelog

* Changed dry ice and calorie paste recipes

* Update recipes.miscellaneous.js

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

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-20 18:18:06 +01:00
Redeix
c567450875
- Lots of food stuff (#1196)
* - Lots of food stuff

* Updated Changelog
2025-06-20 09:49:39 +01:00
Pyritie
316b116af5 comments 2025-06-19 17:30:46 +01:00
Pyritie
8f3eac722b Merge branch 'dev' into feature/space 2025-06-19 13:10:11 +01:00
Pyritie
afc88dda91 changelog, added blood lily to klayze loot 2025-06-19 13:09:46 +01:00
Pyritie
4eb9dcd4fc reorganized stone dusts, nerfed them a bit more 2025-06-19 13:03:23 +01:00
Pyritie
1519fc82db merge 2025-06-19 12:12:57 +01:00
Pyritie
0b05648189 fixed a few other steel items being extractable in LV 2025-06-19 12:11:06 +01:00
Pyritie
5b17e57331 nerfed lava aqueous accumulator a bit 2025-06-19 10:50:28 +01:00
Pyritie
25530b72c5 cleaned up some of the tfc data files, also added moon meat! 2025-06-19 00:18:27 +01:00
Pyritie
59481eb03c hid the netherite space suit recipes, tweaked the normal space suit a little 2025-06-19 00:13:22 +01:00
Pyritie
f6b7075d8e the other egg tag for the birt egg 2025-06-18 01:01:58 +01:00
Pyritie
4bc92aeda3 birt stuff 2025-06-17 22:19:18 +01:00
Pyritie
62edf3929f species stuff and loot tables 2025-06-17 20:44:24 +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
Pyritie
1cc0aafa45 dyes 2025-06-17 20:11:29 +01:00
Pyritie
54da8a20e5 oh so that's why 2025-06-17 19:29:19 +01:00
Pyritie
914a82a68a balance tweak? 2025-06-17 19:24:40 +01:00
Pyritie
01fd420f49 people are gonna hate me for this 2025-06-17 19:24:27 +01:00
Pyritie
3676080d13 added a second recipe for leather water flask sides 2025-06-17 19:23:54 +01:00
Pyritie
a9c4bbf473 firmalife moment 2025-06-17 17:44:31 +01:00
Pyritie
d688ee0d11 fix duplicate dyes 2025-06-17 16:57:37 +01:00
Pyritie
9e3768eb5b fixed vat having the wrong fluid for dyes, added other dye fluids 2025-06-17 16:24:44 +01:00
Pyritie
425ef439eb added some text to the food recipes! 2025-06-17 15:52:31 +01:00
Pyritie
9d7c38b6ee whoops, conversion recipe was the wrong way around 2025-06-17 14:51:25 +01:00
Pyritie
e38425d597 removed old refrigerator, added conversion to new one 2025-06-17 14:47:42 +01:00
Pyritie
d362e73055 updated veins 2025-06-17 13:39:29 +01:00
Pyritie
1ab2777fcd fixed ISPRecipeLogic path 2025-06-17 12:20:47 +01:00
Pyritie
c13edcabdc merge food branch into space branch 2025-06-17 12:12:43 +01:00
Redeix
208b916d8c
- Fixed brining and smoking recipes and added drying recipes. (#1181) 2025-06-17 11:33:15 +01:00
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge" 2025-06-17 00:56:25 -05: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
Redeix
fb90ef6666
Merge branch 'dev' into active/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Pyritie
553c3a9702 mushroom blocks now drop way less mushroom 2025-06-17 01:10:10 +01:00
Pyritie
bc61d06232 merge 2025-06-17 01:02:15 +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
GameStar
0fd7c2d1fd
Adding glow ink recipe (#1171)
* Adding glow ink recipe

* config test

* changing to chem bath and 'glowing dye'

---------

Co-authored-by: Xikaro <os.valerievich@ya.ru>
2025-06-16 18:38:29 +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