From bee1facd1b8e78d4ef734a7b1986276133e9e980 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Thu, 10 Oct 2019 04:28:42 +0200 Subject: Implemented MultiHatch. Fixed all known bugs in the T.F.F.T's fluid handling. Fluid storage not yet persistent. --- GregTech.lang | 80 + config/GregTech/MaterialProperties.cfg | 1 + config/GregTech/OverpoweredStuff.cfg | 1 + config/GregTech/Recipes.cfg | 451 +++ config/GregTech/Unification.cfg | 56 + config/IC2.ini | 2 +- config/endercore/cropConfig.json | 21 + config/endercore/endercore.cfg | 108 + config/enderio/AlloySmelterRecipes_Core.xml | 408 +++ config/enderio/AlloySmelterRecipes_User.xml | 31 + config/enderio/EnchanterRecipes_Core.xml | 118 + config/enderio/EnchanterRecipes_User.xml | 27 + config/enderio/EnderIO.cfg | 1058 +++++++ config/enderio/OreDictionaryPreferences_Core.xml | 105 + config/enderio/OreDictionaryPreferences_User.xml | 7 + config/enderio/PainterPaintSources_Core.xml | 36 + config/enderio/PainterPaintSources_User.xml | 15 + config/enderio/PoweredSpawnerConfig_Core.json | 50 + config/enderio/PoweredSpawnerConfig_User.json | 9 + config/enderio/SAGMillRecipes_Core.xml | 2982 ++++++++++++++++++++ config/enderio/SAGMillRecipes_User.xml | 101 + config/enderio/SliceAndSpliceRecipes_Core.xml | 67 + config/enderio/SliceAndSpliceRecipes_User.xml | 3 + config/enderio/VatRecipes_Core.xml | 133 + config/enderio/VatRecipes_User.xml | 3 + config/splash.properties | 2 +- logs/2019-10-09-1.log.gz | Bin 2256 -> 1260 bytes logs/2019-10-09-2.log.gz | Bin 0 -> 1297 bytes logs/2019-10-09-3.log.gz | Bin 0 -> 1167 bytes logs/2019-10-09-4.log.gz | Bin 0 -> 1162 bytes logs/2019-10-09-5.log.gz | Bin 0 -> 2490 bytes logs/2019-10-09-6.log.gz | Bin 0 -> 886 bytes logs/2019-10-09-7.log.gz | Bin 0 -> 1611 bytes logs/2019-10-10-1.log.gz | Bin 0 -> 1270 bytes logs/2019-10-10-2.log.gz | Bin 0 -> 1661 bytes logs/2019-10-10-3.log.gz | Bin 0 -> 1305 bytes logs/2019-10-10-4.log.gz | Bin 0 -> 1952 bytes logs/2019-10-10-5.log.gz | Bin 0 -> 3380 bytes logs/2019-10-10-6.log.gz | Bin 0 -> 1938 bytes mods/EnderCore-1.7.10-0.2.0.39_beta.jar | Bin 0 -> 467824 bytes mods/EnderIO-1.7.10-2.3.0.432_beta.jar | Bin 0 -> 4800552 bytes saves/NEI/local/New World/NEI.dat | Bin 78 -> 75 bytes saves/New World/DIM-1/data/villages.dat | Bin 56 -> 56 bytes saves/New World/DIM1/data/villages.dat | Bin 56 -> 56 bytes saves/New World/data/villages.dat | Bin 56 -> 56 bytes saves/New World/level.dat | Bin 14603 -> 16729 bytes saves/New World/level.dat_old | Bin 14601 -> 16729 bytes saves/New World/region/r.0.0.mca | Bin 69632 -> 73728 bytes saves/New World/session.lock | Bin 8 -> 8 bytes src/main/java/blocks/Block_TFFTMultiHatch.java | 39 + src/main/java/kekztech/KekzCore.java | 6 + src/main/java/kekztech/MultiFluidHandler.java | 132 +- .../java/tileentities/GTMTE_FluidMultiStorage.java | 74 +- src/main/java/tileentities/TE_TFFTMultiHatch.java | 120 + src/main/java/tileentities/TFFTMultiHatch.java | 138 - .../kekztech/textures/blocks/TFFTMultiHatch.png | Bin 0 -> 5558 bytes .../kekztech/textures/items/UraniumFuelRod.png | Bin 0 -> 441 bytes 57 files changed, 6211 insertions(+), 173 deletions(-) create mode 100644 config/endercore/cropConfig.json create mode 100644 config/endercore/endercore.cfg create mode 100644 config/enderio/AlloySmelterRecipes_Core.xml create mode 100644 config/enderio/AlloySmelterRecipes_User.xml create mode 100644 config/enderio/EnchanterRecipes_Core.xml create mode 100644 config/enderio/EnchanterRecipes_User.xml create mode 100644 config/enderio/EnderIO.cfg create mode 100644 config/enderio/OreDictionaryPreferences_Core.xml create mode 100644 config/enderio/OreDictionaryPreferences_User.xml create mode 100644 config/enderio/PainterPaintSources_Core.xml create mode 100644 config/enderio/PainterPaintSources_User.xml create mode 100644 config/enderio/PoweredSpawnerConfig_Core.json create mode 100644 config/enderio/PoweredSpawnerConfig_User.json create mode 100644 config/enderio/SAGMillRecipes_Core.xml create mode 100644 config/enderio/SAGMillRecipes_User.xml create mode 100644 config/enderio/SliceAndSpliceRecipes_Core.xml create mode 100644 config/enderio/SliceAndSpliceRecipes_User.xml create mode 100644 config/enderio/VatRecipes_Core.xml create mode 100644 config/enderio/VatRecipes_User.xml create mode 100644 logs/2019-10-09-2.log.gz create mode 100644 logs/2019-10-09-3.log.gz create mode 100644 logs/2019-10-09-4.log.gz create mode 100644 logs/2019-10-09-5.log.gz create mode 100644 logs/2019-10-09-6.log.gz create mode 100644 logs/2019-10-09-7.log.gz create mode 100644 logs/2019-10-10-1.log.gz create mode 100644 logs/2019-10-10-2.log.gz create mode 100644 logs/2019-10-10-3.log.gz create mode 100644 logs/2019-10-10-4.log.gz create mode 100644 logs/2019-10-10-5.log.gz create mode 100644 logs/2019-10-10-6.log.gz create mode 100644 mods/EnderCore-1.7.10-0.2.0.39_beta.jar create mode 100644 mods/EnderIO-1.7.10-2.3.0.432_beta.jar create mode 100644 src/main/java/blocks/Block_TFFTMultiHatch.java create mode 100644 src/main/java/tileentities/TE_TFFTMultiHatch.java delete mode 100644 src/main/java/tileentities/TFFTMultiHatch.java create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch.png create mode 100644 src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png diff --git a/GregTech.lang b/GregTech.lang index 50a80fbe3e..ab5f26fc5d 100644 --- a/GregTech.lang +++ b/GregTech.lang @@ -2261,6 +2261,7 @@ languagefile { S:TileEntity_DESCRIPTION_4456_Index_0=Just something you can put a Cover or CFoam on. S:TileEntity_DESCRIPTION_4459_Index_0=Just something you can put a Cover or CFoam on. S:TileEntity_DESCRIPTION_445_Index_0=Put Lava and Water adjacent + S:TileEntity_DESCRIPTION_4460_Index_0=Just something you can put a Cover or CFoam on. S:TileEntity_DESCRIPTION_4466_Index_0=Just something you can put a Cover or CFoam on. S:TileEntity_DESCRIPTION_4467_Index_0=Just something you can put a Cover or CFoam on. S:TileEntity_DESCRIPTION_4468_Index_0=Just something you can put a Cover or CFoam on. @@ -4667,6 +4668,7 @@ languagefile { S:gt.blockmachines.gt_frame_copper.name=Copper Frame Box S:gt.blockmachines.gt_frame_cupronickel.name=Cupronickel Frame Box S:gt.blockmachines.gt_frame_damascussteel.name=Damascus Steel Frame Box + S:gt.blockmachines.gt_frame_darksteel.name=Dark Steel Frame Box S:gt.blockmachines.gt_frame_duranium.name=Duranium Frame Box S:gt.blockmachines.gt_frame_electrum.name=Electrum Frame Box S:gt.blockmachines.gt_frame_epoxid.name=Epoxy Resin Frame Box @@ -5432,6 +5434,7 @@ languagefile { S:gt.blockores.1359.name=Niobium Nitride Ore S:gt.blockores.1360.name=Niobium-Titanium Ore S:gt.blockores.1363.name=Tin Alloy Ore + S:gt.blockores.1364.name=Dark Steel Ore S:gt.blockores.1370.name=Tungstencarbide Ore S:gt.blockores.1371.name=Vanadiumsteel Ore S:gt.blockores.1372.name=HSS-G Ore @@ -5626,6 +5629,7 @@ languagefile { S:gt.blockores.1636.name=Polystyrene Ore S:gt.blockores.16360.name=Small Niobium-Titanium Ore S:gt.blockores.16363.name=Small Tin Alloy Ore + S:gt.blockores.16364.name=Small Dark Steel Ore S:gt.blockores.1637.name=Styrene Ore S:gt.blockores.16370.name=Small Tungstencarbide Ore S:gt.blockores.16371.name=Small Vanadiumsteel Ore @@ -6146,6 +6150,7 @@ languagefile { S:gt.blockores.1736.name=Sulfuric Naphtha Ore S:gt.blockores.17360.name=Small Niobium-Titanium Ore S:gt.blockores.17363.name=Small Tin Alloy Ore + S:gt.blockores.17364.name=Small Dark Steel Ore S:gt.blockores.1737.name=Sulfuric Light Fuel Ore S:gt.blockores.17370.name=Small Tungstencarbide Ore S:gt.blockores.17371.name=Small Vanadiumsteel Ore @@ -6613,6 +6618,7 @@ languagefile { S:gt.blockores.1836.name=Saltpeter Ore S:gt.blockores.18360.name=Small Niobium-Titanium Ore S:gt.blockores.18363.name=Small Tin Alloy Ore + S:gt.blockores.18364.name=Small Dark Steel Ore S:gt.blockores.1837.name=Silicon Dioxide Ore S:gt.blockores.18370.name=Small Tungstencarbide Ore S:gt.blockores.18371.name=Small Vanadiumsteel Ore @@ -7124,6 +7130,7 @@ languagefile { S:gt.blockores.1936.name=Granitic Mineral Sand S:gt.blockores.19360.name=Small Niobium-Titanium Ore S:gt.blockores.19363.name=Small Tin Alloy Ore + S:gt.blockores.19364.name=Small Dark Steel Ore S:gt.blockores.1937.name=Cassiterite Sand S:gt.blockores.19370.name=Small Tungstencarbide Ore S:gt.blockores.19371.name=Small Vanadiumsteel Ore @@ -7599,6 +7606,7 @@ languagefile { S:gt.blockores.2036.name=Zinc Ore S:gt.blockores.20360.name=Small Niobium-Titanium Ore S:gt.blockores.20363.name=Small Tin Alloy Ore + S:gt.blockores.20364.name=Small Dark Steel Ore S:gt.blockores.2037.name=Gallium Ore S:gt.blockores.20370.name=Small Tungstencarbide Ore S:gt.blockores.20371.name=Small Vanadiumsteel Ore @@ -8060,6 +8068,7 @@ languagefile { S:gt.blockores.21359.name=Small Niobium Nitride Ore S:gt.blockores.21360.name=Small Niobium-Titanium Ore S:gt.blockores.21363.name=Small Tin Alloy Ore + S:gt.blockores.21364.name=Small Dark Steel Ore S:gt.blockores.21370.name=Small Tungstencarbide Ore S:gt.blockores.21371.name=Small Vanadiumsteel Ore S:gt.blockores.21372.name=Small HSS-G Ore @@ -8487,6 +8496,7 @@ languagefile { S:gt.blockores.22359.name=Small Niobium Nitride Ore S:gt.blockores.22360.name=Small Niobium-Titanium Ore S:gt.blockores.22363.name=Small Tin Alloy Ore + S:gt.blockores.22364.name=Small Dark Steel Ore S:gt.blockores.22370.name=Small Tungstencarbide Ore S:gt.blockores.22371.name=Small Vanadiumsteel Ore S:gt.blockores.22372.name=Small HSS-G Ore @@ -8849,6 +8859,7 @@ languagefile { S:gt.blockores.2359.name=Niobium Nitride Ore S:gt.blockores.2360.name=Niobium-Titanium Ore S:gt.blockores.2363.name=Tin Alloy Ore + S:gt.blockores.2364.name=Dark Steel Ore S:gt.blockores.2370.name=Tungstencarbide Ore S:gt.blockores.2371.name=Vanadiumsteel Ore S:gt.blockores.2372.name=HSS-G Ore @@ -9314,6 +9325,7 @@ languagefile { S:gt.blockores.3359.name=Niobium Nitride Ore S:gt.blockores.3360.name=Niobium-Titanium Ore S:gt.blockores.3363.name=Tin Alloy Ore + S:gt.blockores.3364.name=Dark Steel Ore S:gt.blockores.3370.name=Tungstencarbide Ore S:gt.blockores.3371.name=Vanadiumsteel Ore S:gt.blockores.3372.name=HSS-G Ore @@ -9420,6 +9432,7 @@ languagefile { S:gt.blockores.3637.name=Styrene Ore S:gt.blockores.3638.name=Isoprene Ore S:gt.blockores.3639.name=Tetranitromethane Ore + S:gt.blockores.364.name=Dark Steel Ore S:gt.blockores.3640.name=Diluted Sulfuric Acid Ore S:gt.blockores.3641.name=Ethenone Ore S:gt.blockores.3642.name=Ethane Ore @@ -9771,6 +9784,7 @@ languagefile { S:gt.blockores.4359.name=Niobium Nitride Ore S:gt.blockores.4360.name=Niobium-Titanium Ore S:gt.blockores.4363.name=Tin Alloy Ore + S:gt.blockores.4364.name=Dark Steel Ore S:gt.blockores.4370.name=Tungstencarbide Ore S:gt.blockores.4371.name=Vanadiumsteel Ore S:gt.blockores.4372.name=HSS-G Ore @@ -10244,6 +10258,7 @@ languagefile { S:gt.blockores.536.name=Charcoal Ore S:gt.blockores.5360.name=Niobium-Titanium Ore S:gt.blockores.5363.name=Tin Alloy Ore + S:gt.blockores.5364.name=Dark Steel Ore S:gt.blockores.537.name=Jade Ore S:gt.blockores.5370.name=Tungstencarbide Ore S:gt.blockores.5371.name=Vanadiumsteel Ore @@ -10711,6 +10726,7 @@ languagefile { S:gt.blockores.636.name=Polystyrene Ore S:gt.blockores.6360.name=Niobium-Titanium Ore S:gt.blockores.6363.name=Tin Alloy Ore + S:gt.blockores.6364.name=Dark Steel Ore S:gt.blockores.637.name=Styrene Ore S:gt.blockores.6370.name=Tungstencarbide Ore S:gt.blockores.6371.name=Vanadiumsteel Ore @@ -11604,6 +11620,8 @@ languagefile { S:gt.metaitem.01.11360.tooltip=NbTi S:gt.metaitem.01.11363.name=Tin Alloy Ingot S:gt.metaitem.01.11363.tooltip=SnFe + S:gt.metaitem.01.11364.name=Dark Steel Ingot + S:gt.metaitem.01.11364.tooltip= S:gt.metaitem.01.11370.name=Tungstencarbide Ingot S:gt.metaitem.01.11370.tooltip=WC S:gt.metaitem.01.11371.name=Vanadiumsteel Ingot @@ -11790,6 +11808,8 @@ languagefile { S:gt.metaitem.01.1360.tooltip=NbTi S:gt.metaitem.01.1363.name=Small Pile of Tin Alloy Dust S:gt.metaitem.01.1363.tooltip=SnFe + S:gt.metaitem.01.1364.name=Small Pile of Dark Steel Dust + S:gt.metaitem.01.1364.tooltip= S:gt.metaitem.01.1370.name=Small Pile of Tungstencarbide Dust S:gt.metaitem.01.1370.tooltip=WC S:gt.metaitem.01.1371.name=Small Pile of Vanadiumsteel Dust @@ -12098,6 +12118,8 @@ languagefile { S:gt.metaitem.01.17360.tooltip=NbTi S:gt.metaitem.01.17363.name=Tin Alloy Plate S:gt.metaitem.01.17363.tooltip=SnFe + S:gt.metaitem.01.17364.name=Dark Steel Plate + S:gt.metaitem.01.17364.tooltip= S:gt.metaitem.01.17370.name=Tungstencarbide Plate S:gt.metaitem.01.17370.tooltip=WC S:gt.metaitem.01.17371.name=Vanadiumsteel Plate @@ -12390,6 +12412,8 @@ languagefile { S:gt.metaitem.01.1836.tooltip=KNO3 S:gt.metaitem.01.18363.name=Double Tin Alloy Plate S:gt.metaitem.01.18363.tooltip=SnFe + S:gt.metaitem.01.18364.name=Double Dark Steel Plate + S:gt.metaitem.01.18364.tooltip= S:gt.metaitem.01.1837.name=Small Pile of Silicon Dioxide Dust S:gt.metaitem.01.1837.tooltip=SiO2 S:gt.metaitem.01.18370.name=Double Tungstencarbide Plate @@ -12928,6 +12952,8 @@ languagefile { S:gt.metaitem.01.23357.tooltip=V3Ga S:gt.metaitem.01.23363.name=Tin Alloy Rod S:gt.metaitem.01.23363.tooltip=SnFe + S:gt.metaitem.01.23364.name=Dark Steel Rod + S:gt.metaitem.01.23364.tooltip= S:gt.metaitem.01.23370.name=Tungstencarbide Rod S:gt.metaitem.01.23370.tooltip=WC S:gt.metaitem.01.23371.name=Vanadiumsteel Rod @@ -13028,6 +13054,8 @@ languagefile { S:gt.metaitem.01.23635.tooltip=C8H8(C4H6)3 S:gt.metaitem.01.23636.name=Polystyrene Rod S:gt.metaitem.01.23636.tooltip=C8H8 + S:gt.metaitem.01.2364.name=Dark Steel Dust + S:gt.metaitem.01.2364.tooltip= S:gt.metaitem.01.23649.name=Polyvinyl Chloride Rod S:gt.metaitem.01.23649.tooltip=C2H3Cl S:gt.metaitem.01.2370.name=Tungstencarbide Dust @@ -13358,6 +13386,8 @@ languagefile { S:gt.metaitem.01.2636.tooltip=C8H8 S:gt.metaitem.01.26363.name=Tin Alloy Bolt S:gt.metaitem.01.26363.tooltip=SnFe + S:gt.metaitem.01.26364.name=Dark Steel Bolt + S:gt.metaitem.01.26364.tooltip= S:gt.metaitem.01.26370.name=Tungstencarbide Bolt S:gt.metaitem.01.26370.tooltip=WC S:gt.metaitem.01.26371.name=Vanadiumsteel Bolt @@ -13566,6 +13596,8 @@ languagefile { S:gt.metaitem.01.27356.tooltip=Nd S:gt.metaitem.01.27363.name=Tin Alloy Screw S:gt.metaitem.01.27363.tooltip=SnFe + S:gt.metaitem.01.27364.name=Dark Steel Screw + S:gt.metaitem.01.27364.tooltip= S:gt.metaitem.01.27370.name=Tungstencarbide Screw S:gt.metaitem.01.27370.tooltip=WC S:gt.metaitem.01.27371.name=Vanadiumsteel Screw @@ -15136,6 +15168,8 @@ languagefile { S:gt.metaitem.01.334.tooltip=NiAuAgCu3(Fe50C)3 S:gt.metaitem.01.335.name=Tiny Pile of Damascus Steel Dust S:gt.metaitem.01.335.tooltip=Fe50C + S:gt.metaitem.01.3364.name=Impure Pile of Dark Steel Dust + S:gt.metaitem.01.3364.tooltip= S:gt.metaitem.01.34.name=Tiny Pile of Nickel Dust S:gt.metaitem.01.34.tooltip=Ni S:gt.metaitem.01.343.name=Tiny Pile of Cobalt Brass Dust @@ -15228,6 +15262,8 @@ languagefile { S:gt.metaitem.01.3607.tooltip=Ca2Nb2O7 S:gt.metaitem.01.363.name=Tiny Pile of Tin Alloy Dust S:gt.metaitem.01.363.tooltip=SnFe + S:gt.metaitem.01.364.name=Tiny Pile of Dark Steel Dust + S:gt.metaitem.01.364.tooltip= S:gt.metaitem.01.37.name=Tiny Pile of Gallium Dust S:gt.metaitem.01.37.tooltip=Ga S:gt.metaitem.01.370.name=Tiny Pile of Tungstencarbide Dust @@ -15426,6 +15462,8 @@ languagefile { S:gt.metaitem.01.4326.tooltip=Nq+ S:gt.metaitem.01.4327.name=Purified Pile of Naquadria Dust S:gt.metaitem.01.4327.tooltip=NqX + S:gt.metaitem.01.4364.name=Purified Pile of Dark Steel Dust + S:gt.metaitem.01.4364.tooltip= S:gt.metaitem.01.45.name=Tiny Pile of Yttrium Dust S:gt.metaitem.01.45.tooltip=Y S:gt.metaitem.01.4500.name=Purified Pile of Diamond Dust @@ -15726,6 +15764,8 @@ languagefile { S:gt.metaitem.01.535.tooltip=C S:gt.metaitem.01.536.name=Tiny Pile of Charcoal Dust S:gt.metaitem.01.536.tooltip=C + S:gt.metaitem.01.5364.name=Crushed Dark Steel Ore + S:gt.metaitem.01.5364.tooltip= S:gt.metaitem.01.537.name=Tiny Pile of Jade Dust S:gt.metaitem.01.537.tooltip= S:gt.metaitem.01.538.name=Tiny Pile of Lignite Coal Dust @@ -16010,6 +16050,8 @@ languagefile { S:gt.metaitem.01.635.tooltip=C8H8(C4H6)3 S:gt.metaitem.01.636.name=Tiny Pile of Polystyrene Pulp S:gt.metaitem.01.636.tooltip=C8H8 + S:gt.metaitem.01.6364.name=Purified Dark Steel Ore + S:gt.metaitem.01.6364.tooltip= S:gt.metaitem.01.649.name=Tiny Pile of Polyvinyl Chloride Pulp S:gt.metaitem.01.649.tooltip=C2H3Cl S:gt.metaitem.01.65.name=Tiny Pile of Cerium Dust @@ -16246,6 +16288,8 @@ languagefile { S:gt.metaitem.01.7326.tooltip=Nq+ S:gt.metaitem.01.7327.name=Centrifuged Naquadria Ore S:gt.metaitem.01.7327.tooltip=NqX + S:gt.metaitem.01.7364.name=Centrifuged Dark Steel Ore + S:gt.metaitem.01.7364.tooltip= S:gt.metaitem.01.7500.name=Centrifuged Diamond Ore S:gt.metaitem.01.7500.tooltip=C S:gt.metaitem.01.7501.name=Centrifuged Emerald Ore @@ -16890,6 +16934,8 @@ languagefile { S:gt.metaitem.01.9360.tooltip=NbTi S:gt.metaitem.01.9363.name=Tin Alloy Nugget S:gt.metaitem.01.9363.tooltip=SnFe + S:gt.metaitem.01.9364.name=Dark Steel Nugget + S:gt.metaitem.01.9364.tooltip= S:gt.metaitem.01.937.name=Tiny Pile of Cassiterite Sand S:gt.metaitem.01.937.tooltip=SnO2 S:gt.metaitem.01.9370.name=Tungstencarbide Nugget @@ -17117,6 +17163,8 @@ languagefile { S:gt.metaitem.02.10356.tooltip=Nd S:gt.metaitem.02.10363.name=Tin Alloy Wrench Tip S:gt.metaitem.02.10363.tooltip=SnFe + S:gt.metaitem.02.10364.name=Dark Steel Wrench Tip + S:gt.metaitem.02.10364.tooltip= S:gt.metaitem.02.10370.name=Tungstencarbide Wrench Tip S:gt.metaitem.02.10370.tooltip=WC S:gt.metaitem.02.10371.name=Vanadiumsteel Wrench Tip @@ -17301,6 +17349,8 @@ languagefile { S:gt.metaitem.02.11356.tooltip=Nd S:gt.metaitem.02.11363.name=Tin Alloy Universal Spade Head S:gt.metaitem.02.11363.tooltip=SnFe + S:gt.metaitem.02.11364.name=Dark Steel Universal Spade Head + S:gt.metaitem.02.11364.tooltip= S:gt.metaitem.02.11370.name=Tungstencarbide Universal Spade Head S:gt.metaitem.02.11370.tooltip=WC S:gt.metaitem.02.11371.name=Vanadiumsteel Universal Spade Head @@ -17507,6 +17557,8 @@ languagefile { S:gt.metaitem.02.12356.tooltip=Nd S:gt.metaitem.02.12363.name=Tin Alloy Sense Blade S:gt.metaitem.02.12363.tooltip=SnFe + S:gt.metaitem.02.12364.name=Dark Steel Sense Blade + S:gt.metaitem.02.12364.tooltip= S:gt.metaitem.02.12370.name=Tungstencarbide Sense Blade S:gt.metaitem.02.12370.tooltip=WC S:gt.metaitem.02.12371.name=Vanadiumsteel Sense Blade @@ -17763,6 +17815,8 @@ languagefile { S:gt.metaitem.02.13356.tooltip=Nd S:gt.metaitem.02.13363.name=Tin Alloy Plow Head S:gt.metaitem.02.13363.tooltip=SnFe + S:gt.metaitem.02.13364.name=Dark Steel Plow Head + S:gt.metaitem.02.13364.tooltip= S:gt.metaitem.02.13370.name=Tungstencarbide Plow Head S:gt.metaitem.02.13370.tooltip=WC S:gt.metaitem.02.13371.name=Vanadiumsteel Plow Head @@ -17847,6 +17901,8 @@ languagefile { S:gt.metaitem.02.13635.tooltip=C8H8(C4H6)3 S:gt.metaitem.02.13636.name=Polystyrene Plow Head S:gt.metaitem.02.13636.tooltip=C8H8 + S:gt.metaitem.02.1364.name=Dark Steel Pickaxe Head + S:gt.metaitem.02.1364.tooltip= S:gt.metaitem.02.13649.name=Polyvinyl Chloride Plow Head S:gt.metaitem.02.13649.tooltip=C2H3Cl S:gt.metaitem.02.1370.name=Tungstencarbide Pickaxe Head @@ -18041,6 +18097,8 @@ languagefile { S:gt.metaitem.02.15356.tooltip=Nd S:gt.metaitem.02.15363.name=Tin Alloy Buzzsaw Blade S:gt.metaitem.02.15363.tooltip=SnFe + S:gt.metaitem.02.15364.name=Dark Steel Buzzsaw Blade + S:gt.metaitem.02.15364.tooltip= S:gt.metaitem.02.15370.name=Tungstencarbide Buzzsaw Blade S:gt.metaitem.02.15370.tooltip=WC S:gt.metaitem.02.15371.name=Vanadiumsteel Buzzsaw Blade @@ -18199,6 +18257,8 @@ languagefile { S:gt.metaitem.02.1636.tooltip=C8H8 S:gt.metaitem.02.16363.name=Tin Alloy Turbine Blade S:gt.metaitem.02.16363.tooltip=SnFe + S:gt.metaitem.02.16364.name=Dark Steel Turbine Blade + S:gt.metaitem.02.16364.tooltip= S:gt.metaitem.02.16370.name=Tungstencarbide Turbine Blade S:gt.metaitem.02.16370.tooltip=WC S:gt.metaitem.02.16371.name=Vanadiumsteel Turbine Blade @@ -18491,6 +18551,8 @@ languagefile { S:gt.metaitem.02.22356.tooltip=Nd S:gt.metaitem.02.22363.name=Long Tin Alloy Rod S:gt.metaitem.02.22363.tooltip=SnFe + S:gt.metaitem.02.22364.name=Long Dark Steel Rod + S:gt.metaitem.02.22364.tooltip= S:gt.metaitem.02.22370.name=Long Tungstencarbide Rod S:gt.metaitem.02.22370.tooltip=WC S:gt.metaitem.02.22371.name=Long Vanadiumsteel Rod @@ -18635,6 +18697,8 @@ languagefile { S:gt.metaitem.02.2356.tooltip=Nd S:gt.metaitem.02.2363.name=Tin Alloy Shovel Head S:gt.metaitem.02.2363.tooltip=SnFe + S:gt.metaitem.02.2364.name=Dark Steel Shovel Head + S:gt.metaitem.02.2364.tooltip= S:gt.metaitem.02.2370.name=Tungstencarbide Shovel Head S:gt.metaitem.02.2370.tooltip=WC S:gt.metaitem.02.2371.name=Vanadiumsteel Shovel Head @@ -19439,6 +19503,8 @@ languagefile { S:gt.metaitem.02.3356.tooltip=Nd S:gt.metaitem.02.3363.name=Tin Alloy Axe Head S:gt.metaitem.02.3363.tooltip=SnFe + S:gt.metaitem.02.3364.name=Dark Steel Axe Head + S:gt.metaitem.02.3364.tooltip= S:gt.metaitem.02.3370.name=Tungstencarbide Axe Head S:gt.metaitem.02.3370.tooltip=WC S:gt.metaitem.02.3371.name=Vanadiumsteel Axe Head @@ -19525,6 +19591,8 @@ languagefile { S:gt.metaitem.02.3635.tooltip=C8H8(C4H6)3 S:gt.metaitem.02.3636.name=Polystyrene Axe Head S:gt.metaitem.02.3636.tooltip=C8H8 + S:gt.metaitem.02.364.name=Dark Steel Sword Blade + S:gt.metaitem.02.364.tooltip= S:gt.metaitem.02.3649.name=Polyvinyl Chloride Axe Head S:gt.metaitem.02.3649.tooltip=C2H3Cl S:gt.metaitem.02.370.name=Tungstencarbide Sword Blade @@ -19681,6 +19749,8 @@ languagefile { S:gt.metaitem.02.4356.tooltip=Nd S:gt.metaitem.02.4363.name=Tin Alloy Hoe Head S:gt.metaitem.02.4363.tooltip=SnFe + S:gt.metaitem.02.4364.name=Dark Steel Hoe Head + S:gt.metaitem.02.4364.tooltip= S:gt.metaitem.02.4370.name=Tungstencarbide Hoe Head S:gt.metaitem.02.4370.tooltip=WC S:gt.metaitem.02.4371.name=Vanadiumsteel Hoe Head @@ -19931,6 +20001,8 @@ languagefile { S:gt.metaitem.02.5356.tooltip=Nd S:gt.metaitem.02.5363.name=Tin Alloy Hammer Head S:gt.metaitem.02.5363.tooltip=SnFe + S:gt.metaitem.02.5364.name=Dark Steel Hammer Head + S:gt.metaitem.02.5364.tooltip= S:gt.metaitem.02.5370.name=Tungstencarbide Hammer Head S:gt.metaitem.02.5370.tooltip=WC S:gt.metaitem.02.5371.name=Vanadiumsteel Hammer Head @@ -20147,6 +20219,8 @@ languagefile { S:gt.metaitem.02.636.tooltip=C8H8 S:gt.metaitem.02.6363.name=Tin Alloy File Head S:gt.metaitem.02.6363.tooltip=SnFe + S:gt.metaitem.02.6364.name=Dark Steel File Head + S:gt.metaitem.02.6364.tooltip= S:gt.metaitem.02.6370.name=Tungstencarbide File Head S:gt.metaitem.02.6370.tooltip=WC S:gt.metaitem.02.6371.name=Vanadiumsteel File Head @@ -20299,6 +20373,8 @@ languagefile { S:gt.metaitem.02.7356.tooltip=Nd S:gt.metaitem.02.7363.name=Tin Alloy Saw Blade S:gt.metaitem.02.7363.tooltip=SnFe + S:gt.metaitem.02.7364.name=Dark Steel Saw Blade + S:gt.metaitem.02.7364.tooltip= S:gt.metaitem.02.7370.name=Tungstencarbide Saw Blade S:gt.metaitem.02.7370.tooltip=WC S:gt.metaitem.02.7371.name=Vanadiumsteel Saw Blade @@ -20461,6 +20537,8 @@ languagefile { S:gt.metaitem.02.8356.tooltip=Nd S:gt.metaitem.02.8363.name=Tin Alloy Drill Tip S:gt.metaitem.02.8363.tooltip=SnFe + S:gt.metaitem.02.8364.name=Dark Steel Drill Tip + S:gt.metaitem.02.8364.tooltip= S:gt.metaitem.02.8370.name=Tungstencarbide Drill Tip S:gt.metaitem.02.8370.tooltip=WC S:gt.metaitem.02.8371.name=Vanadiumsteel Drill Tip @@ -20631,6 +20709,8 @@ languagefile { S:gt.metaitem.02.9356.tooltip=Nd S:gt.metaitem.02.9363.name=Tin Alloy Chainsaw Tip S:gt.metaitem.02.9363.tooltip=SnFe + S:gt.metaitem.02.9364.name=Dark Steel Chainsaw Tip + S:gt.metaitem.02.9364.tooltip= S:gt.metaitem.02.9370.name=Tungstencarbide Chainsaw Tip S:gt.metaitem.02.9370.tooltip=WC S:gt.metaitem.02.9371.name=Vanadiumsteel Chainsaw Tip diff --git a/config/GregTech/MaterialProperties.cfg b/config/GregTech/MaterialProperties.cfg index 933835c7b0..645cde500a 100644 --- a/config/GregTech/MaterialProperties.cfg +++ b/config/GregTech/MaterialProperties.cfg @@ -4652,6 +4652,7 @@ materials { I:FuelType_0=0 I:GasTemp_0=0 B:HasParentMod_false=false + B:HasParentMod_true=true D:HeatDamage_0.0=0.0 S:"ListMaterialByProducts_,"=, S:"ListMaterialReRegistrations_,"=, diff --git a/config/GregTech/OverpoweredStuff.cfg b/config/GregTech/OverpoweredStuff.cfg index 0c5341c6d3..3ca3f08d2b 100644 --- a/config/GregTech/OverpoweredStuff.cfg +++ b/config/GregTech/OverpoweredStuff.cfg @@ -54,6 +54,7 @@ oreprocessingoutputmultiplier { I:Cobaltite_1=1 I:Cooperite_1=1 I:Copper_1=1 + I:DarkSteel_1=1 I:Diamond_1=1 I:Diatomite_1=1 I:Emerald_1=1 diff --git a/config/GregTech/Recipes.cfg b/config/GregTech/Recipes.cfg index 67e5f3f8ac..d15efea11c 100644 --- a/config/GregTech/Recipes.cfg +++ b/config/GregTech/Recipes.cfg @@ -19,11 +19,15 @@ alloysmelting { I:blockChrome_5=5 I:blockCobaltBrass_5=5 I:blockCobalt_5=5 + I:blockConductiveIron_5=5 I:blockCopper_5=5 I:blockCupronickel_5=5 I:blockDamascusSteel_5=5 + I:blockDarkSteel_5=5 I:blockDuranium_5=5 + I:blockElectricalSteel_5=5 I:blockElectrum_5=5 + I:blockEnergeticAlloy_5=5 I:blockEuropium_5=5 I:blockGallium_5=5 I:blockGold_5=5 @@ -56,15 +60,20 @@ alloysmelting { I:blockOsmiridium_5=5 I:blockOsmium_5=5 I:blockPalladium_5=5 + I:blockPhasedGold_5=5 + I:blockPhasedIron_5=5 I:blockPlatinum_5=5 I:blockPlutonium241_5=5 I:blockPlutonium_5=5 + I:blockPulsatingIron_5=5 I:blockRedAlloy_5=5 I:blockRedSteel_5=5 + I:blockRedstoneAlloy_5=5 I:blockRoseGold_5=5 I:blockSilicon_5=5 I:blockSilver_5=5 I:blockSolderingAlloy_5=5 + I:blockSoularium_5=5 I:blockStainlessSteel_5=5 I:blockSteel_5=5 I:blockSterlingSilver_5=5 @@ -83,10 +92,13 @@ alloysmelting { I:blockVanadiumGallium_5=5 I:blockVanadiumSteel_5=5 I:blockVanadium_5=5 + I:blockVibrantAlloy_5=5 I:blockYttriumBariumCuprate_5=5 I:blockYttrium_5=5 I:blockZinc_5=5 I:bottleEmpty_64=64 + I:enderio.redstoneAlloy_130=130 + I:enderio.soularium_130=130 I:gearGtAluminium_260=260 I:gearGtBronze_760=760 I:gearGtCobaltBrass_580=580 @@ -157,6 +169,7 @@ alloysmelting { I:ingotCobaltBrass_200=200 I:ingotCobalt_130=130 I:ingotCobalt_200=200 + I:ingotConductiveIron_400=400 I:ingotCopper_130=130 I:ingotCopper_200=200 I:ingotCupronickel_100=100 @@ -164,6 +177,8 @@ alloysmelting { I:ingotCupronickel_200=200 I:ingotDamascusSteel_130=130 I:ingotDamascusSteel_200=200 + I:ingotDarkSteel_130=130 + I:ingotDarkSteel_200=200 I:ingotDuranium_130=130 I:ingotDuranium_200=200 I:ingotElectrum_100=100 @@ -242,6 +257,8 @@ alloysmelting { I:ingotOsmium_200=200 I:ingotPalladium_130=130 I:ingotPalladium_200=200 + I:ingotPhasedGold_200=200 + I:ingotPhasedIron_200=200 I:ingotPlastic_130=130 I:ingotPlastic_200=200 I:ingotPlatinum_130=130 @@ -262,11 +279,14 @@ alloysmelting { I:ingotPolyvinylChloride_200=200 I:ingotPotassium_130=130 I:ingotPotassium_200=200 + I:ingotPulsatingIron_200=200 I:ingotRedAlloy_130=130 I:ingotRedAlloy_200=200 I:ingotRedAlloy_50=50 I:ingotRedSteel_130=130 I:ingotRedSteel_200=200 + I:ingotRedstoneAlloy_130=130 + I:ingotRedstoneAlloy_400=400 I:ingotRoseGold_130=130 I:ingotRoseGold_200=200 I:ingotRubber_130=130 @@ -280,6 +300,8 @@ alloysmelting { I:ingotSolderingAlloy_130=130 I:ingotSolderingAlloy_200=200 I:ingotSolderingAlloy_500=500 + I:ingotSoularium_130=130 + I:ingotSoularium_400=400 I:ingotStainlessSteel_130=130 I:ingotStainlessSteel_200=200 I:ingotSteel_130=130 @@ -318,6 +340,7 @@ alloysmelting { I:ingotVanadiumSteel_130=130 I:ingotVanadiumSteel_200=200 I:ingotVanadium_200=200 + I:ingotVibrantAlloy_200=200 I:ingotYttriumBariumCuprate_130=130 I:ingotYttriumBariumCuprate_200=200 I:ingotYttrium_200=200 @@ -365,6 +388,8 @@ alloysmelting { I:nuggetCupronickel_130=130 I:nuggetDamascusSteel_100=100 I:nuggetDamascusSteel_130=130 + I:nuggetDarkSteel_100=100 + I:nuggetDarkSteel_130=130 I:nuggetDuranium_100=100 I:nuggetDuranium_130=130 I:nuggetElectrum_100=100 @@ -456,6 +481,7 @@ alloysmelting { I:nuggetPolyvinylChloride_100=100 I:nuggetPolyvinylChloride_130=130 I:nuggetPotassium_100=100 + I:nuggetPulsatingIron_100=100 I:nuggetRedAlloy_100=100 I:nuggetRedAlloy_130=130 I:nuggetRedSteel_100=100 @@ -509,6 +535,7 @@ alloysmelting { I:nuggetVanadiumSteel_100=100 I:nuggetVanadiumSteel_130=130 I:nuggetVanadium_100=100 + I:nuggetVibrantAlloy_100=100 I:nuggetWroughtIron_100=100 I:nuggetYttriumBariumCuprate_100=100 I:nuggetYttriumBariumCuprate_130=130 @@ -533,6 +560,7 @@ alloysmelting { I:plateCopper_126=126 I:plateCupronickel_120=120 I:plateDamascusSteel_112=112 + I:plateDarkSteel_196=196 I:plateDuranium_196=196 I:plateElectrum_302=302 I:plateEpoxidFiberReinforced_12=12 @@ -656,12 +684,16 @@ arcfurnace { I:blockCoal_110=110 I:blockCobaltBrass_522=522 I:blockCobalt_531=531 + I:blockConductiveIron_882=882 I:blockCopper_567=567 I:blockCupronickel_540=540 I:blockDamascusSteel_504=504 + I:blockDarkSteel_882=882 I:blockDiamond_110=110 I:blockDuranium_882=882 + I:blockElectricalSteel_882=882 I:blockElectrum_1359=1359 + I:blockEnergeticAlloy_882=882 I:blockEuropium_1359=1359 I:blockGallium_630=630 I:blockGold_1764=1764 @@ -698,11 +730,14 @@ arcfurnace { I:blockOsmiridium_1719=1719 I:blockOsmium_1710=1710 I:blockPalladium_954=954 + I:blockPhasedGold_882=882 + I:blockPhasedIron_882=882 I:blockPhosphorus_55=55 I:blockPigIron_504=504 I:blockPlatinum_1755=1755 I:blockPlutonium241_2187=2187 I:blockPlutonium_2214=2214 + I:blockPulsatingIron_882=882 I:blockRedAlloy_3627=3627 I:blockRedSteel_621=621 I:blockRedstone_765=765 @@ -729,6 +764,7 @@ arcfurnace { I:blockVanadiumGallium_495=495 I:blockVanadiumSteel_495=495 I:blockVanadium_459=459 + I:blockVibrantAlloy_882=882 I:blockWroughtIron_504=504 I:blockYttriumBariumCuprate_459=459 I:blockYttrium_801=801 @@ -747,6 +783,7 @@ arcfurnace { I:boltCobalt_16=16 I:boltCupronickel_16=16 I:boltDamascusSteel_16=16 + I:boltDarkSteel_16=16 I:boltDuranium_16=16 I:boltElectrum_18=18 I:boltGold_24=24 @@ -992,6 +1029,7 @@ arcfurnace { I:dustTinyIron_16=16 I:dustTinyNetherrack_16=16 I:dustTinyPigIron_16=16 + I:enderio.silicon_28=28 I:foilAluminium_16=16 I:foilAnnealedCopper_16=16 I:foilBlackSteel_16=16 @@ -1037,6 +1075,7 @@ arcfurnace { I:frameGtCopper_126=126 I:frameGtCupronickel_120=120 I:frameGtDamascusSteel_112=112 + I:frameGtDarkSteel_196=196 I:frameGtDuranium_196=196 I:frameGtElectrum_302=302 I:frameGtEuropium_302=302 @@ -2098,6 +2137,14 @@ arcfurnace { I:item.chestplateIron_448=448 I:item.clock_869=869 I:item.compass_309=309 + I:item.darkSteel_axe_306=306 + I:item.darkSteel_boots_392=392 + I:item.darkSteel_chestplate_784=784 + I:item.darkSteel_helmet_490=490 + I:item.darkSteel_leggings_686=686 + I:item.darkSteel_pickaxe_306=306 + I:item.darkSteel_shears_196=196 + I:item.darkSteel_sword_202=202 I:item.doorIron_336=336 I:item.doorWood_73=73 I:item.enchantedBook_36=36 @@ -2248,6 +2295,7 @@ arcfurnace { I:plateCopper_63=63 I:plateCupronickel_60=60 I:plateDamascusSteel_56=56 + I:plateDarkSteel_98=98 I:plateDenseBronze_684=684 I:plateDenseCopper_567=567 I:plateDenseGold_1764=1764 @@ -2270,6 +2318,7 @@ arcfurnace { I:plateDoubleCobalt_118=118 I:plateDoubleCupronickel_120=120 I:plateDoubleDamascusSteel_112=112 + I:plateDoubleDarkSteel_196=196 I:plateDoubleDuranium_196=196 I:plateDoubleElectrum_302=302 I:plateDoubleGold_392=392 @@ -2444,6 +2493,7 @@ arcfurnace { I:screwCobalt_16=16 I:screwCupronickel_16=16 I:screwDamascusSteel_16=16 + I:screwDarkSteel_16=16 I:screwDuranium_16=16 I:screwElectrum_16=16 I:screwGold_21=21 @@ -2514,6 +2564,7 @@ arcfurnace { I:stickCopper_31=31 I:stickCupronickel_30=30 I:stickDamascusSteel_28=28 + I:stickDarkSteel_49=49 I:stickDuranium_49=49 I:stickElectrum_75=75 I:stickEuropium_75=75 @@ -2543,6 +2594,7 @@ arcfurnace { I:stickLongCobalt_59=59 I:stickLongCupronickel_60=60 I:stickLongDamascusSteel_56=56 + I:stickLongDarkSteel_98=98 I:stickLongDiamond_16=16 I:stickLongDuranium_98=98 I:stickLongElectrum_151=151 @@ -2693,6 +2745,7 @@ arcfurnace { I:toolHeadAxeCobalt_177=177 I:toolHeadAxeCupronickel_180=180 I:toolHeadAxeDamascusSteel_168=168 + I:toolHeadAxeDarkSteel_294=294 I:toolHeadAxeDiamond_36=36 I:toolHeadAxeDuranium_294=294 I:toolHeadAxeElectrum_453=453 @@ -2770,6 +2823,7 @@ arcfurnace { I:toolHeadBuzzSawCobalt_236=236 I:toolHeadBuzzSawCupronickel_240=240 I:toolHeadBuzzSawDamascusSteel_224=224 + I:toolHeadBuzzSawDarkSteel_392=392 I:toolHeadBuzzSawDuranium_392=392 I:toolHeadBuzzSawElectrum_604=604 I:toolHeadBuzzSawGold_784=784 @@ -2837,6 +2891,7 @@ arcfurnace { I:toolHeadChainsawCobalt_370=370 I:toolHeadChainsawCupronickel_372=372 I:toolHeadChainsawDamascusSteel_364=364 + I:toolHeadChainsawDarkSteel_448=448 I:toolHeadChainsawDuranium_448=448 I:toolHeadChainsawElectrum_554=554 I:toolHeadChainsawEpoxidFiberReinforced_252=252 @@ -2911,6 +2966,7 @@ arcfurnace { I:toolHeadDrillCobalt_460=460 I:toolHeadDrillCupronickel_464=464 I:toolHeadDrillDamascusSteel_448=448 + I:toolHeadDrillDarkSteel_616=616 I:toolHeadDrillDuranium_616=616 I:toolHeadDrillElectrum_828=828 I:toolHeadDrillEpoxidFiberReinforced_224=224 @@ -2984,6 +3040,7 @@ arcfurnace { I:toolHeadFileCobalt_118=118 I:toolHeadFileCupronickel_120=120 I:toolHeadFileDamascusSteel_112=112 + I:toolHeadFileDarkSteel_196=196 I:toolHeadFileDuranium_196=196 I:toolHeadFileElectrum_302=302 I:toolHeadFileGold_392=392 @@ -3050,6 +3107,7 @@ arcfurnace { I:toolHeadHammerCobalt_354=354 I:toolHeadHammerCupronickel_360=360 I:toolHeadHammerDamascusSteel_336=336 + I:toolHeadHammerDarkSteel_588=588 I:toolHeadHammerDiamond_73=73 I:toolHeadHammerDuranium_588=588 I:toolHeadHammerElectrum_906=906 @@ -3127,6 +3185,7 @@ arcfurnace { I:toolHeadHoeCobalt_118=118 I:toolHeadHoeCupronickel_120=120 I:toolHeadHoeDamascusSteel_112=112 + I:toolHeadHoeDarkSteel_196=196 I:toolHeadHoeDiamond_24=24 I:toolHeadHoeDuranium_196=196 I:toolHeadHoeElectrum_302=302 @@ -3204,6 +3263,7 @@ arcfurnace { I:toolHeadPickaxeCobalt_177=177 I:toolHeadPickaxeCupronickel_180=180 I:toolHeadPickaxeDamascusSteel_168=168 + I:toolHeadPickaxeDarkSteel_294=294 I:toolHeadPickaxeDiamond_36=36 I:toolHeadPickaxeDuranium_294=294 I:toolHeadPickaxeElectrum_453=453 @@ -3281,6 +3341,7 @@ arcfurnace { I:toolHeadPlowCobalt_236=236 I:toolHeadPlowCupronickel_240=240 I:toolHeadPlowDamascusSteel_224=224 + I:toolHeadPlowDarkSteel_392=392 I:toolHeadPlowDiamond_49=49 I:toolHeadPlowDuranium_392=392 I:toolHeadPlowElectrum_604=604 @@ -3358,6 +3419,7 @@ arcfurnace { I:toolHeadSawCobalt_118=118 I:toolHeadSawCupronickel_120=120 I:toolHeadSawDamascusSteel_112=112 + I:toolHeadSawDarkSteel_196=196 I:toolHeadSawDuranium_196=196 I:toolHeadSawElectrum_302=302 I:toolHeadSawGold_392=392 @@ -3424,6 +3486,7 @@ arcfurnace { I:toolHeadSenseCobalt_177=177 I:toolHeadSenseCupronickel_180=180 I:toolHeadSenseDamascusSteel_168=168 + I:toolHeadSenseDarkSteel_294=294 I:toolHeadSenseDiamond_36=36 I:toolHeadSenseDuranium_294=294 I:toolHeadSenseElectrum_453=453 @@ -3501,6 +3564,7 @@ arcfurnace { I:toolHeadShovelCobalt_59=59 I:toolHeadShovelCupronickel_60=60 I:toolHeadShovelDamascusSteel_56=56 + I:toolHeadShovelDarkSteel_98=98 I:toolHeadShovelDiamond_16=16 I:toolHeadShovelDuranium_98=98 I:toolHeadShovelElectrum_151=151 @@ -3578,6 +3642,7 @@ arcfurnace { I:toolHeadSwordCobalt_118=118 I:toolHeadSwordCupronickel_120=120 I:toolHeadSwordDamascusSteel_112=112 + I:toolHeadSwordDarkSteel_196=196 I:toolHeadSwordDiamond_24=24 I:toolHeadSwordDuranium_196=196 I:toolHeadSwordElectrum_302=302 @@ -3655,6 +3720,7 @@ arcfurnace { I:toolHeadUniversalSpadeCobalt_59=59 I:toolHeadUniversalSpadeCupronickel_60=60 I:toolHeadUniversalSpadeDamascusSteel_56=56 + I:toolHeadUniversalSpadeDarkSteel_98=98 I:toolHeadUniversalSpadeDiamond_16=16 I:toolHeadUniversalSpadeDuranium_98=98 I:toolHeadUniversalSpadeElectrum_151=151 @@ -3733,6 +3799,7 @@ arcfurnace { I:toolHeadWrenchCobalt_262=262 I:toolHeadWrenchCupronickel_266=266 I:toolHeadWrenchDamascusSteel_250=250 + I:toolHeadWrenchDarkSteel_418=418 I:toolHeadWrenchDuranium_418=418 I:toolHeadWrenchElectrum_630=630 I:toolHeadWrenchEpoxidFiberReinforced_26=26 @@ -3806,6 +3873,7 @@ arcfurnace { I:turbineBladeCobalt_354=354 I:turbineBladeCupronickel_360=360 I:turbineBladeDamascusSteel_336=336 + I:turbineBladeDarkSteel_588=588 I:turbineBladeDuranium_588=588 I:turbineBladeElectrum_906=906 I:turbineBladeGold_1176=1176 @@ -4338,6 +4406,7 @@ assembling { I:gt.blockmachines.gt_frame_copper_64=64 I:gt.blockmachines.gt_frame_cupronickel_64=64 I:gt.blockmachines.gt_frame_damascussteel_64=64 + I:gt.blockmachines.gt_frame_darksteel_64=64 I:gt.blockmachines.gt_frame_duranium_64=64 I:gt.blockmachines.gt_frame_electrum_64=64 I:gt.blockmachines.gt_frame_epoxid_64=64 @@ -5050,6 +5119,8 @@ bender { I:ingotCupronickel_60=60 I:ingotDamascusSteel_112=112 I:ingotDamascusSteel_56=56 + I:ingotDarkSteel_196=196 + I:ingotDarkSteel_98=98 I:ingotDuranium_196=196 I:ingotDuranium_98=98 I:ingotElectrum_151=151 @@ -5199,6 +5270,7 @@ bender { I:plateCopper_63=63 I:plateCupronickel_120=120 I:plateDamascusSteel_112=112 + I:plateDarkSteel_196=196 I:plateDuranium_196=196 I:plateDuranium_98=98 I:plateElectrum_151=151 @@ -5569,13 +5641,18 @@ blastfurnace { I:gemSapphire_320=320 I:gt.metaitem.03.32069_900=900 I:ingotCopper_500=500 + I:ingotElectricalSteel_4000=4000 + I:ingotEnergeticAlloy_330=330 I:ingotGallium_600=600 + I:ingotGold_195=195 I:ingotIridium_500=500 + I:ingotIron_160=160 I:ingotIron_500=500 I:ingotNaquadah_500=500 I:ingotNickel_2700=2700 I:ingotNiobium_4500=4500 I:ingotPigIron_100=100 + I:ingotSteel_2000=2000 I:ingotTungsten_3000=3000 I:ingotTungsten_4920=4920 I:ingotVanadium_4500=4500 @@ -5733,6 +5810,7 @@ boxing { B:dustCupronickel_true=true B:dustDamascusSteel_true=true B:dustDarkAsh_true=true + B:dustDarkSteel_true=true B:dustDiamond_true=true B:dustDiatomite_true=true B:dustDilithium_true=true @@ -6226,6 +6304,7 @@ centrifuge { I:dustImpureCobaltite_440=440 I:dustImpureCooperite_1040=1040 I:dustImpureCopper_504=504 + I:dustImpureDarkSteel_784=784 I:dustImpureDiamond_6144=6144 I:dustImpureDiatomite_168=168 I:dustImpureEmerald_144=144 @@ -6363,6 +6442,7 @@ centrifuge { I:dustPureCobaltite_440=440 I:dustPureCooperite_1040=1040 I:dustPureCopper_504=504 + I:dustPureDarkSteel_784=784 I:dustPureDiamond_6144=6144 I:dustPureDiatomite_168=168 I:dustPureEmerald_144=144 @@ -7097,6 +7177,7 @@ compression { B:dustGlowstone_true=true B:dustIce_true=true B:dustNetherQuartz_true=true + B:dustObsidian_true=true B:dustPlutonium_true=true B:dustRedstone_true=true B:dustTinyPlutonium_true=true @@ -7176,11 +7257,15 @@ compression { B:ingotChrome_true=true B:ingotCobaltBrass_true=true B:ingotCobalt_true=true + B:ingotConductiveIron_true=true B:ingotCopper_true=true B:ingotCupronickel_true=true B:ingotDamascusSteel_true=true + B:ingotDarkSteel_true=true B:ingotDuranium_true=true + B:ingotElectricalSteel_true=true B:ingotElectrum_true=true + B:ingotEnergeticAlloy_true=true B:ingotEuropium_true=true B:ingotGallium_true=true B:ingotGold_true=true @@ -7215,16 +7300,21 @@ compression { B:ingotOsmiridium_true=true B:ingotOsmium_true=true B:ingotPalladium_true=true + B:ingotPhasedGold_true=true + B:ingotPhasedIron_true=true B:ingotPigIron_true=true B:ingotPlatinum_true=true B:ingotPlutonium241_true=true B:ingotPlutonium_true=true + B:ingotPulsatingIron_true=true B:ingotRedAlloy_true=true B:ingotRedSteel_true=true + B:ingotRedstoneAlloy_true=true B:ingotRoseGold_true=true B:ingotSilicon_true=true B:ingotSilver_true=true B:ingotSolderingAlloy_true=true + B:ingotSoularium_true=true B:ingotStainlessSteel_true=true B:ingotSteelMagnetic_true=true B:ingotSteel_true=true @@ -7244,6 +7334,7 @@ compression { B:ingotVanadiumGallium_true=true B:ingotVanadiumSteel_true=true B:ingotVanadium_true=true + B:ingotVibrantAlloy_true=true B:ingotWroughtIron_true=true B:ingotYttriumBariumCuprate_true=true B:ingotYttrium_true=true @@ -7264,6 +7355,7 @@ compressor { I:dustGlowstone_300=300 I:dustIce_300=300 I:dustNetherQuartz_300=300 + I:dustObsidian_300=300 I:dustPlutonium_300=300 I:dustRedstone_300=300 I:dustTinyPlutonium_300=300 @@ -7343,11 +7435,15 @@ compressor { I:ingotChrome_300=300 I:ingotCobaltBrass_300=300 I:ingotCobalt_300=300 + I:ingotConductiveIron_300=300 I:ingotCopper_300=300 I:ingotCupronickel_300=300 I:ingotDamascusSteel_300=300 + I:ingotDarkSteel_300=300 I:ingotDuranium_300=300 + I:ingotElectricalSteel_300=300 I:ingotElectrum_300=300 + I:ingotEnergeticAlloy_300=300 I:ingotEuropium_300=300 I:ingotGallium_300=300 I:ingotGold_300=300 @@ -7382,16 +7478,21 @@ compressor { I:ingotOsmiridium_300=300 I:ingotOsmium_300=300 I:ingotPalladium_300=300 + I:ingotPhasedGold_300=300 + I:ingotPhasedIron_300=300 I:ingotPigIron_300=300 I:ingotPlatinum_300=300 I:ingotPlutonium241_300=300 I:ingotPlutonium_300=300 + I:ingotPulsatingIron_300=300 I:ingotRedAlloy_300=300 I:ingotRedSteel_300=300 + I:ingotRedstoneAlloy_300=300 I:ingotRoseGold_300=300 I:ingotSilicon_300=300 I:ingotSilver_300=300 I:ingotSolderingAlloy_300=300 + I:ingotSoularium_300=300 I:ingotStainlessSteel_300=300 I:ingotSteelMagnetic_300=300 I:ingotSteel_300=300 @@ -7411,6 +7512,7 @@ compressor { I:ingotVanadiumGallium_300=300 I:ingotVanadiumSteel_300=300 I:ingotVanadium_300=300 + I:ingotVibrantAlloy_300=300 I:ingotWroughtIron_300=300 I:ingotYttriumBariumCuprate_300=300 I:ingotYttrium_300=300 @@ -7538,6 +7640,7 @@ cutting { I:blockCopper_630=630 I:blockCupronickel_600=600 I:blockDamascusSteel_560=560 + I:blockDarkSteel_980=980 I:blockDiamond_7680=7680 I:blockDilithium_980=980 I:blockDuranium_980=980 @@ -7678,6 +7781,7 @@ cutting { I:stickCobalt_118=118 I:stickCupronickel_120=120 I:stickDamascusSteel_112=112 + I:stickDarkSteel_196=196 I:stickDiamond_1536=1536 I:stickDuranium_196=196 I:stickElectrum_302=302 @@ -7717,6 +7821,7 @@ cutting { I:stickLongCobalt_59=59 I:stickLongCupronickel_60=60 I:stickLongDamascusSteel_56=56 + I:stickLongDarkSteel_98=98 I:stickLongDiamond_768=768 I:stickLongDuranium_98=98 I:stickLongElectrum_151=151 @@ -8466,11 +8571,15 @@ extruder { I:blockChrome_10=10 I:blockCobaltBrass_10=10 I:blockCobalt_10=10 + I:blockConductiveIron_10=10 I:blockCopper_10=10 I:blockCupronickel_10=10 I:blockDamascusSteel_10=10 + I:blockDarkSteel_10=10 I:blockDuranium_10=10 + I:blockElectricalSteel_10=10 I:blockElectrum_10=10 + I:blockEnergeticAlloy_10=10 I:blockEuropium_10=10 I:blockGallium_10=10 I:blockGold_10=10 @@ -8503,15 +8612,20 @@ extruder { I:blockOsmiridium_10=10 I:blockOsmium_10=10 I:blockPalladium_10=10 + I:blockPhasedGold_10=10 + I:blockPhasedIron_10=10 I:blockPlatinum_10=10 I:blockPlutonium241_10=10 I:blockPlutonium_10=10 + I:blockPulsatingIron_10=10 I:blockRedAlloy_10=10 I:blockRedSteel_10=10 + I:blockRedstoneAlloy_10=10 I:blockRoseGold_10=10 I:blockSilicon_10=10 I:blockSilver_10=10 I:blockSolderingAlloy_10=10 + I:blockSoularium_10=10 I:blockStainlessSteel_10=10 I:blockSteel_10=10 I:blockSterlingSilver_10=10 @@ -8530,6 +8644,7 @@ extruder { I:blockVanadiumGallium_10=10 I:blockVanadiumSteel_10=10 I:blockVanadium_10=10 + I:blockVibrantAlloy_10=10 I:blockYttriumBariumCuprate_10=10 I:blockYttrium_10=10 I:blockZinc_10=10 @@ -8548,6 +8663,7 @@ extruder { I:boltCobalt_118=118 I:boltCupronickel_120=120 I:boltDamascusSteel_112=112 + I:boltDarkSteel_196=196 I:boltDuranium_196=196 I:boltElectrum_302=302 I:boltEpoxidFiberReinforced_12=12 @@ -8731,6 +8847,7 @@ extruder { I:plateCopper_63=63 I:plateCupronickel_60=60 I:plateDamascusSteel_56=56 + I:plateDarkSteel_98=98 I:plateDuranium_98=98 I:plateElectrum_151=151 I:plateEpoxidFiberReinforced_6=6 @@ -8843,6 +8960,7 @@ extruder { I:stickCopper_126=126 I:stickCupronickel_120=120 I:stickDamascusSteel_112=112 + I:stickDarkSteel_196=196 I:stickDuranium_196=196 I:stickElectrum_302=302 I:stickEpoxidFiberReinforced_12=12 @@ -8923,6 +9041,7 @@ extruder { I:toolHeadAxeCobalt_177=177 I:toolHeadAxeCupronickel_180=180 I:toolHeadAxeDamascusSteel_168=168 + I:toolHeadAxeDarkSteel_294=294 I:toolHeadAxeDuranium_294=294 I:toolHeadAxeElectrum_453=453 I:toolHeadAxeEpoxidFiberReinforced_18=18 @@ -8999,6 +9118,7 @@ extruder { I:toolHeadFileCobalt_118=118 I:toolHeadFileCupronickel_120=120 I:toolHeadFileDamascusSteel_112=112 + I:toolHeadFileDarkSteel_196=196 I:toolHeadFileDuranium_196=196 I:toolHeadFileElectrum_302=302 I:toolHeadFileEpoxidFiberReinforced_12=12 @@ -9069,6 +9189,7 @@ extruder { I:toolHeadHammerCobalt_354=354 I:toolHeadHammerCupronickel_360=360 I:toolHeadHammerDamascusSteel_336=336 + I:toolHeadHammerDarkSteel_588=588 I:toolHeadHammerDuranium_588=588 I:toolHeadHammerElectrum_906=906 I:toolHeadHammerEpoxidFiberReinforced_36=36 @@ -9145,6 +9266,7 @@ extruder { I:toolHeadHoeCobalt_118=118 I:toolHeadHoeCupronickel_120=120 I:toolHeadHoeDamascusSteel_112=112 + I:toolHeadHoeDarkSteel_196=196 I:toolHeadHoeDuranium_196=196 I:toolHeadHoeElectrum_302=302 I:toolHeadHoeEpoxidFiberReinforced_12=12 @@ -9221,6 +9343,7 @@ extruder { I:toolHeadPickaxeCobalt_177=177 I:toolHeadPickaxeCupronickel_180=180 I:toolHeadPickaxeDamascusSteel_168=168 + I:toolHeadPickaxeDarkSteel_294=294 I:toolHeadPickaxeDuranium_294=294 I:toolHeadPickaxeElectrum_453=453 I:toolHeadPickaxeEpoxidFiberReinforced_18=18 @@ -9297,6 +9420,7 @@ extruder { I:toolHeadSawCobalt_118=118 I:toolHeadSawCupronickel_120=120 I:toolHeadSawDamascusSteel_112=112 + I:toolHeadSawDarkSteel_196=196 I:toolHeadSawDuranium_196=196 I:toolHeadSawElectrum_302=302 I:toolHeadSawEpoxidFiberReinforced_12=12 @@ -9367,6 +9491,7 @@ extruder { I:toolHeadShovelCobalt_59=59 I:toolHeadShovelCupronickel_60=60 I:toolHeadShovelDamascusSteel_56=56 + I:toolHeadShovelDarkSteel_98=98 I:toolHeadShovelDuranium_98=98 I:toolHeadShovelElectrum_151=151 I:toolHeadShovelEpoxidFiberReinforced_6=6 @@ -9443,6 +9568,7 @@ extruder { I:toolHeadSwordCobalt_118=118 I:toolHeadSwordCupronickel_120=120 I:toolHeadSwordDamascusSteel_112=112 + I:toolHeadSwordDarkSteel_196=196 I:toolHeadSwordDuranium_196=196 I:toolHeadSwordElectrum_302=302 I:toolHeadSwordEpoxidFiberReinforced_12=12 @@ -9639,11 +9765,15 @@ fluidsmelter { I:blockChrome_216=216 I:blockCobaltBrass_216=216 I:blockCobalt_216=216 + I:blockConductiveIron_216=216 I:blockCopper_216=216 I:blockCupronickel_216=216 I:blockDamascusSteel_216=216 + I:blockDarkSteel_216=216 I:blockDuranium_216=216 + I:blockElectricalSteel_216=216 I:blockElectrum_216=216 + I:blockEnergeticAlloy_216=216 I:blockEuropium_216=216 I:blockGallium_216=216 I:blockGold_216=216 @@ -9678,10 +9808,13 @@ fluidsmelter { I:blockOsmiridium_216=216 I:blockOsmium_216=216 I:blockPalladium_216=216 + I:blockPhasedGold_216=216 + I:blockPhasedIron_216=216 I:blockPigIron_216=216 I:blockPlatinum_216=216 I:blockPlutonium241_216=216 I:blockPlutonium_216=216 + I:blockPulsatingIron_216=216 I:blockRedAlloy_216=216 I:blockRedSteel_216=216 I:blockRedstone_216=216 @@ -9708,6 +9841,7 @@ fluidsmelter { I:blockVanadiumGallium_216=216 I:blockVanadiumSteel_216=216 I:blockVanadium_216=216 + I:blockVibrantAlloy_216=216 I:blockWroughtIron_216=216 I:blockYttriumBariumCuprate_216=216 I:blockYttrium_216=216 @@ -9727,6 +9861,7 @@ fluidsmelter { I:boltCobalt_3=3 I:boltCupronickel_3=3 I:boltDamascusSteel_3=3 + I:boltDarkSteel_3=3 I:boltDuranium_3=3 I:boltElectrum_3=3 I:boltEpoxidFiberReinforced_3=3 @@ -9973,6 +10108,7 @@ fluidsmelter { I:dustConcrete_24=24 I:dustCopper_24=24 I:dustCupronickel_24=24 + I:dustDarkSteel_24=24 I:dustDuranium_24=24 I:dustElectrum_24=24 I:dustEpoxidFiberReinforced_24=24 @@ -10032,6 +10168,7 @@ fluidsmelter { I:dustSmallConcrete_6=6 I:dustSmallCopper_6=6 I:dustSmallCupronickel_6=6 + I:dustSmallDarkSteel_6=6 I:dustSmallDuranium_6=6 I:dustSmallElectrum_6=6 I:dustSmallEpoxidFiberReinforced_6=6 @@ -10109,6 +10246,7 @@ fluidsmelter { I:dustTinyConcrete_2=2 I:dustTinyCopper_2=2 I:dustTinyCupronickel_2=2 + I:dustTinyDarkSteel_2=2 I:dustTinyDuranium_2=2 I:dustTinyElectrum_2=2 I:dustTinyEpoxidFiberReinforced_2=2 @@ -10165,6 +10303,7 @@ fluidsmelter { I:dustUranium_24=24 I:dustWroughtIron_24=24 I:dustZinc_24=24 + I:enderio.silicon_24=24 I:foilAluminium_6=6 I:foilAnnealedCopper_6=6 I:foilBlackSteel_6=6 @@ -10217,6 +10356,7 @@ fluidsmelter { I:frameGtCopper_48=48 I:frameGtCupronickel_48=48 I:frameGtDamascusSteel_48=48 + I:frameGtDarkSteel_48=48 I:frameGtDuranium_48=48 I:frameGtElectrum_48=48 I:frameGtEpoxidFiberReinforced_48=48 @@ -11113,11 +11253,16 @@ fluidsmelter { I:ingotChrome_24=24 I:ingotCobaltBrass_24=24 I:ingotCobalt_24=24 + I:ingotConductiveIron_24=24 I:ingotCopper_24=24 I:ingotCupronickel_24=24 I:ingotDamascusSteel_24=24 + I:ingotDarkSteel_24=24 I:ingotDuranium_24=24 + I:ingotElectricalSteel_24=24 I:ingotElectrum_24=24 + I:ingotEnderiumBase_24=24 + I:ingotEnergeticAlloy_24=24 I:ingotEpoxidFiberReinforced_24=24 I:ingotEpoxid_24=24 I:ingotEuropium_24=24 @@ -11158,6 +11303,8 @@ fluidsmelter { I:ingotOsmiridium_24=24 I:ingotOsmium_24=24 I:ingotPalladium_24=24 + I:ingotPhasedGold_24=24 + I:ingotPhasedIron_24=24 I:ingotPigIron_24=24 I:ingotPlastic_24=24 I:ingotPlatinum_24=24 @@ -11169,6 +11316,7 @@ fluidsmelter { I:ingotPolytetrafluoroethylene_24=24 I:ingotPolyvinylChloride_24=24 I:ingotPotassium_24=24 + I:ingotPulsatingIron_24=24 I:ingotRedAlloy_24=24 I:ingotRedSteel_24=24 I:ingotRoseGold_24=24 @@ -11197,6 +11345,7 @@ fluidsmelter { I:ingotVanadiumGallium_24=24 I:ingotVanadiumSteel_24=24 I:ingotVanadium_24=24 + I:ingotVibrantAlloy_24=24 I:ingotWroughtIron_24=24 I:ingotYttriumBariumCuprate_24=24 I:ingotYttrium_24=24 @@ -11213,6 +11362,14 @@ fluidsmelter { I:item.chestplateIron_192=192 I:item.clock_96=96 I:item.compass_96=96 + I:item.darkSteel_axe_72=72 + I:item.darkSteel_boots_96=96 + I:item.darkSteel_chestplate_192=192 + I:item.darkSteel_helmet_120=120 + I:item.darkSteel_leggings_168=168 + I:item.darkSteel_pickaxe_72=72 + I:item.darkSteel_shears_48=48 + I:item.darkSteel_sword_48=48 I:item.doorIron_144=144 I:item.hatchetGold_72=72 I:item.hatchetIron_72=72 @@ -11264,6 +11421,7 @@ fluidsmelter { I:nuggetCopper_2=2 I:nuggetCupronickel_2=2 I:nuggetDamascusSteel_2=2 + I:nuggetDarkSteel_2=2 I:nuggetDuranium_2=2 I:nuggetElectrum_2=2 I:nuggetEpoxidFiberReinforced_2=2 @@ -11317,6 +11475,7 @@ fluidsmelter { I:nuggetPolytetrafluoroethylene_2=2 I:nuggetPolyvinylChloride_2=2 I:nuggetPotassium_2=2 + I:nuggetPulsatingIron_2=2 I:nuggetRedAlloy_2=2 I:nuggetRedSteel_2=2 I:nuggetRoseGold_2=2 @@ -11345,6 +11504,7 @@ fluidsmelter { I:nuggetVanadiumGallium_2=2 I:nuggetVanadiumSteel_2=2 I:nuggetVanadium_2=2 + I:nuggetVibrantAlloy_2=2 I:nuggetWroughtIron_2=2 I:nuggetYttriumBariumCuprate_2=2 I:nuggetYttrium_2=2 @@ -11462,6 +11622,7 @@ fluidsmelter { I:plateCopper_24=24 I:plateCupronickel_24=24 I:plateDamascusSteel_24=24 + I:plateDarkSteel_24=24 I:plateDenseBronze_216=216 I:plateDenseCopper_216=216 I:plateDenseGold_216=216 @@ -11484,6 +11645,7 @@ fluidsmelter { I:plateDoubleCobalt_48=48 I:plateDoubleCupronickel_48=48 I:plateDoubleDamascusSteel_48=48 + I:plateDoubleDarkSteel_48=48 I:plateDoubleDuranium_48=48 I:plateDoubleElectrum_48=48 I:plateDoubleEpoxidFiberReinforced_48=48 @@ -11669,6 +11831,7 @@ fluidsmelter { I:screwCobalt_2=2 I:screwCupronickel_2=2 I:screwDamascusSteel_2=2 + I:screwDarkSteel_2=2 I:screwDuranium_2=2 I:screwElectrum_2=2 I:screwEpoxidFiberReinforced_2=2 @@ -11751,6 +11914,7 @@ fluidsmelter { I:stickCopper_12=12 I:stickCupronickel_12=12 I:stickDamascusSteel_12=12 + I:stickDarkSteel_12=12 I:stickDuranium_12=12 I:stickElectrum_12=12 I:stickEpoxidFiberReinforced_12=12 @@ -11783,6 +11947,7 @@ fluidsmelter { I:stickLongCobalt_24=24 I:stickLongCupronickel_24=24 I:stickLongDamascusSteel_24=24 + I:stickLongDarkSteel_24=24 I:stickLongDuranium_24=24 I:stickLongElectrum_24=24 I:stickLongEpoxidFiberReinforced_24=24 @@ -11929,6 +12094,7 @@ fluidsmelter { I:toolHeadAxeCobalt_72=72 I:toolHeadAxeCupronickel_72=72 I:toolHeadAxeDamascusSteel_72=72 + I:toolHeadAxeDarkSteel_72=72 I:toolHeadAxeDuranium_72=72 I:toolHeadAxeElectrum_72=72 I:toolHeadAxeEpoxidFiberReinforced_72=72 @@ -12008,6 +12174,7 @@ fluidsmelter { I:toolHeadBuzzSawCobalt_96=96 I:toolHeadBuzzSawCupronickel_96=96 I:toolHeadBuzzSawDamascusSteel_96=96 + I:toolHeadBuzzSawDarkSteel_96=96 I:toolHeadBuzzSawDuranium_96=96 I:toolHeadBuzzSawElectrum_96=96 I:toolHeadBuzzSawEpoxidFiberReinforced_96=96 @@ -12081,6 +12248,7 @@ fluidsmelter { I:toolHeadChainsawCobalt_48=48 I:toolHeadChainsawCupronickel_48=48 I:toolHeadChainsawDamascusSteel_48=48 + I:toolHeadChainsawDarkSteel_48=48 I:toolHeadChainsawDuranium_48=48 I:toolHeadChainsawElectrum_48=48 I:toolHeadChainsawEpoxidFiberReinforced_48=48 @@ -12154,6 +12322,7 @@ fluidsmelter { I:toolHeadDrillCobalt_96=96 I:toolHeadDrillCupronickel_96=96 I:toolHeadDrillDamascusSteel_96=96 + I:toolHeadDrillDarkSteel_96=96 I:toolHeadDrillDuranium_96=96 I:toolHeadDrillElectrum_96=96 I:toolHeadDrillEpoxidFiberReinforced_96=96 @@ -12227,6 +12396,7 @@ fluidsmelter { I:toolHeadFileCobalt_48=48 I:toolHeadFileCupronickel_48=48 I:toolHeadFileDamascusSteel_48=48 + I:toolHeadFileDarkSteel_48=48 I:toolHeadFileDuranium_48=48 I:toolHeadFileElectrum_48=48 I:toolHeadFileEpoxidFiberReinforced_48=48 @@ -12300,6 +12470,7 @@ fluidsmelter { I:toolHeadHammerCobalt_144=144 I:toolHeadHammerCupronickel_144=144 I:toolHeadHammerDamascusSteel_144=144 + I:toolHeadHammerDarkSteel_144=144 I:toolHeadHammerDuranium_144=144 I:toolHeadHammerElectrum_144=144 I:toolHeadHammerEpoxidFiberReinforced_144=144 @@ -12379,6 +12550,7 @@ fluidsmelter { I:toolHeadHoeCobalt_48=48 I:toolHeadHoeCupronickel_48=48 I:toolHeadHoeDamascusSteel_48=48 + I:toolHeadHoeDarkSteel_48=48 I:toolHeadHoeDuranium_48=48 I:toolHeadHoeElectrum_48=48 I:toolHeadHoeEpoxidFiberReinforced_48=48 @@ -12458,6 +12630,7 @@ fluidsmelter { I:toolHeadPickaxeCobalt_72=72 I:toolHeadPickaxeCupronickel_72=72 I:toolHeadPickaxeDamascusSteel_72=72 + I:toolHeadPickaxeDarkSteel_72=72 I:toolHeadPickaxeDuranium_72=72 I:toolHeadPickaxeElectrum_72=72 I:toolHeadPickaxeEpoxidFiberReinforced_72=72 @@ -12537,6 +12710,7 @@ fluidsmelter { I:toolHeadPlowCobalt_96=96 I:toolHeadPlowCupronickel_96=96 I:toolHeadPlowDamascusSteel_96=96 + I:toolHeadPlowDarkSteel_96=96 I:toolHeadPlowDuranium_96=96 I:toolHeadPlowElectrum_96=96 I:toolHeadPlowEpoxidFiberReinforced_96=96 @@ -12616,6 +12790,7 @@ fluidsmelter { I:toolHeadSawCobalt_48=48 I:toolHeadSawCupronickel_48=48 I:toolHeadSawDamascusSteel_48=48 + I:toolHeadSawDarkSteel_48=48 I:toolHeadSawDuranium_48=48 I:toolHeadSawElectrum_48=48 I:toolHeadSawEpoxidFiberReinforced_48=48 @@ -12689,6 +12864,7 @@ fluidsmelter { I:toolHeadSenseCobalt_72=72 I:toolHeadSenseCupronickel_72=72 I:toolHeadSenseDamascusSteel_72=72 + I:toolHeadSenseDarkSteel_72=72 I:toolHeadSenseDuranium_72=72 I:toolHeadSenseElectrum_72=72 I:toolHeadSenseEpoxidFiberReinforced_72=72 @@ -12768,6 +12944,7 @@ fluidsmelter { I:toolHeadShovelCobalt_24=24 I:toolHeadShovelCupronickel_24=24 I:toolHeadShovelDamascusSteel_24=24 + I:toolHeadShovelDarkSteel_24=24 I:toolHeadShovelDuranium_24=24 I:toolHeadShovelElectrum_24=24 I:toolHeadShovelEpoxidFiberReinforced_24=24 @@ -12847,6 +13024,7 @@ fluidsmelter { I:toolHeadSwordCobalt_48=48 I:toolHeadSwordCupronickel_48=48 I:toolHeadSwordDamascusSteel_48=48 + I:toolHeadSwordDarkSteel_48=48 I:toolHeadSwordDuranium_48=48 I:toolHeadSwordElectrum_48=48 I:toolHeadSwordEpoxidFiberReinforced_48=48 @@ -12926,6 +13104,7 @@ fluidsmelter { I:toolHeadUniversalSpadeCobalt_24=24 I:toolHeadUniversalSpadeCupronickel_24=24 I:toolHeadUniversalSpadeDamascusSteel_24=24 + I:toolHeadUniversalSpadeDarkSteel_24=24 I:toolHeadUniversalSpadeDuranium_24=24 I:toolHeadUniversalSpadeElectrum_24=24 I:toolHeadUniversalSpadeEpoxidFiberReinforced_24=24 @@ -13005,6 +13184,7 @@ fluidsmelter { I:toolHeadWrenchCobalt_96=96 I:toolHeadWrenchCupronickel_96=96 I:toolHeadWrenchDamascusSteel_96=96 + I:toolHeadWrenchDarkSteel_96=96 I:toolHeadWrenchDuranium_96=96 I:toolHeadWrenchElectrum_96=96 I:toolHeadWrenchEpoxidFiberReinforced_96=96 @@ -13078,6 +13258,7 @@ fluidsmelter { I:turbineBladeCobalt_144=144 I:turbineBladeCupronickel_144=144 I:turbineBladeDamascusSteel_144=144 + I:turbineBladeDarkSteel_144=144 I:turbineBladeDuranium_144=144 I:turbineBladeElectrum_144=144 I:turbineBladeEpoxidFiberReinforced_144=144 @@ -13363,11 +13544,15 @@ fluidsolidifier { I:blockChrome_288=288 I:blockCobaltBrass_288=288 I:blockCobalt_288=288 + I:blockConductiveIron_288=288 I:blockCopper_288=288 I:blockCupronickel_288=288 I:blockDamascusSteel_288=288 + I:blockDarkSteel_288=288 I:blockDuranium_288=288 + I:blockElectricalSteel_288=288 I:blockElectrum_288=288 + I:blockEnergeticAlloy_288=288 I:blockEuropium_288=288 I:blockGallium_288=288 I:blockGold_288=288 @@ -13399,13 +13584,17 @@ fluidsolidifier { I:blockNiobiumNitride_288=288 I:blockNiobiumTitanium_288=288 I:blockNiobium_288=288 + I:blockObsidian_1024=1024 I:blockOsmiridium_288=288 I:blockOsmium_288=288 I:blockPalladium_288=288 + I:blockPhasedGold_288=288 + I:blockPhasedIron_288=288 I:blockPigIron_288=288 I:blockPlatinum_288=288 I:blockPlutonium241_288=288 I:blockPlutonium_288=288 + I:blockPulsatingIron_288=288 I:blockRedAlloy_288=288 I:blockRedSteel_288=288 I:blockRedstone_288=288 @@ -13432,6 +13621,7 @@ fluidsolidifier { I:blockVanadiumGallium_288=288 I:blockVanadiumSteel_288=288 I:blockVanadium_288=288 + I:blockVibrantAlloy_288=288 I:blockWroughtIron_288=288 I:blockYttriumBariumCuprate_288=288 I:blockYttrium_288=288 @@ -13492,11 +13682,16 @@ fluidsolidifier { I:ingotChrome_32=32 I:ingotCobaltBrass_32=32 I:ingotCobalt_32=32 + I:ingotConductiveIron_32=32 I:ingotCopper_32=32 I:ingotCupronickel_32=32 I:ingotDamascusSteel_32=32 + I:ingotDarkSteel_32=32 I:ingotDuranium_32=32 + I:ingotElectricalSteel_32=32 I:ingotElectrum_32=32 + I:ingotEnderiumBase_32=32 + I:ingotEnergeticAlloy_32=32 I:ingotEpoxidFiberReinforced_32=32 I:ingotEpoxid_32=32 I:ingotEuropium_32=32 @@ -13537,6 +13732,8 @@ fluidsolidifier { I:ingotOsmiridium_32=32 I:ingotOsmium_32=32 I:ingotPalladium_32=32 + I:ingotPhasedGold_32=32 + I:ingotPhasedIron_32=32 I:ingotPigIron_32=32 I:ingotPlastic_32=32 I:ingotPlatinum_32=32 @@ -13548,6 +13745,7 @@ fluidsolidifier { I:ingotPolytetrafluoroethylene_32=32 I:ingotPolyvinylCh