Commit graph

84 commits

Author SHA1 Message Date
Pyritie
5b462bbb28 compressed airs! 2025-06-10 02:13:26 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +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
a830260b71 chorus/lightbloom stuff 2025-06-07 23:03:41 +01:00
Pyritie
29a713cb6c asurine dust + centrifuge recipes 2025-06-07 21:29:41 +01:00
Pyritie
3ccc700676 ore vein updates 2025-06-07 16:57:39 +01:00
Pyritie
69b4d83067 added recipes for ae2 deco blocks, stone dust centrifuge recipes for the moon 2025-06-07 00:58:45 +01:00
Pyritie
604f2080f3 ad astra recipe tweaks and finishing up 2025-06-06 23:25:30 +01:00
Pyritie
07f984c288 yumy popped chorus fruit (needs a cooking recipe) 2025-06-06 01:22:48 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Pyritie
3f172255ac added high quality fabric tags to phantom silk and nylon 2025-06-04 20:01:04 +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
Pyritie
95c99d761b moved these into a different file 2025-06-01 21:19:24 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +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
Pyritie
17e7981da7 merge 2025-05-31 13:22:08 +01:00
Pyritie
2ceba8b259 aqueous accumulator recipes 2025-05-31 13:21:37 +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
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
ca354a55a9 updated ore vein tags so they're now all in one auto-generated file 2025-05-29 13:00:15 +01:00
Redeix
e3dd2e8e2d
- Fixed pill behavior with cheats off (#1084)
* - Fixed pill behavior with cheats off

* - Updated Changelog
2025-05-28 08:26:25 +01:00
Pyritie
59d2fa64a1 added some more medicine plants 2025-05-27 21:48:21 +01:00
Pyritie
c58f1ee5e5 fixes #1063 2025-05-27 20:42:13 +01:00
Pyritie
928e6084c1 Merge branch 'dev' into feature/space 2025-05-27 19:52:59 +01:00
Redeix
e3c11b1e88
Added Piglin disguise. (#1058)
* - Added piglin disguise.

* - Updated Changelog
2025-05-22 10:18:16 +01:00
Pyritie
0e6b6d5998 added chisel recipes for stone walls 2025-05-18 22:06:29 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
Pyritie
077ebdaf83 hid the new space tfg blocks 2025-05-15 23:21:48 +01:00
Pyritie
448ea6f60b started a tfg space recipes file, moved the air collector ones there 2025-05-15 01:19:39 +01:00
Pyritie
13adbc189f craters but for realsies this time 2025-05-14 01:19:17 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
4aee3b2f51 added proper loose rock, rock pile, and rock delta features for all the moon rock types, added coral features, retextured warped vines 2025-05-13 10:53:11 +01:00
Redeix
a097ec6174
Merge branch 'dev' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-13 01:25:09 -05:00
Redeix
a2ed5209c2 - Revert mold changes from #987 2025-05-13 01:19:09 -05:00
Zack
f1fadb4e99
Add wrought iron alternatives for early game cast iron recipes (#985)
* Add wrought iron alternatives for early game cast iron recipes

* Change doulbe iron ingots tag to use #forge item tags
2025-05-12 11:02:11 -05: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
Redeix
1b3e4c98db - Nerfed steel support recipe output. 2025-05-11 23:33:00 -05:00
Redeix
0d96bc775a - Added recipes for extracting/ forming magma blocks. 2025-05-11 23:22:30 -05:00
Redeix
7176adfc8d - Added recipes to empty vessels and molds 2025-05-11 22:49:16 -05:00
Redeix
9564090c1b - Added item to summon armor stands with arms 2025-05-11 22:15:31 -05:00
Redeix
e47e591c02 - Fixed fishing nets event function 2025-05-11 21:14:36 -05:00
Pyritie
594fd5ee16 oh so THAT's why the recycling recipes weren't working... 2025-05-11 17:52:01 +01:00
Pyritie
c26883efce fixed chiseling non-tfc blocks into slabs was only returning 1 slab instead of both 2025-05-09 00:31:25 +01:00
Pyritie
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +01:00
Pyritie
415b8f6779 fixes #955 2025-05-07 21:56:00 +01:00
Redeix
6b364bcf01
Quick Fixes (#962)
* - 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
2025-05-07 09:26:11 +01:00
Pyritie
96d318d3b0 loose/brick rock textures, knapping textures, missing rock recipes, fixed rock sounds 2025-05-06 16:01:39 +01:00