Commit graph

919 commits

Author SHA1 Message Date
Pyritie
37c1e0794e fixed merge 2025-05-21 21:05:53 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
4cac0114cd fixes soybean oil 2025-05-21 20:50:49 +01:00
Pyritie
68acb6b7c1 properly fixes #1049 2025-05-21 20:50:37 +01:00
Pyritie
b2d535b33b actually fixes #1053 2025-05-21 20:40:10 +01:00
Pyritie
02d784801e maybe #1051 2025-05-21 12:54:45 +01:00
Pyritie
ea96a6c825 implements #1049 2025-05-21 12:49:04 +01:00
Pyritie
f36b590c4e fixes #1056 2025-05-21 12:33:18 +01:00
Pyritie
b33abc5ba8 fixes #1053 2025-05-21 12:23:04 +01:00
Pyritie
53647c30ae changed aircraft engine recipes to use the correct tier cables 2025-05-19 16:57:26 +01:00
Spicy Noodles
f9c2a5f70d
Add extra small gear anvil recipes (#1041)
* Add extra small gear anvil recipes

* Update recipes.metals.js

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-05-19 02:26:39 +01:00
Pyritie
7cd9cde0b7 added circuit to the two different salt waters in the mixer 2025-05-19 00:35:14 +01:00
Pyritie
0cd0489998 added vacuumizer recipe for dandelions/goldenrod 2025-05-19 00:23:30 +01:00
Pyritie
43baa760fa smelting recipes for chocolate 2025-05-18 22:42:39 +01:00
Pyritie
027039d44a electric greenhouse now uses way less electricity 2025-05-18 22:07:56 +01:00
Pyritie
0e6b6d5998 added chisel recipes for stone walls 2025-05-18 22:06:29 +01:00
Pyritie
54e9155f49 fixed framed pressure plates 2025-05-18 21:59:07 +01:00
Pyritie
11b52b9ec3 made pressure plates cheaper 2025-05-18 21:51:27 +01:00
Pyritie
be0f6ab296 fixed being able to get infinite lights through domum 2025-05-18 21:49:06 +01:00
Pyritie
5bf1d24f1f removed raw ore block recipes 2025-05-18 21:40:46 +01:00
Pyritie
6bf4a74479 removed the last few ways of getting perma lights pre-LV 2025-05-18 21:31:42 +01:00
Pyritie
6048af8042
Entity loot table changes (#1035)
* trying stuff, might delete later

* updated all loot tables so looting only affects animal meat drops
2025-05-18 21:11:53 +01:00
Pyritie
30c8a05036 credit crafting 2025-05-18 20:11:49 +01:00
Pyritie
58e29c68e7 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-18 19:14:27 +01:00
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
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
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