Commit graph

5397 commits

Author SHA1 Message Date
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
Redeix
692cd26780
- Food changes (#1167) 2025-06-16 10:57:17 +01:00
Redeix
3f46b6856f
- Updated texture for aqueous accumulator (#1168) 2025-06-16 10:56:15 +01:00
Pyritie
3148d3ad66
Update README.md
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-06-16 10:54:54 +01:00
Redeix
e60109bdc9 - Updated texture for aqueous accumulator 2025-06-16 01:05:29 -05:00
Redeix
787a1afe44 - Food changes 2025-06-16 00:33:37 -05:00
ofoxsmith
65f987dd4b
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>
2025-06-15 15:03:16 -05:00
Xikaro
1bfb5a969b
Merge pull request #1156 from TerraFirmaGreg-Team/dev
Release: 0.9.11
2025-06-13 22:14:21 +05:00
Xikaro
a6a5810b7e bump 2025-06-13 22:11:48 +05:00
Xikaro
c8203a17ce Update pakku-lock.json 2025-06-13 22:09:57 +05:00
Redeix
77d981c5fa
Update pakku-lock.json for lunchbox fix (#1164)
* - Update pakku-lock.json for lunchbox fix

* - Update pakku-lock.json
2025-06-13 11:43:34 -05:00
Pyritie
35f950eb79 started work on rewriting the readme 2025-06-13 13:06:56 +01:00
Pyritie
ffc2106945 recipe fixes 2025-06-13 00:39:27 +01:00
Pyritie
86a141881d wrong food lang 2025-06-12 23:10:56 +01:00
Pyritie
2b2deb72fe tooltip fix 2025-06-12 22:48:39 +01:00
Pyritie
36bc3c699c langs 2025-06-12 22:39:25 +01:00
Pyritie
284de79e8c comment out coconut milk 2025-06-12 21:53:25 +01:00
Pyritie
a6402c63af update greenhouse tooltip 2025-06-12 21:53:15 +01:00
Pyritie
8b18a4c7a6 update greenhouse quest 2025-06-12 21:52:37 +01:00
Pyritie
db1907f1a5 pakku updates 2025-06-12 20:38:22 +01:00
Pyritie
c6e090fe50 Merge branch 'dev' into feature/create-6 2025-06-12 13:34:02 +01:00
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
ofoxsmith
f822289573
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>
2025-06-12 13:32:10 +01:00
Pyritie
c83dae8b7d Merge branch 'dev' into feature/food 2025-06-12 13:27:17 +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
3dd247ab7e pakku updates 2025-06-11 20:58:52 +01:00
Pyritie
cc26bf9fca latex balance changes 2025-06-11 20:30:22 +01:00
Pyritie
09a9891a8a changelog 2025-06-11 20:20:21 +01:00
Pyritie
2b0b31d5b5 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-11 20:18:36 +01:00
Pyritie
ff49260d5f added cinnabar to the piglin barter table 2025-06-11 20:18:34 +01:00
Pyritie
a03ea2a556 hi hecuba 2025-06-11 19:43:20 +01:00
Xikaro
c816ac4caf
Merge branch 'main' into dev 2025-06-11 16:37:32 +05:00
Redeix
390bdc3cba
Update pakku-lock (#1157)
* - Added loot table to piglin disguise and updated its texture.
- Reformated lootjs file

* - Update pakku-lock.json
2025-06-11 01:30:43 -05:00
Redeix
e037e0fcc8
Update build.yml (#1155)
Co-authored-by: Xikaro <os.valerievich@ya.ru>
2025-06-11 00:12:45 -05:00
Pyritie
24da0baeb6 fixed steel millstone not actually needing steel, fixed its recycling recipe 2025-06-10 21:21:30 +01:00
Pyritie
33088aa174 rearranged food recipes into hopefully a good format? 2025-06-10 20:13:03 +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
4d492e261d added lunchbox quest 2025-06-10 17:06:45 +01:00
Pyritie
c91f8efe0e changed LV optional quests to correctly have the heart icon 2025-06-10 17:06:14 +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
f53fb9b51b added tfc-lunchbox to pakku too 2025-06-10 16:33:07 +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