Commit graph

255 commits

Author SHA1 Message Date
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
bc61d06232 merge 2025-06-17 01:02:15 +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
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
5be2eb1d99 welcome back stonecutter 2025-06-09 21:01:09 +01:00
Pyritie
fd7ae525ff langs 2025-06-09 18:52:20 +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
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
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
Redeix
e0cbe907f4
Trowel item (#1106)
* - Changed the weird assembler piston recipe.

* - Updated Changelog

* - Added Trowel tool.
- Increased size of piglin disguise to prevent texture clipping.

* - Updated Changelog
2025-05-31 11:35:36 +01:00
Pyritie
6f5ce5e6d7 langs 2025-05-31 03:15:12 +01:00
Pyritie
d5d395f9c7 langs for aqueous accumulator 2025-05-31 02:36:53 +01:00
Pyritie
43d3717900 brazilian portuguese langs 2025-05-31 02:33:41 +01:00
Pyritie
f7e8efdd7c added more precise kaolin data to the field guide 2025-05-29 20:31:08 +01:00
Pyritie
d521b0e6d4 langs 2025-05-28 22:22:49 +01:00
oogabooga-dev
899663b64f
Merge pull request #1074 from oogabooga-dev/feature/hammer_ru_questbook_fix
fix ore basics questbook ru translation
2025-05-28 16:47:57 +05:00
Pyritie
aec3ee50e3 removed double mention of piglin disguise in changelog 2025-05-27 22:20:20 +01:00
Pyritie
3f87252d2e langs, changelog 2025-05-27 21:43:10 +01:00
Pyritie
447a572edd langs 2025-05-27 20:13:01 +01:00
Pyritie
81871eb773 langs 2025-05-27 19:53:47 +01:00
Redeix
e3c11b1e88
Added Piglin disguise. (#1058)
* - Added piglin disguise.

* - Updated Changelog
2025-05-22 10:18:16 +01:00
Pyritie
ef60dfa8d6 moving the multiblock/ore diagram EMI tabs to the front 2025-05-19 01:32:02 +01:00
Pyritie
054a27977b added default keybinds for ftb-chunks, updated field guide and quests for it 2025-05-18 21:08:20 +01:00
Pyritie
f569ded46d fishing net field guide typo 2025-05-18 20:50:02 +01:00
Pyritie
4aa2cd30f8 langs 2025-05-18 20:11:53 +01:00
Pyritie
30c8a05036 credit crafting 2025-05-18 20:11:49 +01:00
Pyritie
4cf0aa8b6b langs, quest tweaks, updated field guide for sprinklers 2025-05-15 23:21:20 +01:00
Risuga
165cc8d2cd
Some recipe changes (#1003)
* misc recipes

* add saw to jar lid recipe

* revert table salt name changing that didn't work
2025-05-14 19:42:32 +01:00
Redeix
cf54f584b4
Fixes and features (#987)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe

* - Fixed fishing nets event function

* Update queststfc_tips.snbt

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

* Update en_us.json

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

* - Added item to summon armor stands with arms

* - Added recipes to empty vessels and molds

* - Added recipes for extracting/ forming magma blocks.

* - Added recipes for extracting/ forming magma blocks.

* - Nerfed steel support recipe output.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-12 12:29:10 +01:00
Pyritie
8f67db7554 langs 2025-05-11 16:59:07 +01:00
Pyritie
b9af0c3afe quest fixes, lang strings 2025-05-11 15:55:19 +01:00
Risuga
91185360db
Field guide updates (#973) 2025-05-09 08:31:25 +01:00
Pyritie
a8c6033f7b langs 2025-05-07 21:54:12 +01:00
Pyritie
315aaeb078 langs 2025-05-07 21:40:46 +01:00