Commit graph

1849 commits

Author SHA1 Message Date
Pyritie
689e4e870a added sugar water recipe 2025-05-18 19:04:46 +01:00
Risuga
f81bb6582c
Overlapping recipe fixes (#1024)
* fix overlapping recipes

* changelog
2025-05-18 18:52:12 +01:00
Pyritie
f98b5292e8 I think I might've fixed #1028????? 2025-05-18 18:01:12 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
Pyritie
c3994e36f0 Merge branch 'dev' into feature/create-6 2025-05-18 12:22:27 +01:00
TomPlop
917b626257
Bedrock miner for the moon (#1021)
* bedrock vein moon

* Bedrock miner implementation

* adding mica vein and fixing vein id with tfg

* fix for id mica vein
2025-05-16 18:03:18 +01:00
Pyritie
077ebdaf83 hid the new space tfg blocks 2025-05-15 23:21:48 +01:00
Pyritie
c7b3ba56b0 put tin jar lid recycling in the right category 2025-05-15 23:21:35 +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
973a8c7e8e added recipes for the oxygen loader 2025-05-15 01:19:17 +01:00
Pyritie
4772397870 removing the gregtech material error suppression because it's just causing more confusion 2025-05-14 22:23:10 +01:00
Pyritie
36683465ff Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-14 21:06:32 +01:00
TomPlop
9c8369262a
Fix for Create Deco bricks conflict with Minecraft bricks in the assembler (#1005)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-05-14 20:59:22 +01:00
Pyritie
761f396080 removed obsidian framed pressure plate - idk what it even does, but it's causing crashes
fixes #1006
2025-05-14 20:59:01 +01:00
Pyritie
27a6f70141 fixed the basin having the wrong tag to be used with the charcoal forge 2025-05-14 20:57:48 +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
Pyritie
13adbc189f craters but for realsies this time 2025-05-14 01:19:17 +01:00
Pyritie
acd98975ee never mind, those craters looked bad 2025-05-13 21:12:59 +01:00
Pyritie
c8c894a653 craters...? not a huge fan of these tbh 2025-05-13 21:00:04 +01:00
Pyritie
d226fd6954 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-05-13 17:10:27 +01:00
TomPlop
c2d903495b
HV Quests in eng and fixes for others quests and HV integration (#998) 2025-05-13 11:09:04 -05:00
Pyritie
96aae3ae33 finished adding spikes for all rocks 2025-05-13 16:24:00 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
9069b4c1a6 Merge branch 'dev' into feature/create-6 2025-05-13 10:53:57 +01:00
Pyritie
0e7254559a Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-05-13 10:53:13 +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
SverhRazum-Nah
72c2bce583
salt water fast fix (#992)
no more circuits

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-05-12 20:23:08 -05:00
Redeix
550f658ac5
Merge branch 'hv_moon_quest' into feature/space
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-12 12:28:05 -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
3b9c6e32a6 added recipes for the other millstones 2025-05-11 18:57:03 +01:00
Pyritie
f4c82abc1e added assembler recipes for greate things 2025-05-11 18:26:07 +01:00
Pyritie
dc0647f917 merge 2025-05-11 17:53:55 +01:00
Pyritie
1771c2eecc made the steam multiblock inputs/outputs significantly cheaper 2025-05-11 17:52:18 +01:00
Pyritie
594fd5ee16 oh so THAT's why the recycling recipes weren't working... 2025-05-11 17:52:01 +01:00
Risuga
68eaf58693
Buff Large Boiler Fuel Efficiency (#977)
* bufflargeboilers

* formatting
2025-05-11 17:29:24 +01:00
Pyritie
e9a43b6a7a fixes #931 2025-05-11 17:25:16 +01:00
Pyritie
3baa373313 hopper in assembler now has a circuit condition 2025-05-11 17:24:58 +01:00
Pyritie
3aafbc709a fixed iron door inconsistency 2025-05-11 17:24:36 +01:00
Pyritie
3bad04a06b removed the leather armor recycling because it's basically infinite armor 2025-05-11 17:20:14 +01:00
Pyritie
26438a6165 added assembler recipes for most create things, made steam engines, blaze burners, and alternators cheaper, made firmaciv sails use any fabric 2025-05-11 16:59:03 +01:00
Pyritie
07880e5783 added recipes for greenhouse ports, added recipes for stainless steel greenhouse (if you want to be fancy) 2025-05-11 15:35:35 +01:00
Pyritie
94de3037e4 added "requiresNaturalLog" config to afc tree tapping recipes so you can't tap your house 2025-05-10 02:33:44 +01:00