Commit graph

268 commits

Author SHA1 Message Date
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
Pyritie
e1aec5977c fixes warnings about metal bars in the cutter 2025-06-10 16:36:03 +01:00
Pyritie
75a6d3d875 fixed colored steel from having higher tier blast furnace recipes, now they can all just use the basic one too 2025-06-10 16:32:32 +01:00
Pyritie
09641378a3 fixed using the wrong battery in the ultimate battery recipe 2025-06-10 11:38:55 +01:00
Pyritie
b93ff500d0 whatever this is 2025-06-10 02:13:38 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +01:00
Pyritie
c11e13c949 fixes #1149 2025-06-09 18:46:30 +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
Pyritie
a830260b71 chorus/lightbloom stuff 2025-06-07 23:03:41 +01:00
Pyritie
b36a2c1741 oh yeah there's no etrium ore 2025-06-07 17:06:43 +01:00
Pyritie
3ccc700676 ore vein updates 2025-06-07 16:57:39 +01:00
Pyritie
04a57e48db Merge branch 'dev' into feature/space 2025-06-07 11:24:51 +01:00
Pyritie
7dc2130819 fixes #1134 2025-06-07 11:13:55 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Pyritie
ecbc791b30 better recipes for bars, doors, trapdoors 2025-06-04 23:23:45 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +01:00
Pyritie
e13960638f fixed greenhouse perfect OC 2025-06-04 21:14:15 +01:00
Pyritie
b90e389e86 existing greenhouse recipes now require to be on earth 2025-06-01 21:19:07 +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
9bea38834b fixes #1108 2025-05-31 19:34:26 +01:00
Pyritie
58a4c3ee55 Changed materials of steam grinder/oven, HS greate things, HV cutter 2025-05-31 15:14:53 +01:00
Jean Roberto de Souza
eb182e18b8
Stick Bundling (#1101)
Just packer recipes to make compacting sticks easier

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-05-31 00:22:34 +01:00
TomPlop
6ad1717237
Fix for Hopper conflict with Assembler (#1098) 2025-05-30 19:58:37 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
7cd9cde0b7 added circuit to the two different salt waters in the mixer 2025-05-19 00:35:14 +01:00
Pyritie
027039d44a electric greenhouse now uses way less electricity 2025-05-18 22:07:56 +01:00
Pyritie
5bf1d24f1f removed raw ore block recipes 2025-05-18 21:40:46 +01:00
Pyritie
30c8a05036 credit crafting 2025-05-18 20:11:49 +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
4772397870 removing the gregtech material error suppression because it's just causing more confusion 2025-05-14 22:23:10 +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
9262133484 merge 2025-05-13 10:55:31 +01: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
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
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
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
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +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
fb9988f5f6 Merge branch 'dev' into feature/space 2025-05-06 12:36:09 +01:00
Pyritie
8a26bb1ff1 hammer loot tables for ad astra stone types 2025-05-05 23:17:07 +01:00
Xikaro
3b34dd634a Merge remote-tracking branch 'origin/main' into dev 2025-05-06 01:45:19 +05:00
Pyritie
10fb12f77b reverting part of 506faea because it screwed with tags 2025-05-05 20:30:02 +01:00
Pyritie
0256ece0dd added loose stone, bricks, and recipes for all the different ad astra stone types 2025-05-05 20:08:42 +01:00