Commit graph

309 commits

Author SHA1 Message Date
Pyritie
425ef439eb added some text to the food recipes! 2025-06-17 15:52:31 +01:00
Pyritie
d362e73055 updated veins 2025-06-17 13:39:29 +01:00
Pyritie
7ab8693fe2 langs 2025-06-17 12:30:38 +01:00
Pyritie
c13edcabdc merge food branch into space branch 2025-06-17 12:12:43 +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
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
595c917ef9 langs 2025-06-17 01:03:28 +01:00
Pyritie
bc61d06232 merge 2025-06-17 01:02:15 +01:00
Pyritie
4f3d8f3ec6 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-06-17 01:01:35 +01:00
Pyritie
a96bbf2b12 updated dimension marker for the beneath, new ones for other planets 2025-06-17 01:01:33 +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
7f11bed7eb quest updates, langs 2025-06-16 18:37:24 +01:00
Pyritie
242a31b515 tweaked zinc color, added new plated block color 2025-06-16 17:40:22 +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
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
Pyritie
86a141881d wrong food lang 2025-06-12 23:10:56 +01:00
Pyritie
36bc3c699c langs 2025-06-12 22:39:25 +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
cc26bf9fca latex balance changes 2025-06-11 20:30:22 +01:00
Pyritie
ff49260d5f added cinnabar to the piglin barter table 2025-06-11 20:18:34 +01:00
Pyritie
4d492e261d added lunchbox quest 2025-06-10 17:06:45 +01:00
Pyritie
d44f713041 lang 2025-06-10 02:17:16 +01:00
Pyritie
0d62bfb3e6 langs 2025-06-10 01:03:39 +01:00
Pyritie
e77ca60a26 revert new raw iron texture 2025-06-09 23:21:48 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +01:00
Pyritie
5be2eb1d99 welcome back stonecutter 2025-06-09 21:01:09 +01:00
Pyritie
fd7ae525ff langs 2025-06-09 18:52:20 +01:00
Pyritie
80e25ff6d9 langs 2025-06-07 20:34:25 +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
c359174053 langs 2025-06-07 17:52:32 +01:00
Pyritie
c7bed8a44a langs 2025-06-06 23:45:18 +01:00
Pyritie
637dfda744 updated ore field guide 2025-06-05 22:45:02 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Pyritie
3832fbbe2e langs 2025-06-04 23:25:59 +01:00
Pyritie
da64f9975c updating langs 2025-06-04 20:34:39 +01:00
Pyritie
7b1b2a82b1 biome lang 2025-06-03 01:39:34 +01:00
Pyritie
076775bfc5 Merge branch 'dev' into feature/space 2025-06-02 23:07:47 +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
Spicy Noodles
52dcc54089
Add Optional Bacon Quest (#1122)
* Add bacon quest

* Fix merging issue

* Changelog

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-02 15:45:47 -05:00
Pyritie
da452c88e3 fixed some field guide pages 2025-06-02 21:15:32 +01:00
Pyritie
0552a51721 added sand layer blocks 2025-06-02 00:19:53 +01:00
Pyritie
3130f54818 retextured raw iron block / raw iron ore, changed ad astra sky stone to look like more of a meteorite, langs 2025-06-01 22:25:54 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +01:00
Pyritie
e4d943eab4 langs 2025-06-01 18:14:01 +01:00
Pyritie
0b47224d98 added better aqueous accumulator machine textures, added a quest for it, rearranged LV a bit because it was getting cramped 2025-05-31 15:14:03 +01:00