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:ingotPolyvinylChloride_32=32 I:ingotPotassium_32=32 + I:ingotPulsatingIron_32=32 I:ingotRedAlloy_32=32 I:ingotRedSteel_32=32 I:ingotRoseGold_32=32 @@ -13576,6 +13774,7 @@ fluidsolidifier { I:ingotVanadiumGallium_32=32 I:ingotVanadiumSteel_32=32 I:ingotVanadium_32=32 + I:ingotVibrantAlloy_32=32 I:ingotWroughtIron_32=32 I:ingotYttriumBariumCuprate_32=32 I:ingotYttrium_32=32 @@ -13605,6 +13804,7 @@ fluidsolidifier { I:nuggetCopper_16=16 I:nuggetCupronickel_16=16 I:nuggetDamascusSteel_16=16 + I:nuggetDarkSteel_16=16 I:nuggetDuranium_16=16 I:nuggetElectrum_16=16 I:nuggetEpoxidFiberReinforced_16=16 @@ -13658,6 +13858,7 @@ fluidsolidifier { I:nuggetPolytetrafluoroethylene_16=16 I:nuggetPolyvinylChloride_16=16 I:nuggetPotassium_16=16 + I:nuggetPulsatingIron_16=16 I:nuggetRedAlloy_16=16 I:nuggetRedSteel_16=16 I:nuggetRoseGold_16=16 @@ -13686,6 +13887,7 @@ fluidsolidifier { I:nuggetVanadiumGallium_16=16 I:nuggetVanadiumSteel_16=16 I:nuggetVanadium_16=16 + I:nuggetVibrantAlloy_16=16 I:nuggetWroughtIron_16=16 I:nuggetYttriumBariumCuprate_16=16 I:nuggetYttrium_16=16 @@ -13709,6 +13911,7 @@ fluidsolidifier { I:plateCopper_32=32 I:plateCupronickel_32=32 I:plateDamascusSteel_32=32 + I:plateDarkSteel_32=32 I:plateDuranium_32=32 I:plateElectrum_32=32 I:plateEpoxidFiberReinforced_32=32 @@ -13815,6 +14018,7 @@ forgehammer { B:crushedCobaltite_true=true B:crushedCooperite_true=true B:crushedCopper_true=true + B:crushedDarkSteel_true=true B:crushedDiatomite_true=true B:crushedGalena_true=true B:crushedGarnierite_true=true @@ -13906,6 +14110,7 @@ forgehammer { B:dustCobaltite_true=true B:dustCooperite_true=true B:dustCopper_true=true + B:dustDarkSteel_true=true B:dustDiamond_true=true B:dustDiatomite_true=true B:dustElectrum_true=true @@ -13948,6 +14153,7 @@ forgehammer { B:dustImpureCobaltite_true=true B:dustImpureCooperite_true=true B:dustImpureCopper_true=true + B:dustImpureDarkSteel_true=true B:dustImpureDiamond_true=true B:dustImpureDiatomite_true=true B:dustImpureEmerald_true=true @@ -14091,6 +14297,7 @@ forgehammer { B:dustPureCobaltite_true=true B:dustPureCooperite_true=true B:dustPureCopper_true=true + B:dustPureDarkSteel_true=true B:dustPureDiamond_true=true B:dustPureDiatomite_true=true B:dustPureEmerald_true=true @@ -14334,6 +14541,7 @@ forgehammer { B:plateCopper_true=true B:plateCupronickel_true=true B:plateDamascusSteel_true=true + B:plateDarkSteel_true=true B:plateDuranium_true=true B:plateElectrum_true=true B:plateEpoxidFiberReinforced_true=true @@ -14420,6 +14628,7 @@ forgehammer { B:stickLongCobalt_true=true B:stickLongCupronickel_true=true B:stickLongDamascusSteel_true=true + B:stickLongDarkSteel_true=true B:stickLongDuranium_true=true B:stickLongElectrum_true=true B:stickLongEpoxidFiberReinforced_true=true @@ -14518,6 +14727,7 @@ fuel_1 { I:cellToluene_328=328 I:cellWoodGas_24=24 I:ic2.itemCellBiogas_32=32 + I:item.bucketRocket_fuel_250=250 } @@ -14676,6 +14886,7 @@ hammerdoubleplate { B:plateCobalt_true=true B:plateCupronickel_true=true B:plateDamascusSteel_true=true + B:plateDarkSteel_true=true B:plateDuranium_true=true B:plateElectrum_true=true B:plateEpoxidFiberReinforced_true=true @@ -14756,6 +14967,7 @@ hammerplating { B:Copper_true=true B:Cupronickel_true=true B:DamascusSteel_true=true + B:DarkSteel_true=true B:Duranium_true=true B:Electrum_true=true B:EpoxidFiberReinforced_true=true @@ -14924,6 +15136,7 @@ lathe { I:boltCobalt_7=7 I:boltCupronickel_7=7 I:boltDamascusSteel_7=7 + I:boltDarkSteel_12=12 I:boltDiamond_96=96 I:boltDuranium_12=12 I:boltElectrum_18=18 @@ -15095,6 +15308,7 @@ lathe { I:ingotCopper_315=315 I:ingotCupronickel_300=300 I:ingotDamascusSteel_280=280 + I:ingotDarkSteel_490=490 I:ingotDuranium_490=490 I:ingotElectrum_755=755 I:ingotEpoxidFiberReinforced_30=30 @@ -15232,6 +15446,7 @@ maceration { B:blockCopper_true=true B:blockCupronickel_true=true B:blockDamascusSteel_true=true + B:blockDarkSteel_true=true B:blockDiamond_true=true B:blockDilithium_true=true B:blockDuranium_true=true @@ -15283,6 +15498,7 @@ maceration { B:blockNiobiumTitanium_true=true B:blockNiobium_true=true B:blockNiter_true=true + B:blockObsidian_true=true B:blockOlivine_true=true B:blockOpal_true=true B:blockOsmiridium_true=true @@ -15347,6 +15563,7 @@ maceration { B:boltCobalt_true=true B:boltCupronickel_true=true B:boltDamascusSteel_true=true + B:boltDarkSteel_true=true B:boltDiamond_true=true B:boltDuranium_true=true B:boltElectrum_true=true @@ -15624,6 +15841,7 @@ maceration { B:crushedCentrifugedCobaltite_true=true B:crushedCentrifugedCooperite_true=true B:crushedCentrifugedCopper_true=true + B:crushedCentrifugedDarkSteel_true=true B:crushedCentrifugedDiamond_true=true B:crushedCentrifugedDiatomite_true=true B:crushedCentrifugedEmerald_true=true @@ -15716,6 +15934,7 @@ maceration { B:crushedCobaltite_true=true B:crushedCooperite_true=true B:crushedCopper_true=true + B:crushedDarkSteel_true=true B:crushedDiamond_true=true B:crushedDiatomite_true=true B:crushedEmerald_true=true @@ -15788,6 +16007,7 @@ maceration { B:crushedPurifiedCobaltite_true=true B:crushedPurifiedCooperite_true=true B:crushedPurifiedCopper_true=true + B:crushedPurifiedDarkSteel_true=true B:crushedPurifiedDiamond_true=true B:crushedPurifiedDiatomite_true=true B:crushedPurifiedEmerald_true=true @@ -15907,6 +16127,7 @@ maceration { B:crushedWulfenite_true=true B:crushedYellowLimonite_true=true B:crushedZinc_true=true + B:enderio.silicon_true=true B:foilAluminium_true=true B:foilAnnealedCopper_true=true B:foilBlackSteel_true=true @@ -15959,6 +16180,7 @@ maceration { B:frameGtCopper_true=true B:frameGtCupronickel_true=true B:frameGtDamascusSteel_true=true + B:frameGtDarkSteel_true=true B:frameGtDuranium_true=true B:frameGtElectrum_true=true B:frameGtEpoxidFiberReinforced_true=true @@ -17181,6 +17403,7 @@ maceration { B:ingotCopper_true=true B:ingotCupronickel_true=true B:ingotDamascusSteel_true=true + B:ingotDarkSteel_true=true B:ingotDuranium_true=true B:ingotElectrum_true=true B:ingotEpoxidFiberReinforced_true=true @@ -17287,6 +17510,14 @@ maceration { B:item.clay_true=true B:item.clock_true=true B:item.compass_true=true + B:item.darkSteel_axe_true=true + B:item.darkSteel_boots_true=true + B:item.darkSteel_chestplate_true=true + B:item.darkSteel_helmet_true=true + B:item.darkSteel_leggings_true=true + B:item.darkSteel_pickaxe_true=true + B:item.darkSteel_shears_true=true + B:item.darkSteel_sword_true=true B:item.doorIron_true=true B:item.doorWood_true=true B:item.dyePowder.brown_true=true @@ -17383,6 +17614,7 @@ maceration { B:nuggetCopper_true=true B:nuggetCupronickel_true=true B:nuggetDamascusSteel_true=true + B:nuggetDarkSteel_true=true B:nuggetDuranium_true=true B:nuggetElectrum_true=true B:nuggetEpoxidFiberReinforced_true=true @@ -17500,6 +17732,7 @@ maceration { B:oreBasaltCobaltite_true=true B:oreBasaltCooperite_true=true B:oreBasaltCopper_true=true + B:oreBasaltDarkSteel_true=true B:oreBasaltDiamond_true=true B:oreBasaltDiatomite_true=true B:oreBasaltEmerald_true=true @@ -17610,6 +17843,7 @@ maceration { B:oreBlackgraniteCobaltite_true=true B:oreBlackgraniteCooperite_true=true B:oreBlackgraniteCopper_true=true + B:oreBlackgraniteDarkSteel_true=true B:oreBlackgraniteDiamond_true=true B:oreBlackgraniteDiatomite_true=true B:oreBlackgraniteEmerald_true=true @@ -17704,6 +17938,7 @@ maceration { B:oreCobaltite_true=true B:oreCooperite_true=true B:oreCopper_true=true + B:oreDarkSteel_true=true B:oreDiamond_true=true B:oreDiatomite_true=true B:oreEmerald_true=true @@ -17731,6 +17966,7 @@ maceration { B:oreEndstoneCobaltite_true=true B:oreEndstoneCooperite_true=true B:oreEndstoneCopper_true=true + B:oreEndstoneDarkSteel_true=true B:oreEndstoneDiamond_true=true B:oreEndstoneDiatomite_true=true B:oreEndstoneEmerald_true=true @@ -17859,6 +18095,7 @@ maceration { B:oreMarbleCobaltite_true=true B:oreMarbleCooperite_true=true B:oreMarbleCopper_true=true + B:oreMarbleDarkSteel_true=true B:oreMarbleDiamond_true=true B:oreMarbleDiatomite_true=true B:oreMarbleEmerald_true=true @@ -17971,6 +18208,7 @@ maceration { B:oreNetherrackCobaltite_true=true B:oreNetherrackCooperite_true=true B:oreNetherrackCopper_true=true + B:oreNetherrackDarkSteel_true=true B:oreNetherrackDiamond_true=true B:oreNetherrackDiatomite_true=true B:oreNetherrackEmerald_true=true @@ -18093,6 +18331,7 @@ maceration { B:oreRedgraniteCobaltite_true=true B:oreRedgraniteCooperite_true=true B:oreRedgraniteCopper_true=true + B:oreRedgraniteDarkSteel_true=true B:oreRedgraniteDiamond_true=true B:oreRedgraniteDiatomite_true=true B:oreRedgraniteEmerald_true=true @@ -18324,6 +18563,7 @@ maceration { B:plateCopper_true=true B:plateCupronickel_true=true B:plateDamascusSteel_true=true + B:plateDarkSteel_true=true B:plateDenseBronze_true=true B:plateDenseCopper_true=true B:plateDenseGold_true=true @@ -18350,6 +18590,7 @@ maceration { B:plateDoubleCobalt_true=true B:plateDoubleCupronickel_true=true B:plateDoubleDamascusSteel_true=true + B:plateDoubleDarkSteel_true=true B:plateDoubleDuranium_true=true B:plateDoubleElectrum_true=true B:plateDoubleEpoxidFiberReinforced_true=true @@ -18569,6 +18810,7 @@ maceration { B:screwCobalt_true=true B:screwCupronickel_true=true B:screwDamascusSteel_true=true + B:screwDarkSteel_true=true B:screwDiamond_true=true B:screwDuranium_true=true B:screwElectrum_true=true @@ -18670,6 +18912,7 @@ maceration { B:stickCopper_true=true B:stickCupronickel_true=true B:stickDamascusSteel_true=true + B:stickDarkSteel_true=true B:stickDiamond_true=true B:stickDuranium_true=true B:stickElectrum_true=true @@ -18712,6 +18955,7 @@ maceration { B:stickLongCobalt_true=true B:stickLongCupronickel_true=true B:stickLongDamascusSteel_true=true + B:stickLongDarkSteel_true=true B:stickLongDiamond_true=true B:stickLongDuranium_true=true B:stickLongElectrum_true=true @@ -18937,6 +19181,7 @@ maceration { B:toolHeadAxeCobalt_true=true B:toolHeadAxeCupronickel_true=true B:toolHeadAxeDamascusSteel_true=true + B:toolHeadAxeDarkSteel_true=true B:toolHeadAxeDiamond_true=true B:toolHeadAxeDuranium_true=true B:toolHeadAxeElectrum_true=true @@ -19037,6 +19282,7 @@ maceration { B:toolHeadBuzzSawCobalt_true=true B:toolHeadBuzzSawCupronickel_true=true B:toolHeadBuzzSawDamascusSteel_true=true + B:toolHeadBuzzSawDarkSteel_true=true B:toolHeadBuzzSawDuranium_true=true B:toolHeadBuzzSawElectrum_true=true B:toolHeadBuzzSawEpoxidFiberReinforced_true=true @@ -19111,6 +19357,7 @@ maceration { B:toolHeadChainsawCobalt_true=true B:toolHeadChainsawCupronickel_true=true B:toolHeadChainsawDamascusSteel_true=true + B:toolHeadChainsawDarkSteel_true=true B:toolHeadChainsawDuranium_true=true B:toolHeadChainsawElectrum_true=true B:toolHeadChainsawEpoxidFiberReinforced_true=true @@ -19185,6 +19432,7 @@ maceration { B:toolHeadDrillCobalt_true=true B:toolHeadDrillCupronickel_true=true B:toolHeadDrillDamascusSteel_true=true + B:toolHeadDrillDarkSteel_true=true B:toolHeadDrillDuranium_true=true B:toolHeadDrillElectrum_true=true B:toolHeadDrillEpoxidFiberReinforced_true=true @@ -19259,6 +19507,7 @@ maceration { B:toolHeadFileCobalt_true=true B:toolHeadFileCupronickel_true=true B:toolHeadFileDamascusSteel_true=true + B:toolHeadFileDarkSteel_true=true B:toolHeadFileDuranium_true=true B:toolHeadFileElectrum_true=true B:toolHeadFileEpoxidFiberReinforced_true=true @@ -19336,6 +19585,7 @@ maceration { B:toolHeadHammerCobalt_true=true B:toolHeadHammerCupronickel_true=true B:toolHeadHammerDamascusSteel_true=true + B:toolHeadHammerDarkSteel_true=true B:toolHeadHammerDiamond_true=true B:toolHeadHammerDuranium_true=true B:toolHeadHammerElectrum_true=true @@ -19439,6 +19689,7 @@ maceration { B:toolHeadHoeCobalt_true=true B:toolHeadHoeCupronickel_true=true B:toolHeadHoeDamascusSteel_true=true + B:toolHeadHoeDarkSteel_true=true B:toolHeadHoeDiamond_true=true B:toolHeadHoeDuranium_true=true B:toolHeadHoeElectrum_true=true @@ -19542,6 +19793,7 @@ maceration { B:toolHeadPickaxeCobalt_true=true B:toolHeadPickaxeCupronickel_true=true B:toolHeadPickaxeDamascusSteel_true=true + B:toolHeadPickaxeDarkSteel_true=true B:toolHeadPickaxeDiamond_true=true B:toolHeadPickaxeDuranium_true=true B:toolHeadPickaxeElectrum_true=true @@ -19645,6 +19897,7 @@ maceration { B:toolHeadPlowCobalt_true=true B:toolHeadPlowCupronickel_true=true B:toolHeadPlowDamascusSteel_true=true + B:toolHeadPlowDarkSteel_true=true B:toolHeadPlowDiamond_true=true B:toolHeadPlowDuranium_true=true B:toolHeadPlowElectrum_true=true @@ -19745,6 +19998,7 @@ maceration { B:toolHeadSawCobalt_true=true B:toolHeadSawCupronickel_true=true B:toolHeadSawDamascusSteel_true=true + B:toolHeadSawDarkSteel_true=true B:toolHeadSawDuranium_true=true B:toolHeadSawElectrum_true=true B:toolHeadSawEpoxidFiberReinforced_true=true @@ -19822,6 +20076,7 @@ maceration { B:toolHeadSenseCobalt_true=true B:toolHeadSenseCupronickel_true=true B:toolHeadSenseDamascusSteel_true=true + B:toolHeadSenseDarkSteel_true=true B:toolHeadSenseDiamond_true=true B:toolHeadSenseDuranium_true=true B:toolHeadSenseElectrum_true=true @@ -19925,6 +20180,7 @@ maceration { B:toolHeadShovelCobalt_true=true B:toolHeadShovelCupronickel_true=true B:toolHeadShovelDamascusSteel_true=true + B:toolHeadShovelDarkSteel_true=true B:toolHeadShovelDiamond_true=true B:toolHeadShovelDuranium_true=true B:toolHeadShovelElectrum_true=true @@ -20028,6 +20284,7 @@ maceration { B:toolHeadSwordCobalt_true=true B:toolHeadSwordCupronickel_true=true B:toolHeadSwordDamascusSteel_true=true + B:toolHeadSwordDarkSteel_true=true B:toolHeadSwordDiamond_true=true B:toolHeadSwordDuranium_true=true B:toolHeadSwordElectrum_true=true @@ -20131,6 +20388,7 @@ maceration { B:toolHeadUniversalSpadeCobalt_true=true B:toolHeadUniversalSpadeCupronickel_true=true B:toolHeadUniversalSpadeDamascusSteel_true=true + B:toolHeadUniversalSpadeDarkSteel_true=true B:toolHeadUniversalSpadeDiamond_true=true B:toolHeadUniversalSpadeDuranium_true=true B:toolHeadUniversalSpadeElectrum_true=true @@ -20231,6 +20489,7 @@ maceration { B:toolHeadWrenchCobalt_true=true B:toolHeadWrenchCupronickel_true=true B:toolHeadWrenchDamascusSteel_true=true + B:toolHeadWrenchDarkSteel_true=true B:toolHeadWrenchDuranium_true=true B:toolHeadWrenchElectrum_true=true B:toolHeadWrenchEpoxidFiberReinforced_true=true @@ -20305,6 +20564,7 @@ maceration { B:turbineBladeCobalt_true=true B:turbineBladeCupronickel_true=true B:turbineBladeDamascusSteel_true=true + B:turbineBladeDarkSteel_true=true B:turbineBladeDuranium_true=true B:turbineBladeElectrum_true=true B:turbineBladeEpoxidFiberReinforced_true=true @@ -20779,6 +21039,7 @@ orewasher { I:crushedCobaltite_500=500 I:crushedCooperite_500=500 I:crushedCopper_500=500 + I:crushedDarkSteel_500=500 I:crushedDiamond_500=500 I:crushedDiatomite_500=500 I:crushedEmerald_500=500 @@ -20891,6 +21152,7 @@ orewashing { B:crushedCobaltite_true=true B:crushedCooperite_true=true B:crushedCopper_true=true + B:crushedDarkSteel_true=true B:crushedDiamond_true=true B:crushedDiatomite_true=true B:crushedEmerald_true=true @@ -21207,6 +21469,8 @@ pulveriser { I:blockCupronickel_540=540 I:blockDamascusSteel_400=400 I:blockDamascusSteel_504=504 + I:blockDarkSteel_400=400 + I:blockDarkSteel_882=882 I:blockDiamond_400=400 I:blockDiamond_6912=6912 I:blockDilithium_400=400 @@ -21309,6 +21573,8 @@ pulveriser { I:blockNiobium_846=846 I:blockNiter_180=180 I:blockNiter_400=400 + I:blockObsidian_198=198 + I:blockObsidian_400=400 I:blockOlivine_252=252 I:blockOlivine_400=400 I:blockOpal_180=180 @@ -21437,6 +21703,8 @@ pulveriser { I:boltCupronickel_400=400 I:boltDamascusSteel_16=16 I:boltDamascusSteel_400=400 + I:boltDarkSteel_16=16 + I:boltDarkSteel_400=400 I:boltDiamond_400=400 I:boltDiamond_96=96 I:boltDuranium_16=16 @@ -21975,6 +22243,7 @@ pulveriser { I:crushedCentrifugedCobaltite_400=400 I:crushedCentrifugedCooperite_400=400 I:crushedCentrifugedCopper_400=400 + I:crushedCentrifugedDarkSteel_400=400 I:crushedCentrifugedDiamond_400=400 I:crushedCentrifugedDiatomite_400=400 I:crushedCentrifugedEmerald_400=400 @@ -22067,6 +22336,7 @@ pulveriser { I:crushedCobaltite_400=400 I:crushedCooperite_400=400 I:crushedCopper_400=400 + I:crushedDarkSteel_400=400 I:crushedDiamond_400=400 I:crushedDiatomite_400=400 I:crushedEmerald_400=400 @@ -22139,6 +22409,7 @@ pulveriser { I:crushedPurifiedCobaltite_400=400 I:crushedPurifiedCooperite_400=400 I:crushedPurifiedCopper_400=400 + I:crushedPurifiedDarkSteel_400=400 I:crushedPurifiedDiamond_400=400 I:crushedPurifiedDiatomite_400=400 I:crushedPurifiedEmerald_400=400 @@ -22258,6 +22529,8 @@ pulveriser { I:crushedWulfenite_400=400 I:crushedYellowLimonite_400=400 I:crushedZinc_400=400 + I:enderio.silicon_28=28 + I:enderio.silicon_400=400 I:foilAluminium_16=16 I:foilAluminium_400=400 I:foilAnnealedCopper_16=16 @@ -22362,6 +22635,8 @@ pulveriser { I:frameGtCupronickel_400=400 I:frameGtDamascusSteel_112=112 I:frameGtDamascusSteel_400=400 + I:frameGtDarkSteel_196=196 + I:frameGtDarkSteel_400=400 I:frameGtDuranium_196=196 I:frameGtDuranium_400=400 I:frameGtElectrum_302=302 @@ -24764,6 +25039,8 @@ pulveriser { I:ingotCupronickel_60=60 I:ingotDamascusSteel_400=400 I:ingotDamascusSteel_56=56 + I:ingotDarkSteel_400=400 + I:ingotDarkSteel_98=98 I:ingotDuranium_400=400 I:ingotDuranium_98=98 I:ingotElectrum_151=151 @@ -24976,6 +25253,22 @@ pulveriser { I:item.clock_869=869 I:item.compass_309=309 I:item.compass_400=400 + I:item.darkSteel_axe_303=303 + I:item.darkSteel_axe_400=400 + I:item.darkSteel_boots_392=392 + I:item.darkSteel_boots_400=400 + I:item.darkSteel_chestplate_400=400 + I:item.darkSteel_chestplate_784=784 + I:item.darkSteel_helmet_400=400 + I:item.darkSteel_helmet_490=490 + I:item.darkSteel_leggings_400=400 + I:item.darkSteel_leggings_686=686 + I:item.darkSteel_pickaxe_303=303 + I:item.darkSteel_pickaxe_400=400 + I:item.darkSteel_shears_196=196 + I:item.darkSteel_shears_400=400 + I:item.darkSteel_sword_200=200 + I:item.darkSteel_sword_400=400 I:item.doorIron_336=336 I:item.doorIron_400=400 I:item.doorWood_400=400 @@ -25164,6 +25457,8 @@ pulveriser { I:nuggetCupronickel_400=400 I:nuggetDamascusSteel_16=16 I:nuggetDamascusSteel_400=400 + I:nuggetDarkSteel_16=16 + I:nuggetDarkSteel_400=400 I:nuggetDuranium_16=16 I:nuggetDuranium_400=400 I:nuggetElectrum_16=16 @@ -25368,6 +25663,7 @@ pulveriser { I:oreBasaltCobaltite_400=400 I:oreBasaltCooperite_400=400 I:oreBasaltCopper_400=400 + I:oreBasaltDarkSteel_400=400 I:oreBasaltDiamond_400=400 I:oreBasaltDiatomite_400=400 I:oreBasaltEmerald_400=400 @@ -25478,6 +25774,7 @@ pulveriser { I:oreBlackgraniteCobaltite_400=400 I:oreBlackgraniteCooperite_400=400 I:oreBlackgraniteCopper_400=400 + I:oreBlackgraniteDarkSteel_400=400 I:oreBlackgraniteDiamond_400=400 I:oreBlackgraniteDiatomite_400=400 I:oreBlackgraniteEmerald_400=400 @@ -25572,6 +25869,7 @@ pulveriser { I:oreCobaltite_400=400 I:oreCooperite_400=400 I:oreCopper_400=400 + I:oreDarkSteel_400=400 I:oreDiamond_400=400 I:oreDiatomite_400=400 I:oreEmerald_400=400 @@ -25599,6 +25897,7 @@ pulveriser { I:oreEndstoneCobaltite_400=400 I:oreEndstoneCooperite_400=400 I:oreEndstoneCopper_400=400 + I:oreEndstoneDarkSteel_400=400 I:oreEndstoneDiamond_400=400 I:oreEndstoneDiatomite_400=400 I:oreEndstoneEmerald_400=400 @@ -25727,6 +26026,7 @@ pulveriser { I:oreMarbleCobaltite_400=400 I:oreMarbleCooperite_400=400 I:oreMarbleCopper_400=400 + I:oreMarbleDarkSteel_400=400 I:oreMarbleDiamond_400=400 I:oreMarbleDiatomite_400=400 I:oreMarbleEmerald_400=400 @@ -25839,6 +26139,7 @@ pulveriser { I:oreNetherrackCobaltite_400=400 I:oreNetherrackCooperite_400=400 I:oreNetherrackCopper_400=400 + I:oreNetherrackDarkSteel_400=400 I:oreNetherrackDiamond_400=400 I:oreNetherrackDiatomite_400=400 I:oreNetherrackEmerald_400=400 @@ -25961,6 +26262,7 @@ pulveriser { I:oreRedgraniteCobaltite_400=400 I:oreRedgraniteCooperite_400=400 I:oreRedgraniteCopper_400=400 + I:oreRedgraniteDarkSteel_400=400 I:oreRedgraniteDiamond_400=400 I:oreRedgraniteDiatomite_400=400 I:oreRedgraniteEmerald_400=400 @@ -26311,6 +26613,8 @@ pulveriser { I:plateCupronickel_60=60 I:plateDamascusSteel_400=400 I:plateDamascusSteel_56=56 + I:plateDarkSteel_400=400 + I:plateDarkSteel_98=98 I:plateDenseBronze_400=400 I:plateDenseBronze_684=684 I:plateDenseCopper_400=400 @@ -26363,6 +26667,8 @@ pulveriser { I:plateDoubleCupronickel_400=400 I:plateDoubleDamascusSteel_112=112 I:plateDoubleDamascusSteel_400=400 + I:plateDoubleDarkSteel_196=196 + I:plateDoubleDarkSteel_400=400 I:plateDoubleDuranium_196=196 I:plateDoubleDuranium_400=400 I:plateDoubleElectrum_302=302 @@ -26801,6 +27107,8 @@ pulveriser { I:screwCupronickel_400=400 I:screwDamascusSteel_16=16 I:screwDamascusSteel_400=400 + I:screwDarkSteel_16=16 + I:screwDarkSteel_400=400 I:screwDiamond_400=400 I:screwDiamond_85=85 I:screwDuranium_16=16 @@ -27002,6 +27310,8 @@ pulveriser { I:stickCupronickel_400=400 I:stickDamascusSteel_28=28 I:stickDamascusSteel_400=400 + I:stickDarkSteel_400=400 + I:stickDarkSteel_49=49 I:stickDiamond_384=384 I:stickDiamond_400=400 I:stickDuranium_400=400 @@ -27086,6 +27396,8 @@ pulveriser { I:stickLongCupronickel_60=60 I:stickLongDamascusSteel_400=400 I:stickLongDamascusSteel_56=56 + I:stickLongDarkSteel_400=400 + I:stickLongDarkSteel_98=98 I:stickLongDiamond_400=400 I:stickLongDiamond_768=768 I:stickLongDuranium_400=400 @@ -27530,6 +27842,8 @@ pulveriser { I:toolHeadAxeCupronickel_400=400 I:toolHeadAxeDamascusSteel_168=168 I:toolHeadAxeDamascusSteel_400=400 + I:toolHeadAxeDarkSteel_294=294 + I:toolHeadAxeDarkSteel_400=400 I:toolHeadAxeDiamond_2304=2304 I:toolHeadAxeDiamond_400=400 I:toolHeadAxeDuranium_294=294 @@ -27730,6 +28044,8 @@ pulveriser { I:toolHeadBuzzSawCupronickel_400=400 I:toolHeadBuzzSawDamascusSteel_224=224 I:toolHeadBuzzSawDamascusSteel_400=400 + I:toolHeadBuzzSawDarkSteel_392=392 + I:toolHeadBuzzSawDarkSteel_400=400 I:toolHeadBuzzSawDuranium_392=392 I:toolHeadBuzzSawDuranium_400=400 I:toolHeadBuzzSawElectrum_400=400 @@ -27878,6 +28194,8 @@ pulveriser { I:toolHeadChainsawCupronickel_400=400 I:toolHeadChainsawDamascusSteel_364=364 I:toolHeadChainsawDamascusSteel_400=400 + I:toolHeadChainsawDarkSteel_400=400 + I:toolHeadChainsawDarkSteel_448=448 I:toolHeadChainsawDuranium_400=400 I:toolHeadChainsawDuranium_448=448 I:toolHeadChainsawElectrum_400=400 @@ -28026,6 +28344,8 @@ pulveriser { I:toolHeadDrillCupronickel_464=464 I:toolHeadDrillDamascusSteel_400=400 I:toolHeadDrillDamascusSteel_448=448 + I:toolHeadDrillDarkSteel_400=400 + I:toolHeadDrillDarkSteel_616=616 I:toolHeadDrillDuranium_400=400 I:toolHeadDrillDuranium_616=616 I:toolHeadDrillElectrum_400=400 @@ -28173,6 +28493,8 @@ pulveriser { I:toolHeadFileCupronickel_400=400 I:toolHeadFileDamascusSteel_112=112 I:toolHeadFileDamascusSteel_400=400 + I:toolHeadFileDarkSteel_196=196 + I:toolHeadFileDarkSteel_400=400 I:toolHeadFileDuranium_196=196 I:toolHeadFileDuranium_400=400 I:toolHeadFileElectrum_302=302 @@ -28327,6 +28649,8 @@ pulveriser { I:toolHeadHammerCupronickel_400=400 I:toolHeadHammerDamascusSteel_336=336 I:toolHeadHammerDamascusSteel_400=400 + I:toolHeadHammerDarkSteel_400=400 + I:toolHeadHammerDarkSteel_588=588 I:toolHeadHammerDiamond_400=400 I:toolHeadHammerDiamond_4608=4608 I:toolHeadHammerDuranium_400=400 @@ -28533,6 +28857,8 @@ pulveriser { I:toolHeadHoeCupronickel_400=400 I:toolHeadHoeDamascusSteel_112=112 I:toolHeadHoeDamascusSteel_400=400 + I:toolHeadHoeDarkSteel_196=196 + I:toolHeadHoeDarkSteel_400=400 I:toolHeadHoeDiamond_1536=1536 I:toolHeadHoeDiamond_400=400 I:toolHeadHoeDuranium_196=196 @@ -28739,6 +29065,8 @@ pulveriser { I:toolHeadPickaxeCupronickel_400=400 I:toolHeadPickaxeDamascusSteel_168=168 I:toolHeadPickaxeDamascusSteel_400=400 + I:toolHeadPickaxeDarkSteel_294=294 + I:toolHeadPickaxeDarkSteel_400=400 I:toolHeadPickaxeDiamond_2304=2304 I:toolHeadPickaxeDiamond_400=400 I:toolHeadPickaxeDuranium_294=294 @@ -28945,6 +29273,8 @@ pulveriser { I:toolHeadPlowCupronickel_400=400 I:toolHeadPlowDamascusSteel_224=224 I:toolHeadPlowDamascusSteel_400=400 + I:toolHeadPlowDarkSteel_392=392 + I:toolHeadPlowDarkSteel_400=400 I:toolHeadPlowDiamond_3072=3072 I:toolHeadPlowDiamond_400=400 I:toolHeadPlowDuranium_392=392 @@ -29145,6 +29475,8 @@ pulveriser { I:toolHeadSawCupronickel_400=400 I:toolHeadSawDamascusSteel_112=112 I:toolHeadSawDamascusSteel_400=400 + I:toolHeadSawDarkSteel_196=196 + I:toolHeadSawDarkSteel_400=400 I:toolHeadSawDuranium_196=196 I:toolHeadSawDuranium_400=400 I:toolHeadSawElectrum_302=302 @@ -29299,6 +29631,8 @@ pulveriser { I:toolHeadSenseCupronickel_400=400 I:toolHeadSenseDamascusSteel_168=168 I:toolHeadSenseDamascusSteel_400=400 + I:toolHeadSenseDarkSteel_294=294 + I:toolHeadSenseDarkSteel_400=400 I:toolHeadSenseDiamond_2304=2304 I:toolHeadSenseDiamond_400=400 I:toolHeadSenseDuranium_294=294 @@ -29505,6 +29839,8 @@ pulveriser { I:toolHeadShovelCupronickel_60=60 I:toolHeadShovelDamascusSteel_400=400 I:toolHeadShovelDamascusSteel_56=56 + I:toolHeadShovelDarkSteel_400=400 + I:toolHeadShovelDarkSteel_98=98 I:toolHeadShovelDiamond_400=400 I:toolHeadShovelDiamond_768=768 I:toolHeadShovelDuranium_400=400 @@ -29711,6 +30047,8 @@ pulveriser { I:toolHeadSwordCupronickel_400=400 I:toolHeadSwordDamascusSteel_112=112 I:toolHeadSwordDamascusSteel_400=400 + I:toolHeadSwordDarkSteel_196=196 + I:toolHeadSwordDarkSteel_400=400 I:toolHeadSwordDiamond_1536=1536 I:toolHeadSwordDiamond_400=400 I:toolHeadSwordDuranium_196=196 @@ -29917,6 +30255,8 @@ pulveriser { I:toolHeadUniversalSpadeCupronickel_60=60 I:toolHeadUniversalSpadeDamascusSteel_400=400 I:toolHeadUniversalSpadeDamascusSteel_56=56 + I:toolHeadUniversalSpadeDarkSteel_400=400 + I:toolHeadUniversalSpadeDarkSteel_98=98 I:toolHeadUniversalSpadeDiamond_400=400 I:toolHeadUniversalSpadeDiamond_768=768 I:toolHeadUniversalSpadeDuranium_400=400 @@ -30117,6 +30457,8 @@ pulveriser { I:toolHeadWrenchCupronickel_400=400 I:toolHeadWrenchDamascusSteel_250=250 I:toolHeadWrenchDamascusSteel_400=400 + I:toolHeadWrenchDarkSteel_400=400 + I:toolHeadWrenchDarkSteel_418=418 I:toolHeadWrenchDuranium_400=400 I:toolHeadWrenchDuranium_418=418 I:toolHeadWrenchElectrum_400=400 @@ -30265,6 +30607,8 @@ pulveriser { I:turbineBladeCupronickel_400=400 I:turbineBladeDamascusSteel_336=336 I:turbineBladeDamascusSteel_400=400 + I:turbineBladeDarkSteel_400=400 + I:turbineBladeDarkSteel_588=588 I:turbineBladeDuranium_400=400 I:turbineBladeDuranium_588=588 I:turbineBladeElectrum_400=400 @@ -30822,6 +31166,14 @@ recipereplacements { B:Bronze.Pickaxe_true=true B:Bronze.Shovel_true=true B:Bronze.Sword_true=true + B:DarkSteel.Axe_true=true + B:DarkSteel.Boots_true=true + B:DarkSteel.ChestPlate_true=true + B:DarkSteel.Helmet_true=true + B:DarkSteel.Pants_true=true + B:DarkSteel.Pickaxe_true=true + B:DarkSteel.Shears_true=true + B:DarkSteel.Sword_true=true B:Gold.Axe_true=true B:Gold.Boots_true=true B:Gold.ChestPlate_true=true @@ -30881,6 +31233,7 @@ rockcrushing { B:blockCopper_true=true B:blockCupronickel_true=true B:blockDamascusSteel_true=true + B:blockDarkSteel_true=true B:blockDiamond_true=true B:blockDilithium_true=true B:blockDuranium_true=true @@ -30932,6 +31285,7 @@ rockcrushing { B:blockNiobiumTitanium_true=true B:blockNiobium_true=true B:blockNiter_true=true + B:blockObsidian_true=true B:blockOlivine_true=true B:blockOpal_true=true B:blockOsmiridium_true=true @@ -30996,6 +31350,7 @@ rockcrushing { B:boltCobalt_true=true B:boltCupronickel_true=true B:boltDamascusSteel_true=true + B:boltDarkSteel_true=true B:boltDiamond_true=true B:boltDuranium_true=true B:boltElectrum_true=true @@ -31271,6 +31626,7 @@ rockcrushing { B:crushedCentrifugedCobaltite_true=true B:crushedCentrifugedCooperite_true=true B:crushedCentrifugedCopper_true=true + B:crushedCentrifugedDarkSteel_true=true B:crushedCentrifugedDiamond_true=true B:crushedCentrifugedDiatomite_true=true B:crushedCentrifugedEmerald_true=true @@ -31363,6 +31719,7 @@ rockcrushing { B:crushedCobaltite_true=true B:crushedCooperite_true=true B:crushedCopper_true=true + B:crushedDarkSteel_true=true B:crushedDiamond_true=true B:crushedDiatomite_true=true B:crushedEmerald_true=true @@ -31435,6 +31792,7 @@ rockcrushing { B:crushedPurifiedCobaltite_true=true B:crushedPurifiedCooperite_true=true B:crushedPurifiedCopper_true=true + B:crushedPurifiedDarkSteel_true=true B:crushedPurifiedDiamond_true=true B:crushedPurifiedDiatomite_true=true B:crushedPurifiedEmerald_true=true @@ -31554,6 +31912,7 @@ rockcrushing { B:crushedWulfenite_true=true B:crushedYellowLimonite_true=true B:crushedZinc_true=true + B:enderio.silicon_true=true B:foilAluminium_true=true B:foilAnnealedCopper_true=true B:foilBlackSteel_true=true @@ -31606,6 +31965,7 @@ rockcrushing { B:frameGtCopper_true=true B:frameGtCupronickel_true=true B:frameGtDamascusSteel_true=true + B:frameGtDarkSteel_true=true B:frameGtDuranium_true=true B:frameGtElectrum_true=true B:frameGtEpoxidFiberReinforced_true=true @@ -32755,6 +33115,7 @@ rockcrushing { B:ingotCopper_true=true B:ingotCupronickel_true=true B:ingotDamascusSteel_true=true + B:ingotDarkSteel_true=true B:ingotDuranium_true=true B:ingotElectrum_true=true B:ingotEpoxidFiberReinforced_true=true @@ -32860,6 +33221,14 @@ rockcrushing { B:item.clay_true=true B:item.clock_true=true B:item.compass_true=true + B:item.darkSteel_axe_true=true + B:item.darkSteel_boots_true=true + B:item.darkSteel_chestplate_true=true + B:item.darkSteel_helmet_true=true + B:item.darkSteel_leggings_true=true + B:item.darkSteel_pickaxe_true=true + B:item.darkSteel_shears_true=true + B:item.darkSteel_sword_true=true B:item.doorIron_true=true B:item.dyePowder.brown_true=true B:item.enchantedBook_true=true @@ -32953,6 +33322,7 @@ rockcrushing { B:nuggetCopper_true=true B:nuggetCupronickel_true=true B:nuggetDamascusSteel_true=true + B:nuggetDarkSteel_true=true B:nuggetDuranium_true=true B:nuggetElectrum_true=true B:nuggetEpoxidFiberReinforced_true=true @@ -33068,6 +33438,7 @@ rockcrushing { B:oreBasaltCobaltite_true=true B:oreBasaltCooperite_true=true B:oreBasaltCopper_true=true + B:oreBasaltDarkSteel_true=true B:oreBasaltDiamond_true=true B:oreBasaltDiatomite_true=true B:oreBasaltEmerald_true=true @@ -33178,6 +33549,7 @@ rockcrushing { B:oreBlackgraniteCobaltite_true=true B:oreBlackgraniteCooperite_true=true B:oreBlackgraniteCopper_true=true + B:oreBlackgraniteDarkSteel_true=true B:oreBlackgraniteDiamond_true=true B:oreBlackgraniteDiatomite_true=true B:oreBlackgraniteEmerald_true=true @@ -33272,6 +33644,7 @@ rockcrushing { B:oreCobaltite_true=true B:oreCooperite_true=true B:oreCopper_true=true + B:oreDarkSteel_true=true B:oreDiamond_true=true B:oreDiatomite_true=true B:oreEmerald_true=true @@ -33299,6 +33672,7 @@ rockcrushing { B:oreEndstoneCobaltite_true=true B:oreEndstoneCooperite_true=true B:oreEndstoneCopper_true=true + B:oreEndstoneDarkSteel_true=true B:oreEndstoneDiamond_true=true B:oreEndstoneDiatomite_true=true B:oreEndstoneEmerald_true=true @@ -33427,6 +33801,7 @@ rockcrushing { B:oreMarbleCobaltite_true=true B:oreMarbleCooperite_true=true B:oreMarbleCopper_true=true + B:oreMarbleDarkSteel_true=true B:oreMarbleDiamond_true=true B:oreMarbleDiatomite_true=true B:oreMarbleEmerald_true=true @@ -33539,6 +33914,7 @@ rockcrushing { B:oreNetherrackCobaltite_true=true B:oreNetherrackCooperite_true=true B:oreNetherrackCopper_true=true + B:oreNetherrackDarkSteel_true=true B:oreNetherrackDiamond_true=true B:oreNetherrackDiatomite_true=true B:oreNetherrackEmerald_true=true @@ -33661,6 +34037,7 @@ rockcrushing { B:oreRedgraniteCobaltite_true=true B:oreRedgraniteCooperite_true=true B:oreRedgraniteCopper_true=true + B:oreRedgraniteDarkSteel_true=true B:oreRedgraniteDiamond_true=true B:oreRedgraniteDiatomite_true=true B:oreRedgraniteEmerald_true=true @@ -33889,6 +34266,7 @@ rockcrushing { B:plateCopper_true=true B:plateCupronickel_true=true B:plateDamascusSteel_true=true + B:plateDarkSteel_true=true B:plateDenseBronze_true=true B:plateDenseCopper_true=true B:plateDenseGold_true=true @@ -33915,6 +34293,7 @@ rockcrushing { B:plateDoubleCobalt_true=true B:plateDoubleCupronickel_true=true B:plateDoubleDamascusSteel_true=true + B:plateDoubleDarkSteel_true=true B:plateDoubleDuranium_true=true B:plateDoubleElectrum_true=true B:plateDoubleEpoxidFiberReinforced_true=true @@ -34132,6 +34511,7 @@ rockcrushing { B:screwCobalt_true=true B:screwCupronickel_true=true B:screwDamascusSteel_true=true + B:screwDarkSteel_true=true B:screwDiamond_true=true B:screwDuranium_true=true B:screwElectrum_true=true @@ -34231,6 +34611,7 @@ rockcrushing { B:stickCopper_true=true B:stickCupronickel_true=true B:stickDamascusSteel_true=true + B:stickDarkSteel_true=true B:stickDiamond_true=true B:stickDuranium_true=true B:stickElectrum_true=true @@ -34273,6 +34654,7 @@ rockcrushing { B:stickLongCobalt_true=true B:stickLongCupronickel_true=true B:stickLongDamascusSteel_true=true + B:stickLongDarkSteel_true=true B:stickLongDiamond_true=true B:stickLongDuranium_true=true B:stickLongElectrum_true=true @@ -34479,6 +34861,7 @@ rockcrushing { B:toolHeadAxeCobalt_true=true B:toolHeadAxeCupronickel_true=true B:toolHeadAxeDamascusSteel_true=true + B:toolHeadAxeDarkSteel_true=true B:toolHeadAxeDiamond_true=true B:toolHeadAxeDuranium_true=true B:toolHeadAxeElectrum_true=true @@ -34577,6 +34960,7 @@ rockcrushing { B:toolHeadBuzzSawCobalt_true=true B:toolHeadBuzzSawCupronickel_true=true B:toolHeadBuzzSawDamascusSteel_true=true + B:toolHeadBuzzSawDarkSteel_true=true B:toolHeadBuzzSawDuranium_true=true B:toolHeadBuzzSawElectrum_true=true B:toolHeadBuzzSawEpoxidFiberReinforced_true=true @@ -34651,6 +35035,7 @@ rockcrushing { B:toolHeadChainsawCobalt_true=true B:toolHeadChainsawCupronickel_true=true B:toolHeadChainsawDamascusSteel_true=true + B:toolHeadChainsawDarkSteel_true=true B:toolHeadChainsawDuranium_true=true B:toolHeadChainsawElectrum_true=true B:toolHeadChainsawEpoxidFiberReinforced_true=true @@ -34725,6 +35110,7 @@ rockcrushing { B:toolHeadDrillCobalt_true=true B:toolHeadDrillCupronickel_true=true B:toolHeadDrillDamascusSteel_true=true + B:toolHeadDrillDarkSteel_true=true B:toolHeadDrillDuranium_true=true B:toolHeadDrillElectrum_true=true B:toolHeadDrillEpoxidFiberReinforced_true=true @@ -34799,6 +35185,7 @@ rockcrushing { B:toolHeadFileCobalt_true=true B:toolHeadFileCupronickel_true=true B:toolHeadFileDamascusSteel_true=true + B:toolHeadFileDarkSteel_true=true B:toolHeadFileDuranium_true=true B:toolHeadFileElectrum_true=true B:toolHeadFileEpoxidFiberReinforced_true=true @@ -34876,6 +35263,7 @@ rockcrushing { B:toolHeadHammerCobalt_true=true B:toolHeadHammerCupronickel_true=true B:toolHeadHammerDamascusSteel_true=true + B:toolHeadHammerDarkSteel_true=true B:toolHeadHammerDiamond_true=true B:toolHeadHammerDuranium_true=true B:toolHeadHammerElectrum_true=true @@ -34977,6 +35365,7 @@ rockcrushing { B:toolHeadHoeCobalt_true=true B:toolHeadHoeCupronickel_true=true B:toolHeadHoeDamascusSteel_true=true + B:toolHeadHoeDarkSteel_true=true B:toolHeadHoeDiamond_true=true B:toolHeadHoeDuranium_true=true B:toolHeadHoeElectrum_true=true @@ -35078,6 +35467,7 @@ rockcrushing { B:toolHeadPickaxeCobalt_true=true B:toolHeadPickaxeCupronickel_true=true B:toolHeadPickaxeDamascusSteel_true=true + B:toolHeadPickaxeDarkSteel_true=true B:toolHeadPickaxeDiamond_true=true B:toolHeadPickaxeDuranium_true=true B:toolHeadPickaxeElectrum_true=true @@ -35179,6 +35569,7 @@ rockcrushing { B:toolHeadPlowCobalt_true=true B:toolHeadPlowCupronickel_true=true B:toolHeadPlowDamascusSteel_true=true + B:toolHeadPlowDarkSteel_true=true B:toolHeadPlowDiamond_true=true B:toolHeadPlowDuranium_true=true B:toolHeadPlowElectrum_true=true @@ -35277,6 +35668,7 @@ rockcrushing { B:toolHeadSawCobalt_true=true B:toolHeadSawCupronickel_true=true B:toolHeadSawDamascusSteel_true=true + B:toolHeadSawDarkSteel_true=true B:toolHeadSawDuranium_true=true B:toolHeadSawElectrum_true=true B:toolHeadSawEpoxidFiberReinforced_true=true @@ -35354,6 +35746,7 @@ rockcrushing { B:toolHeadSenseCobalt_true=true B:toolHeadSenseCupronickel_true=true B:toolHeadSenseDamascusSteel_true=true + B:toolHeadSenseDarkSteel_true=true B:toolHeadSenseDiamond_true=true B:toolHeadSenseDuranium_true=true B:toolHeadSenseElectrum_true=true @@ -35455,6 +35848,7 @@ rockcrushing { B:toolHeadShovelCobalt_true=true B:toolHeadShovelCupronickel_true=true B:toolHeadShovelDamascusSteel_true=true + B:toolHeadShovelDarkSteel_true=true B:toolHeadShovelDiamond_true=true B:toolHeadShovelDuranium_true=true B:toolHeadShovelElectrum_true=true @@ -35556,6 +35950,7 @@ rockcrushing { B:toolHeadSwordCobalt_true=true B:toolHeadSwordCupronickel_true=true B:toolHeadSwordDamascusSteel_true=true + B:toolHeadSwordDarkSteel_true=true B:toolHeadSwordDiamond_true=true B:toolHeadSwordDuranium_true=true B:toolHeadSwordElectrum_true=true @@ -35657,6 +36052,7 @@ rockcrushing { B:toolHeadUniversalSpadeCobalt_true=true B:toolHeadUniversalSpadeCupronickel_true=true B:toolHeadUniversalSpadeDamascusSteel_true=true + B:toolHeadUniversalSpadeDarkSteel_true=true B:toolHeadUniversalSpadeDiamond_true=true B:toolHeadUniversalSpadeDuranium_true=true B:toolHeadUniversalSpadeElectrum_true=true @@ -35755,6 +36151,7 @@ rockcrushing { B:toolHeadWrenchCobalt_true=true B:toolHeadWrenchCupronickel_true=true B:toolHeadWrenchDamascusSteel_true=true + B:toolHeadWrenchDarkSteel_true=true B:toolHeadWrenchDuranium_true=true B:toolHeadWrenchElectrum_true=true B:toolHeadWrenchEpoxidFiberReinforced_true=true @@ -35829,6 +36226,7 @@ rockcrushing { B:turbineBladeCobalt_true=true B:turbineBladeCupronickel_true=true B:turbineBladeDamascusSteel_true=true + B:turbineBladeDarkSteel_true=true B:turbineBladeDuranium_true=true B:turbineBladeElectrum_true=true B:turbineBladeEpoxidFiberReinforced_true=true @@ -36244,6 +36642,8 @@ smelting { B:arrowGtWoodDamascusSteel_true=true B:arrowGtWoodSterlingSilver_true=true B:blockArsenic_true=true + B:blockRedstoneAlloy_true=true + B:blockSoularium_true=true B:boltAluminium_true=true B:boltBeryllium_true=true B:boltBismuthBronze_true=true @@ -36259,6 +36659,7 @@ smelting { B:boltCobalt_true=true B:boltCupronickel_true=true B:boltDamascusSteel_true=true + B:boltDarkSteel_true=true B:boltDuranium_true=true B:boltElectrum_true=true B:boltEpoxidFiberReinforced_true=true @@ -36397,6 +36798,7 @@ smelting { B:crushedCentrifugedCobaltite_true=true B:crushedCentrifugedCooperite_true=true B:crushedCentrifugedCopper_true=true + B:crushedCentrifugedDarkSteel_true=true B:crushedCentrifugedGalena_true=true B:crushedCentrifugedGarnierite_true=true B:crushedCentrifugedGold_true=true @@ -36429,6 +36831,7 @@ smelting { B:crushedCobaltite_true=true B:crushedCooperite_true=true B:crushedCopper_true=true + B:crushedDarkSteel_true=true B:crushedGalena_true=true B:crushedGarnierite_true=true B:crushedGold_true=true @@ -36455,6 +36858,7 @@ smelting { B:crushedPurifiedCobaltite_true=true B:crushedPurifiedCooperite_true=true B:crushedPurifiedCopper_true=true + B:crushedPurifiedDarkSteel_true=true B:crushedPurifiedGalena_true=true B:crushedPurifiedGarnierite_true=true B:crushedPurifiedGold_true=true @@ -36519,6 +36923,7 @@ smelting { B:dustCooperite_true=true B:dustCopper_true=true B:dustCupronickel_true=true + B:dustDarkSteel_true=true B:dustDuranium_true=true B:dustElectrum_true=true B:dustEpoxidFiberReinforced_true=true @@ -36540,6 +36945,7 @@ smelting { B:dustImpureCobaltite_true=true B:dustImpureCooperite_true=true B:dustImpureCopper_true=true + B:dustImpureDarkSteel_true=true B:dustImpureGalena_true=true B:dustImpureGarnierite_true=true B:dustImpureGold_true=true @@ -36609,6 +37015,7 @@ smelting { B:dustPureCobaltite_true=true B:dustPureCooperite_true=true B:dustPureCopper_true=true + B:dustPureDarkSteel_true=true B:dustPureGalena_true=true B:dustPureGarnierite_true=true B:dustPureGold_true=true @@ -36669,6 +37076,7 @@ smelting { B:dustTinyCobalt_true=true B:dustTinyCopper_true=true B:dustTinyCupronickel_true=true + B:dustTinyDarkSteel_true=true B:dustTinyDuranium_true=true B:dustTinyElectrum_true=true B:dustTinyEpoxidFiberReinforced_true=true @@ -36722,6 +37130,7 @@ smelting { B:dustWroughtIron_true=true B:dustYellowLimonite_true=true B:dustZinc_true=true + B:enderio.silicon_true=true B:foilAluminium_true=true B:foilAnnealedCopper_true=true B:foilBlackSteel_true=true @@ -36893,6 +37302,7 @@ smelting { B:ingotCopper_true=true B:ingotCupronickel_true=true B:ingotDamascusSteel_true=true + B:ingotDarkSteel_true=true B:ingotDuranium_true=true B:ingotElectrum_true=true B:ingotEpoxidFiberReinforced_true=true @@ -36935,6 +37345,8 @@ smelting { 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:ingotPlastic_true=true B:ingotPlatinum_true=true @@ -36946,6 +37358,7 @@ smelting { B:ingotPolytetrafluoroethylene_true=true B:ingotPolyvinylChloride_true=true B:ingotPotassium_true=true + B:ingotPulsatingIron_true=true B:ingotRedAlloy_true=true B:ingotRedSteel_true=true B:ingotRoseGold_true=true @@ -36974,6 +37387,7 @@ smelting { 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 @@ -37003,6 +37417,7 @@ smelting { B:oreBasaltCobaltite_true=true B:oreBasaltCooperite_true=true B:oreBasaltCopper_true=true + B:oreBasaltDarkSteel_true=true B:oreBasaltDiamond_true=true B:oreBasaltEmerald_true=true B:oreBasaltFoolsRuby_true=true @@ -37068,6 +37483,7 @@ smelting { B:oreBlackgraniteCobaltite_true=true B:oreBlackgraniteCooperite_true=true B:oreBlackgraniteCopper_true=true + B:oreBlackgraniteDarkSteel_true=true B:oreBlackgraniteDiamond_true=true B:oreBlackgraniteEmerald_true=true B:oreBlackgraniteFoolsRuby_true=true @@ -37127,6 +37543,7 @@ smelting { B:oreCobaltite_true=true B:oreCooperite_true=true B:oreCopper_true=true + B:oreDarkSteel_true=true B:oreDiamond_true=true B:oreEmerald_true=true B:oreEndstoneAmethyst_true=true @@ -37144,6 +37561,7 @@ smelting { B:oreEndstoneCobaltite_true=true B:oreEndstoneCooperite_true=true B:oreEndstoneCopper_true=true + B:oreEndstoneDarkSteel_true=true B:oreEndstoneDiamond_true=true B:oreEndstoneEmerald_true=true B:oreEndstoneFoolsRuby_true=true @@ -37226,6 +37644,7 @@ smelting { B:oreMarbleCobaltite_true=true B:oreMarbleCooperite_true=true B:oreMarbleCopper_true=true + B:oreMarbleDarkSteel_true=true B:oreMarbleDiamond_true=true B:oreMarbleEmerald_true=true B:oreMarbleFoolsRuby_true=true @@ -37293,6 +37712,7 @@ smelting { B:oreNetherrackCobaltite_true=true B:oreNetherrackCooperite_true=true B:oreNetherrackCopper_true=true + B:oreNetherrackDarkSteel_true=true B:oreNetherrackDiamond_true=true B:oreNetherrackEmerald_true=true B:oreNetherrackFoolsRuby_true=true @@ -37367,6 +37787,7 @@ smelting { B:oreRedgraniteCobaltite_true=true B:oreRedgraniteCooperite_true=true B:oreRedgraniteCopper_true=true + B:oreRedgraniteDarkSteel_true=true B:oreRedgraniteDiamond_true=true B:oreRedgraniteEmerald_true=true B:oreRedgraniteFoolsRuby_true=true @@ -37478,6 +37899,7 @@ smelting { B:plateCopper_true=true B:plateCupronickel_true=true B:plateDamascusSteel_true=true + B:plateDarkSteel_true=true B:plateDoubleCarbon_true=true B:plateDoubleEpoxidFiberReinforced_true=true B:plateDoubleEpoxid_true=true @@ -37597,6 +38019,7 @@ smelting { B:screwCobalt_true=true B:screwCupronickel_true=true B:screwDamascusSteel_true=true + B:screwDarkSteel_true=true B:screwDuranium_true=true B:screwElectrum_true=true B:screwEpoxidFiberReinforced_true=true @@ -37677,6 +38100,7 @@ smelting { B:stickCopper_true=true B:stickCupronickel_true=true B:stickDamascusSteel_true=true + B:stickDarkSteel_true=true B:stickDuranium_true=true B:stickElectrum_true=true B:stickEpoxidFiberReinforced_true=true @@ -37708,6 +38132,7 @@ smelting { B:stickLongCobalt_true=true B:stickLongCupronickel_true=true B:stickLongDamascusSteel_true=true + B:stickLongDarkSteel_true=true B:stickLongDuranium_true=true B:stickLongElectrum_true=true B:stickLongEpoxidFiberReinforced_true=true @@ -37949,6 +38374,7 @@ smelting { B:toolHeadShovelCobalt_true=true B:toolHeadShovelCupronickel_true=true B:toolHeadShovelDamascusSteel_true=true + B:toolHeadShovelDarkSteel_true=true B:toolHeadShovelDuranium_true=true B:toolHeadShovelElectrum_true=true B:toolHeadShovelEpoxidFiberReinforced_true=true @@ -38038,6 +38464,7 @@ smelting { B:toolHeadUniversalSpadeCobalt_true=true B:toolHeadUniversalSpadeCupronickel_true=true B:toolHeadUniversalSpadeDamascusSteel_true=true + B:toolHeadUniversalSpadeDarkSteel_true=true B:toolHeadUniversalSpadeDuranium_true=true B:toolHeadUniversalSpadeElectrum_true=true B:toolHeadUniversalSpadeEpoxidFiberReinforced_true=true @@ -38214,16 +38641,20 @@ storageblockcrafting { B:blockCoal_false=false B:blockCobaltBrass_false=false B:blockCobalt_false=false + B:blockConductiveIron_false=false B:blockCopper_false=false B:blockCupronickel_false=false B:blockDamascusSteel_false=false + B:blockDarkSteel_false=false B:blockDiamond_false=false B:blockDilithium_false=false B:blockDuranium_false=false + B:blockElectricalSteel_false=false B:blockElectrum_false=false B:blockEmerald_false=false B:blockEnderEye_false=false B:blockEnderPearl_false=false + B:blockEnergeticAlloy_false=false B:blockEuropium_false=false B:blockFoolsRuby_false=false B:blockForcicium_false=false @@ -38268,19 +38699,24 @@ storageblockcrafting { B:blockNiobiumTitanium_false=false B:blockNiobium_false=false B:blockNiter_false=false + B:blockObsidian_false=false B:blockOlivine_false=false B:blockOpal_false=false B:blockOsmiridium_false=false B:blockOsmium_false=false B:blockPalladium_false=false + B:blockPhasedGold_false=false + B:blockPhasedIron_false=false B:blockPhosphorus_false=false B:blockPigIron_false=false B:blockPlatinum_false=false B:blockPlutonium241_false=false B:blockPlutonium_false=false + B:blockPulsatingIron_false=false B:blockQuartzite_false=false B:blockRedAlloy_false=false B:blockRedSteel_false=false + B:blockRedstoneAlloy_false=false B:blockRedstone_false=false B:blockRoseGold_false=false B:blockRuby_false=false @@ -38289,6 +38725,7 @@ storageblockcrafting { B:blockSilver_false=false B:blockSodalite_false=false B:blockSolderingAlloy_false=false + B:blockSoularium_false=false B:blockStainlessSteel_false=false B:blockSteelMagnetic_false=false B:blockSteel_false=false @@ -38310,6 +38747,7 @@ storageblockcrafting { B:blockVanadiumGallium_false=false B:blockVanadiumSteel_false=false B:blockVanadium_false=false + B:blockVibrantAlloy_false=false B:blockWroughtIron_false=false B:blockYttriumBariumCuprate_false=false B:blockYttrium_false=false @@ -38343,16 +38781,20 @@ storageblockdecrafting { B:blockCoal_true=true B:blockCobaltBrass_false=false B:blockCobalt_false=false + B:blockConductiveIron_false=false B:blockCopper_false=false B:blockCupronickel_false=false B:blockDamascusSteel_false=false + B:blockDarkSteel_false=false B:blockDiamond_true=true B:blockDilithium_true=true B:blockDuranium_false=false + B:blockElectricalSteel_false=false B:blockElectrum_false=false B:blockEmerald_true=true B:blockEnderEye_true=true B:blockEnderPearl_true=true + B:blockEnergeticAlloy_false=false B:blockEuropium_false=false B:blockFoolsRuby_true=true B:blockForcicium_true=true @@ -38397,19 +38839,24 @@ storageblockdecrafting { B:blockNiobiumTitanium_false=false B:blockNiobium_false=false B:blockNiter_true=true + B:blockObsidian_false=false B:blockOlivine_true=true B:blockOpal_true=true B:blockOsmiridium_false=false B:blockOsmium_false=false B:blockPalladium_false=false + B:blockPhasedGold_false=false + B:blockPhasedIron_false=false B:blockPhosphorus_true=true B:blockPigIron_false=false B:blockPlatinum_false=false B:blockPlutonium241_false=false B:blockPlutonium_false=false + B:blockPulsatingIron_false=false B:blockQuartzite_true=true B:blockRedAlloy_false=false B:blockRedSteel_false=false + B:blockRedstoneAlloy_false=false B:blockRedstone_false=false B:blockRoseGold_false=false B:blockRuby_true=true @@ -38418,6 +38865,7 @@ storageblockdecrafting { B:blockSilver_false=false B:blockSodalite_true=true B:blockSolderingAlloy_false=false + B:blockSoularium_false=false B:blockStainlessSteel_false=false B:blockSteelMagnetic_false=false B:blockSteel_false=false @@ -38439,6 +38887,7 @@ storageblockdecrafting { B:blockVanadiumGallium_false=false B:blockVanadiumSteel_false=false B:blockVanadium_false=false + B:blockVibrantAlloy_false=false B:blockWroughtIron_false=false B:blockYttriumBariumCuprate_false=false B:blockYttrium_false=false @@ -38472,6 +38921,7 @@ thermalcentrifuge { B:crushedCobaltite_true=true B:crushedCooperite_true=true B:crushedCopper_true=true + B:crushedDarkSteel_true=true B:crushedDiamond_true=true B:crushedDiatomite_true=true B:crushedEmerald_true=true @@ -38544,6 +38994,7 @@ thermalcentrifuge { B:crushedPurifiedCobaltite_true=true B:crushedPurifiedCooperite_true=true B:crushedPurifiedCopper_true=true + B:crushedPurifiedDarkSteel_true=true B:crushedPurifiedDiamond_true=true B:crushedPurifiedDiatomite_true=true B:crushedPurifiedEmerald_true=true diff --git a/config/GregTech/Unification.cfg b/config/GregTech/Unification.cfg index b706740f2c..afa6166fd8 100644 --- a/config/GregTech/Unification.cfg +++ b/config/GregTech/Unification.cfg @@ -99,6 +99,7 @@ specialunificationtargets { B:boltCobalt_false=false B:boltCupronickel_false=false B:boltDamascusSteel_false=false + B:boltDarkSteel_false=false B:boltDiamond_false=false B:boltDuranium_false=false B:boltElectrum_false=false @@ -248,6 +249,7 @@ specialunificationtargets { B:crushedCentrifugedCobaltite_false=false B:crushedCentrifugedCooperite_false=false B:crushedCentrifugedCopper_false=false + B:crushedCentrifugedDarkSteel_false=false B:crushedCentrifugedDiamond_false=false B:crushedCentrifugedDiatomite_false=false B:crushedCentrifugedEmerald_false=false @@ -340,6 +342,7 @@ specialunificationtargets { B:crushedCobaltite_false=false B:crushedCooperite_false=false B:crushedCopper_false=false + B:crushedDarkSteel_false=false B:crushedDiamond_false=false B:crushedDiatomite_false=false B:crushedEmerald_false=false @@ -412,6 +415,7 @@ specialunificationtargets { B:crushedPurifiedCobaltite_false=false B:crushedPurifiedCooperite_false=false B:crushedPurifiedCopper_false=false + B:crushedPurifiedDarkSteel_false=false B:crushedPurifiedDiamond_false=false B:crushedPurifiedDiatomite_false=false B:crushedPurifiedEmerald_false=false @@ -609,6 +613,7 @@ specialunificationtargets { B:dustCupronickel_false=false B:dustDamascusSteel_false=false B:dustDarkAsh_false=false + B:dustDarkSteel_false=false B:dustDiamond_false=false B:dustDiatomite_false=false B:dustDilithium_false=false @@ -685,6 +690,7 @@ specialunificationtargets { B:dustImpureCobaltite_false=false B:dustImpureCooperite_false=false B:dustImpureCopper_false=false + B:dustImpureDarkSteel_false=false B:dustImpureDiamond_false=false B:dustImpureDiatomite_false=false B:dustImpureEmerald_false=false @@ -891,6 +897,7 @@ specialunificationtargets { B:dustPureCobaltite_false=false B:dustPureCooperite_false=false B:dustPureCopper_false=false + B:dustPureDarkSteel_false=false B:dustPureDiamond_false=false B:dustPureDiatomite_false=false B:dustPureEmerald_false=false @@ -1081,6 +1088,7 @@ specialunificationtargets { B:dustSmallCupronickel_false=false B:dustSmallDamascusSteel_false=false B:dustSmallDarkAsh_false=false + B:dustSmallDarkSteel_false=false B:dustSmallDiamond_false=false B:dustSmallDiatomite_false=false B:dustSmallDilithium_false=false @@ -1419,6 +1427,7 @@ specialunificationtargets { B:dustTinyCupronickel_false=false B:dustTinyDamascusSteel_false=false B:dustTinyDarkAsh_false=false + B:dustTinyDarkSteel_false=false B:dustTinyDiamond_false=false B:dustTinyDiatomite_false=false B:dustTinyDilithium_false=false @@ -1855,6 +1864,7 @@ specialunificationtargets { B:ingotCopper_false=false B:ingotCupronickel_false=false B:ingotDamascusSteel_false=false + B:ingotDarkSteel_false=false B:ingotDuranium_false=false B:ingotElectrum_false=false B:ingotEpoxidFiberReinforced_false=false @@ -2011,6 +2021,7 @@ specialunificationtargets { B:nuggetCopper_false=false B:nuggetCupronickel_false=false B:nuggetDamascusSteel_false=false + B:nuggetDarkSteel_false=false B:nuggetDuranium_false=false B:nuggetElectrum_false=false B:nuggetEpoxidFiberReinforced_false=false @@ -2122,6 +2133,7 @@ specialunificationtargets { B:plateCopper_false=false B:plateCupronickel_false=false B:plateDamascusSteel_false=false + B:plateDarkSteel_false=false B:plateDenseCopper_false=false B:plateDenseIron_false=false B:plateDenseLead_false=false @@ -2142,6 +2154,7 @@ specialunificationtargets { B:plateDoubleCobalt_false=false B:plateDoubleCupronickel_false=false B:plateDoubleDamascusSteel_false=false + B:plateDoubleDarkSteel_false=false B:plateDoubleDuranium_false=false B:plateDoubleElectrum_false=false B:plateDoubleEpoxidFiberReinforced_false=false @@ -2359,6 +2372,7 @@ specialunificationtargets { B:screwCobalt_false=false B:screwCupronickel_false=false B:screwDamascusSteel_false=false + B:screwDarkSteel_false=false B:screwDiamond_false=false B:screwDuranium_false=false B:screwElectrum_false=false @@ -2460,6 +2474,7 @@ specialunificationtargets { B:stickCopper_false=false B:stickCupronickel_false=false B:stickDamascusSteel_false=false + B:stickDarkSteel_false=false B:stickDiamond_false=false B:stickDuranium_false=false B:stickElectrum_false=false @@ -2502,6 +2517,7 @@ specialunificationtargets { B:stickLongCobalt_false=false B:stickLongCupronickel_false=false B:stickLongDamascusSteel_false=false + B:stickLongDarkSteel_false=false B:stickLongDiamond_false=false B:stickLongDuranium_false=false B:stickLongElectrum_false=false @@ -2661,6 +2677,7 @@ specialunificationtargets { B:toolHeadAxeCobalt_false=false B:toolHeadAxeCupronickel_false=false B:toolHeadAxeDamascusSteel_false=false + B:toolHeadAxeDarkSteel_false=false B:toolHeadAxeDiamond_false=false B:toolHeadAxeDuranium_false=false B:toolHeadAxeElectrum_false=false @@ -2761,6 +2778,7 @@ specialunificationtargets { B:toolHeadBuzzSawCobalt_false=false B:toolHeadBuzzSawCupronickel_false=false B:toolHeadBuzzSawDamascusSteel_false=false + B:toolHeadBuzzSawDarkSteel_false=false B:toolHeadBuzzSawDuranium_false=false B:toolHeadBuzzSawElectrum_false=false B:toolHeadBuzzSawEpoxidFiberReinforced_false=false @@ -2835,6 +2853,7 @@ specialunificationtargets { B:toolHeadChainsawCobalt_false=false B:toolHeadChainsawCupronickel_false=false B:toolHeadChainsawDamascusSteel_false=false + B:toolHeadChainsawDarkSteel_false=false B:toolHeadChainsawDuranium_false=false B:toolHeadChainsawElectrum_false=false B:toolHeadChainsawEpoxidFiberReinforced_false=false @@ -2909,6 +2928,7 @@ specialunificationtargets { B:toolHeadDrillCobalt_false=false B:toolHeadDrillCupronickel_false=false B:toolHeadDrillDamascusSteel_false=false + B:toolHeadDrillDarkSteel_false=false B:toolHeadDrillDuranium_false=false B:toolHeadDrillElectrum_false=false B:toolHeadDrillEpoxidFiberReinforced_false=false @@ -2983,6 +3003,7 @@ specialunificationtargets { B:toolHeadFileCobalt_false=false B:toolHeadFileCupronickel_false=false B:toolHeadFileDamascusSteel_false=false + B:toolHeadFileDarkSteel_false=false B:toolHeadFileDuranium_false=false B:toolHeadFileElectrum_false=false B:toolHeadFileEpoxidFiberReinforced_false=false @@ -3060,6 +3081,7 @@ specialunificationtargets { B:toolHeadHammerCobalt_false=false B:toolHeadHammerCupronickel_false=false B:toolHeadHammerDamascusSteel_false=false + B:toolHeadHammerDarkSteel_false=false B:toolHeadHammerDiamond_false=false B:toolHeadHammerDuranium_false=false B:toolHeadHammerElectrum_false=false @@ -3163,6 +3185,7 @@ specialunificationtargets { B:toolHeadHoeCobalt_false=false B:toolHeadHoeCupronickel_false=false B:toolHeadHoeDamascusSteel_false=false + B:toolHeadHoeDarkSteel_false=false B:toolHeadHoeDiamond_false=false B:toolHeadHoeDuranium_false=false B:toolHeadHoeElectrum_false=false @@ -3266,6 +3289,7 @@ specialunificationtargets { B:toolHeadPickaxeCobalt_false=false B:toolHeadPickaxeCupronickel_false=false B:toolHeadPickaxeDamascusSteel_false=false + B:toolHeadPickaxeDarkSteel_false=false B:toolHeadPickaxeDiamond_false=false B:toolHeadPickaxeDuranium_false=false B:toolHeadPickaxeElectrum_false=false @@ -3369,6 +3393,7 @@ specialunificationtargets { B:toolHeadPlowCobalt_false=false B:toolHeadPlowCupronickel_false=false B:toolHeadPlowDamascusSteel_false=false + B:toolHeadPlowDarkSteel_false=false B:toolHeadPlowDiamond_false=false B:toolHeadPlowDuranium_false=false B:toolHeadPlowElectrum_false=false @@ -3469,6 +3494,7 @@ specialunificationtargets { B:toolHeadSawCobalt_false=false B:toolHeadSawCupronickel_false=false B:toolHeadSawDamascusSteel_false=false + B:toolHeadSawDarkSteel_false=false B:toolHeadSawDuranium_false=false B:toolHeadSawElectrum_false=false B:toolHeadSawEpoxidFiberReinforced_false=false @@ -3546,6 +3572,7 @@ specialunificationtargets { B:toolHeadSenseCobalt_false=false B:toolHeadSenseCupronickel_false=false B:toolHeadSenseDamascusSteel_false=false + B:toolHeadSenseDarkSteel_false=false B:toolHeadSenseDiamond_false=false B:toolHeadSenseDuranium_false=false B:toolHeadSenseElectrum_false=false @@ -3649,6 +3676,7 @@ specialunificationtargets { B:toolHeadShovelCobalt_false=false B:toolHeadShovelCupronickel_false=false B:toolHeadShovelDamascusSteel_false=false + B:toolHeadShovelDarkSteel_false=false B:toolHeadShovelDiamond_false=false B:toolHeadShovelDuranium_false=false B:toolHeadShovelElectrum_false=false @@ -3752,6 +3780,7 @@ specialunificationtargets { B:toolHeadSwordCobalt_false=false B:toolHeadSwordCupronickel_false=false B:toolHeadSwordDamascusSteel_false=false + B:toolHeadSwordDarkSteel_false=false B:toolHeadSwordDiamond_false=false B:toolHeadSwordDuranium_false=false B:toolHeadSwordElectrum_false=false @@ -3855,6 +3884,7 @@ specialunificationtargets { B:toolHeadUniversalSpadeCobalt_false=false B:toolHeadUniversalSpadeCupronickel_false=false B:toolHeadUniversalSpadeDamascusSteel_false=false + B:toolHeadUniversalSpadeDarkSteel_false=false B:toolHeadUniversalSpadeDiamond_false=false B:toolHeadUniversalSpadeDuranium_false=false B:toolHeadUniversalSpadeElectrum_false=false @@ -3955,6 +3985,7 @@ specialunificationtargets { B:toolHeadWrenchCobalt_false=false B:toolHeadWrenchCupronickel_false=false B:toolHeadWrenchDamascusSteel_false=false + B:toolHeadWrenchDarkSteel_false=false B:toolHeadWrenchDuranium_false=false B:toolHeadWrenchElectrum_false=false B:toolHeadWrenchEpoxidFiberReinforced_false=false @@ -4029,6 +4060,7 @@ specialunificationtargets { B:turbineBladeCobalt_false=false B:turbineBladeCupronickel_false=false B:turbineBladeDamascusSteel_false=false + B:turbineBladeDarkSteel_false=false B:turbineBladeDuranium_false=false B:turbineBladeElectrum_false=false B:turbineBladeEpoxidFiberReinforced_false=false @@ -4102,6 +4134,30 @@ specialunificationtargets { B:wireFineYttriumBariumCuprate_false=false } + enderio { + B:dustCoal_false=false + B:dustCopper_false=false + B:dustEnderPearl_false=false + B:dustGold_false=false + B:dustIron_false=false + B:dustObsidian_false=false + B:dustTin_false=false + B:dustWheat_false=false + B:ingotConductiveIron_false=false + B:ingotDarkSteel_true=true + B:ingotElectricalSteel_false=false + B:ingotEnderiumBase_false=false + B:ingotEnergeticAlloy_false=false + B:ingotPhasedGold_false=false + B:ingotPhasedIron_false=false + B:ingotPulsatingIron_false=false + B:ingotRedstoneAlloy_false=false + B:ingotSoularium_false=false + B:ingotVibrantAlloy_false=false + B:nuggetPulsatingIron_false=false + B:nuggetVibrantAlloy_false=false + } + } diff --git a/config/IC2.ini b/config/IC2.ini index e90cb15b5d..b22fa00f9f 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config -; created Oct 9, 2019 2:31:48 AM +; created Oct 10, 2019 4:06:49 AM ;--- [worldgen] diff --git a/config/endercore/cropConfig.json b/config/endercore/cropConfig.json new file mode 100644 index 0000000000..08eaceac76 --- /dev/null +++ b/config/endercore/cropConfig.json @@ -0,0 +1,21 @@ +{"data": + [ + { + "seed":"minecraft:wheat_seeds", + "block":"minecraft:wheat" + }, + { + "seed":"minecraft:carrot", + "block":"minecraft:carrots" + }, + { + "seed":"minecraft:potato", + "block":"minecraft:potatoes" + }, + { + "seed":"minecraft:nether_wart", + "block":"minecraft:nether_wart", + "meta":3 + } + ] +} \ No newline at end of file diff --git a/config/endercore/endercore.cfg b/config/endercore/endercore.cfg new file mode 100644 index 0000000000..411d562f10 --- /dev/null +++ b/config/endercore/endercore.cfg @@ -0,0 +1,108 @@ +# Configuration file + +enchants { + # Allow the Auto Smelt enchant to be registered. + # [default\: true] + B:allowAutoSmelt=true + + # Allow the Auto Smelt enchant to work with Fortune. + # [default\: true] + B:allowAutoSmeltWithFortune=true + + # Allow the XP Boost enchant to be registered. + # [default\: true] + B:allowXPBoost=true + + # Enchant ID for the Auto Smelt enchant. + # [range\: 0 ~ 255, default\: 46] + I:enchantIDAutoSmelt=46 + + # Enchant ID for the XP boost enchant. + # [range\: 0 ~ 255, default\: 45] + I:enchantIDXPBoost=45 +} + + +general { + # Disabling this option will prevent any crops added to the config json from being right clickable. + # [default\: true] + B:allowCropRC=true + + # Prevent tick speedup (i.e. torcherino) on any TE that uses the base TE class from EnderCore + # [default\: false] + B:allowExternalTickSpeedup=false + + # The max amount of XP levels an anvil recipe can use. + # [default\: 40] + I:anvilMaxLevel=40 + + # The way the game should have been made (Yes this is the fireworks thing). + # [default\: true] + B:betterAchievements=true + + # Controls the default sorting on the mod list GUI. + # 0 - Default sort (load order) + # 1 - A to Z sort + # 2 - Z to A sort + # [range\: 0 ~ 2, default\: 1] + I:defaultModSort=1 + + # Removes all void fog. + # 0 = off + # 1 = DEFAULT worldtype only + # 2 = all world types + # [range\: 0 ~ 2, default\: 1] + I:disableVoidFog=1 + + # Show durability on item tooltips. + # 0 - Off + # 1 - Always on + # 2 - Only with shift + # 3 - Only in debug mode + # [range\: 0 ~ 3, default\: 1] + I:showDurabilityTooltips=1 + + # Show oredictionary names of every item in its tooltip. + # 0 - Off + # 1 - Always on + # 2 - Only with shift + # 3 - Only in debug mode + # [range\: 0 ~ 3, default\: 2] + I:showOredictTooltips=2 + + # Show item registry names in tooltips. + # 0 - Off + # 1 - Always on + # 2 - Only with shift + # 3 - Only in debug mode + # [range\: 0 ~ 3, default\: 3] + I:showRegistryNameTooltips=3 + + # 0 - Do nothing + # 1 - Remove stacktraces, leave 1-line missing texture errors + # 2 - Remove all missing texture errors completely. + # [range\: 0 ~ 2, default\: 1] + I:textureErrorRemover=1 +} + + +tweaks { + B:bookToPaperRecipe=true + + # Makes boats stack to 16 + # [default\: true] + B:changeBoatStackSize=true + + # Makes the bed stepSound wool instead of stone + # [default\: true] + B:fixBedSound=true + + # Allows packed ice to be mined with a pickaxe + # [default\: true] + B:fixPackedIceTool=true + B:infinibow=true + B:shapelessPaperRecipe=true + B:slabToBlockRecipes=true +} + + diff --git a/config/enderio/AlloySmelterRecipes_Core.xml b/config/enderio/AlloySmelterRecipes_Core.xml new file mode 100644 index 0000000000..f9480209eb --- /dev/null +++ b/config/enderio/AlloySmelterRecipes_Core.xml @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/enderio/AlloySmelterRecipes_User.xml b/config/enderio/AlloySmelterRecipes_User.xml new file mode 100644 index 0000000000..1bc5a68287 --- /dev/null +++ b/config/enderio/AlloySmelterRecipes_User.xml @@ -0,0 +1,31 @@ + + + + + diff --git a/config/enderio/EnchanterRecipes_Core.xml b/config/enderio/EnchanterRecipes_Core.xml new file mode 100644 index 0000000000..3f55fa7249 --- /dev/null +++ b/config/enderio/EnchanterRecipes_Core.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/enderio/EnchanterRecipes_User.xml b/config/enderio/EnchanterRecipes_User.xml new file mode 100644 index 0000000000..c3dde89e61 --- /dev/null +++ b/config/enderio/EnchanterRecipes_User.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/config/enderio/EnderIO.cfg b/config/enderio/EnderIO.cfg new file mode 100644 index 0000000000..34b35d1857 --- /dev/null +++ b/config/enderio/EnderIO.cfg @@ -0,0 +1,1058 @@ +# Configuration file + +"advanced settings" { + # Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the RF Reader but has a negative impact on server performance. + B:perInterfacePowerTrackingEnabled=false +} + + +"aesthetic settings" { + # If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. + B:combustionGeneratorUseOpaqueModel=true + + # Valid values are between 0-1, smallest conduits at 0, largest at 1. + # In SMP, all clients must be using the same value as the server. + D:conduitScale=0.6 + + # Use TheKazador's alternative model for the Dimensional Transceiver + B:useAlternateTransceiverModel=false + + # If set to true: WIP Combustion Generator model will be used + B:useCombustionGenModel=false +} + + +"anchor settings" { + # Number of ticks cooldown between activations (1 sec = 20 ticks) + I:travelAnchorCooldown=0 + + # Maximum number of blocks that can be traveled from one travel anchor to another. + I:travelAnchorMaxDistance=48 + + # Travel Anchors send a chat warning when skipping inaccessible anchors + B:travelAnchorSkipWarning=true + + # Add sneak as an option to activate travel anchors + B:travelAnchorSneak=true +} + + +"autocrafter settings" { + # RF used per autocrafted recipe + I:crafterRfPerCraft=2500 +} + + +"dark steel" { + # Chance that the dark steel anvil will take damage after repairing something. + D:darkSteelAnvilDamageChance=0.024000000208616257 + + # Number of levels required for the Apiarist Armor upgrade. + I:darkSteelApiaristArmorCost=10 + + # The increase in efficiency when powered. + D:darkSteelAxeEffeciencyBoostWhenPowered=2.0 + + # Power use (RF) per damage/durability point avoided. + I:darkSteelAxePowerUsePerDamagePoint=750 + + # How much slower shift-harvesting logs is. + D:darkSteelAxeSpeedPenaltyMultiHarvest=4.0 + + # Jump height modifier applied when jumping with Dark Steel Boots equipped + D:darkSteelBootsJumpModifier=1.5 + + # Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc + I:darkSteelBootsJumpPowerCost=150 + + # If true, dark steel armor will drain power stored (RF) in power containers in the players inventory. + B:darkSteelDrainPowerFromInventory=false + + # Amount of power used (RF) per block height of fall distance damage negated. + I:darkSteelFallDistanceCost=75 + + # Number of levels required for the 'Glider' upgrade. + I:darkSteelGliderCost=10 + + # Horizontal movement speed modifier when gliding. + D:darkSteelGliderHorizontalSpeed=0.03 + + # Rate of altitude loss when gliding. + D:darkSteelGliderVerticalSpeed=-0.05 + + # Rate of altitude loss when sprinting and gliding. + D:darkSteelGliderVerticalSpeedSprinting=-0.15 + + # Number of levels required for the Goggles of Revealing upgrade. + I:darkSteelGogglesOfRevealingCost=10 + + # Number of levels required for the 'Jump 1' upgrade. + I:darkSteelJumpOneCost=10 + + # Number of levels required for the 'Jump 3' upgrade. + I:darkSteelJumpThreeCost=20 + + # Number of levels required for the 'Jump 2' upgrade. + I:darkSteelJumpTwoCost=15 + + # Speed boost, in blocks per tick, that the DS ladder gives over the vanilla ladder. + D:darkSteelLadderSpeedBoost=0.05999999865889549 + + # Number of levels required for the 'Night Vision' upgrade. + I:darkSteelNightVisionCost=10 + + # If set to a value > 0, the obsidian speed and power use will be used for all blocks with hardness >= to this value. + D:darkSteelPickApplyObsidianEffeciencyAtHardess=40.0 + + # Power use (RF) per damage/durability point avoided when shift-harvesting multiple logs + I:darkSteelPickAxeUsePerDamagePointMultiHarvest=1500 + + # The increase in efficiency when powered. + D:darkSteelPickEffeciencyBoostWhenPowered=2.0 + + # The efficiency when breaking obsidian with a powered Dark Pickaxe. + I:darkSteelPickEffeciencyObsidian=50 + + # When true the dark steel pick will be able to mine TiC Ardite and Cobalt [default: true] + B:darkSteelPickMinesTiCArdite=true + + # The amount of power (RF) used to break an obsidian block. + I:darkSteelPickPowerUseObsidian=10000 + + # Power use (RF) per damage/durability point avoided. + I:darkSteelPickPowerUsePerDamagePoint=750 + + # A list of the amount of durability damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durability damage when powered. + D:darkSteelPowerDamgeAbsorptionRatios < + 0.5 + 0.6 + 0.75 + 0.95 + > + + # Amount of power stored (RF) per crystal in the armor items recipe. + I:darkSteelPowerStorage=100000 + + # Base amount of power stored by dark steel items. + I:darkSteelPowerStorageBase=100000 + + # Amount of power stored by dark steel items with a level 1 upgrade. + I:darkSteelPowerStorageLevelOne=150000 + + # Amount of power stored by dark steel items with a level 3 upgrade. + I:darkSteelPowerStorageLevelThree=1000000 + + # Amount of power stored by dark steel items with a level 2 upgrade. + I:darkSteelPowerStorageLevelTwo=250000 + + # The increase in effected area (radius) when powered and used on blocks. + I:darkSteelShearsBlockAreaBoostWhenPowered=2 + + # How much more durable as vanilla shears they are. + I:darkSteelShearsDurabilityFactor=5 + + # The increase in efficiency when powered. + D:darkSteelShearsEffeciencyBoostWhenPowered=2.0 + + # The increase in effected area (radius) when powered and used on sheep. + D:darkSteelShearsEntityAreaBoostWhenPowered=3.0 + + # Power use (RF) per damage/durability point avoided. + I:darkSteelShearsPowerUsePerDamagePoint=250 + + # If enabled allows the solar upgrade to charge non-darksteel armors that the player is wearing. + B:darkSteelSolarChargeOthers=true + + # Cost in XP levels of the Solar I upgrade. + I:darkSteelSolarOneCost=15 + + # RF per SECOND generated by the Solar I upgrade. Split between all equipped DS armors. + I:darkSteelSolarOneGen=10 + + # Cost in XP levels of the Solar II upgrade. + I:darkSteelSolarTwoCost=30 + + # RF per SECOND generated by the Solar II upgrade. Split between all equipped DS armors. + I:darkSteelSolarTwoGen=40 + + # Number of levels required for the 'Sound Locator' upgrade. + I:darkSteelSoundLocatorCost=10 + + # Number of ticks the 'Sound Locator' icons are displayed for. + I:darkSteelSoundLocatorLifespan=40 + + # Range of the 'Sound Locator' upgrade. + I:darkSteelSoundLocatorRange=40 + + # Number of levels required for the 'Speed 1' upgrade. + I:darkSteelSpeedOneCost=10 + + # Speed modifier applied when walking in the Dark Steel Boots with Speed I. + D:darkSteelSpeedOneSprintModifier=0.10000000149011612 + + # Speed modifier applied when walking in the Dark Steel Boots with Speed I. + D:darkSteelSpeedOneWalkModifier=0.10000000149011612 + + # Number of levels required for the 'Speed 3' upgrade. + I:darkSteelSpeedThreeCost=20 + + # Speed modifier applied when walking in the Dark Steel Boots with Speed I. + D:darkSteelSpeedThreeSprintMultiplier=0.5 + + # Speed modifier applied when walking in the Dark Steel Boots with Speed I. + D:darkSteelSpeedThreeWalkMultiplier=0.30000001192092896 + + # Number of levels required for the 'Speed 2' upgrade. + I:darkSteelSpeedTwoCost=15 + + # Speed modifier applied when walking in the Dark Steel Boots with Speed I. + D:darkSteelSpeedTwoSprintMultiplier=0.30000001192092896 + + # Speed modifier applied when walking in the Dark Steel Boots with Speed I. + D:darkSteelSpeedTwoWalkMultiplier=0.20000000298023224 + + # Number of levels required for the 'Spoon' upgrade. + I:darkSteelSpoonCost=10 + + # Amount of power stored (RF) per block walked when wearing the dark steel boots. + I:darkSteelSprintPowerCost=83 + + # Number of levels required for the 'Swim' upgrade. + I:darkSteelSwimCost=10 + + # The chance that an ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance) + D:darkSteelSwordEnderPearlDropChance=1.0 + + # The chance for each looting level that an additional ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance) + D:darkSteelSwordEnderPearlDropChancePerLooting=0.5 + + # The amount of power (RF) used per hit. + I:darkSteelSwordPowerUsePerHit=750 + + # The base chance that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance) + D:darkSteelSwordSkullChance=0.10000000149011612 + + # The chance per looting level that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance) + D:darkSteelSwordSkullLootingModifier=0.07500000298023224 + + # The base chance that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance) + D:darkSteelSwordWitherSkullChance=0.05000000074505806 + + # The chance per looting level that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance) + D:darkSteelSwordWitherSkullLootingModifie=0.05000000074505806 + + # Number of levels required for the 'Travel' upgrade. + I:darkSteelTravelCost=30 + + # Number of levels required for the 'Power 1. + I:darkSteelUpgradePowerOneCost=10 + + # Number of levels required for the 'Power 3' upgrade. + I:darkSteelUpgradePowerThreeCost=20 + + # Number of levels required for the 'Power 2. + I:darkSteelUpgradePowerTwoCost=15 + + # Number of levels required for the 'Empowered. + I:darkSteelUpgradeVibrantCost=10 + + # Amount of power stored (RF) per block walked when wearing the dark steel boots. + I:darkSteelWalkPowerCost=83 + + # The ratio of skull drops when a mob is killed by a 'FakePlayer', such as Killer Joe. When set to 0 no skulls will drop, at 1 the rate of skull drops is not modified + D:fakePlayerSkullChance=0.5 + + # Should the dark steel placement, when in the first (0th) slot, place the item in the last slot. If false, will place what's in the second slot. + B:shouldSlotZeroWrap=true + + # The base chance that an Enderman Skull will be dropped when using TiC Cleaver + D:ticCleaverSkullDropChance=0.10000000149011612 + + # The base chance that a skull will be dropped when using a non dark steel sword (0 = no chance, 1 = 100% chance) + D:vanillaSwordSkullChance=0.05000000074505806 +} + + +"efficiency settings" { + # Number of millibuckets per tick extracted by pressurized fluid conduits auto extracting + I:advancedFluidConduitExtractRate=100 + + # Number of millibuckets per tick that can pass through a single connection to an pressurized fluid conduit. + I:advancedFluidConduitMaxIoRate=400 + + # Number of millibuckets per tick extracted by ender fluid conduits auto extracting + I:enderFluidConduitExtractRate=200 + + # Number of millibuckets per tick that can pass through a single connection to an ender fluid conduit. + I:enderFluidConduitMaxIoRate=800 + + # Range accessible (in blocks) when using the Ender IO. + I:enderIoRange=8 + + # Number of millibuckets per tick extracted by a fluid conduits auto extracting + I:fluidConduitExtractRate=50 + + # Number of millibuckets per tick that can pass through a single connection to a fluid conduit. + I:fluidConduitMaxIoRate=200 + + # Amount of gas per tick extracted by gas conduits auto extracting + I:gasConduitExtractRate=200 + + # Amount of gas per tick that can pass through a single connection to a gas conduit. + I:gasConduitMaxIoRate=800 + + # If true, 'line of sight' distance rather than conduit path distance is used to calculate priorities. + B:itemConduitUsePhyscialDistance=false + + # The cost in RF of transporting a bucket of fluid via a Dimensional Transceiver. + I:transceiverBucketTransmissionCostRF=100 + + # When true: correct lighting is recalculated (client side) for conduit bundles when transitioning to from being hidden behind a facade. This produces better quality rendering but can result in frame stutters when switching to/from a wrench. + B:updateLightingWhenHidingFacades=false + + # The range of the vacuum chest + I:vacumChestRange=6 + + # The range of the wireless charger + I:wirelessChargerRange=24 +} + + +enchantments { + # If false the soul bound enchantment will not be available [default: true] + B:enchantmentSoulBoundEnabled=true + + # The id of the enchantment. If set to -1 the lowest unassigned id will be used. + I:enchantmentSoulBoundId=-1 + + # The chance of getting this enchantment in the enchantment table + I:enchantmentSoulBoundWeight=1 +} + + +"farm settings" { + # Disable the notification text above the farm block. + B:disableFarmNotifications=false + + # The amount of power used by a farm per action (eg plant, till, harvest) + I:farmActionEnergyUseRF=500 + + # The amount of power used by a farm per wood block 'chopped' + I:farmAxeActionEnergyUseRF=1000 + + # Should axes in a farm take damage when breaking leaves? + B:farmAxeDamageOnLeafBreak=false + + # The amount of power used by a farm per bone meal used + I:farmBonemealActionEnergyUseRF=160 + + # The amount of power used by a farm per bone meal try + I:farmBonemealTryEnergyUseRF=80 + + # The extra number of blocks a farm will extend from its center per upgrade + I:farmBonusSize=2 + + # The amount of power used by a farm per tick + I:farmContinuousEnergyUseRF=40 + + # The number of blocks a farm will extend from its center + I:farmDefaultSize=3 + + # This setting controls whether essence berry bushes from TiC can be harvested by the farm. + B:farmEssenceBerriesEnabled=true + + # If this is enabled the farm will harvest jungle wood even if it has cocoa beans in its inventory. + B:farmHarvestJungleWhenCocoa=false + + # Use this to specify items that can be hoes in the farming station. Use the registry name (eg. modid:name). + S:farmHoes < + minecraft:wooden_hoe + minecraft:stone_hoe + minecraft:iron_hoe + minecraft:diamond_hoe + minecraft:golden_hoe + MekanismTools:ObsidianHoe + MekanismTools:LapisLazuliHoe + MekanismTools:OsmiumHoe + MekanismTools:BronzeHoe + MekanismTools:GlowstoneHoe + MekanismTools:SteelHoe + Steamcraft:hoeBrass + Steamcraft:hoeGildedGold + Railcraft:tool.steel.hoe + TConstruct:mattock + appliedenergistics2:item.ToolCertusQuartzHoe + appliedenergistics2:item.ToolNetherQuartzHoe + ProjRed|Exploration:projectred.exploration.hoeruby + ProjRed|Exploration:projectred.exploration.hoesapphire + ProjRed|Exploration:projectred.exploration.hoeperidot + magicalcrops:magicalcrops_AccioHoe + magicalcrops:magicalcrops_CrucioHoe + magicalcrops:magicalcrops_ImperioHoe + magicalcrops:magicalcropsarmor_AccioHoe + magicalcrops:magicalcropsarmor_CrucioHoe + magicalcrops:magicalcropsarmor_ImperioHoe + BiomesOPlenty:hoeAmethyst + BiomesOPlenty:hoeMud + Eln:Eln.Copper Hoe + Thaumcraft:ItemHoeThaumium + Thaumcraft:ItemHoeElemental + Thaumcraft:ItemHoeVoid + ThermalFoundation:tool.hoeInvar + ThermalFoundation:tool.hoeCopper + ThermalFoundation:tool.hoeBronze + ThermalFoundation:tool.hoeSilver + ThermalFoundation:tool.hoeElectrum + ThermalFoundation:tool.hoeTin + ThermalFoundation:tool.hoeLead + ThermalFoundation:tool.hoeNickel + ThermalFoundation:tool.hoePlatinum + TwilightForest:item.steeleafHoe + TwilightForest:item.ironwoodHoe + IC2:itemToolBronzeHoe + > + + # This setting controls whether mana beans from Thaumcraft can be harvested by the farm. + B:farmManaBeansEnabled=false + + # The amount of saplings the farm has to have in reserve to switch to shearing all leaves. If there are less saplings in store, it will only shear part the leaves and break the others for spalings. Set this to 0 to always shear all leaves. + I:farmSaplingReserveAmount=8 + + # The chance that a tool in the farm will take damage. + D:farmToolTakeDamageChance=1.0 +} + + +"fluid settings" { + # The delay in ticks between when nutrient distillation boosts your food value. + D:nutrientFluidFoodBoostDelay=400.0 +} + + +inventorypanel { + # Internal power used per item extracted (not a stack of items) [range: 0.0 ~ 10.0, default: 12.0] + S:extractCostPerItem=12.0 + + # Internal power used per extract operation (independent of stack size) [range: 0.0 ~ 10000.0, default: 32.0] + S:extractCostPerOperation=32.0 + + # If true, the inv panel will not accept fluids and will be active permanently. [default: false] + B:inventoryPanelFree=false + + # Internal power generated per mB. The default of 800/mB matches the RF generation of the Zombie generator. A panel tries to refill only once every second - setting this value too low slows down the scanning speed. [range: 1.0 ~ 10000.0, default: 800.0] + S:powerPerMB=800.0 + + # Internal power used for scanning a slot [range: 0.0 ~ 10.0, default: 0.1] + S:scanCostPerSlot=0.1 +} + + +"item enabling" { + # Allows ME conduits. Only has an effect with AE2 installed. [default: true] + B:enableMEConduits=true + + # Allows OC conduits. Only has an effect with OpenComputers installed. [default: true] + B:enableOCConduits=true + + # Use the animated texture for OC conduits. [default: true] + B:enableOCConduitsAnimatedTexture=true + + # If true, gas conduits will be enabled if the Mekanism Gas API is found. False to forcibly disable. [default: true] + B:gasConduitEnabled=true + + # Deprecated option. Use boolean "gasConduitsEnabled" below. [default: auto] + S:isGasConduitEnabled=auto + + # If set to false: Photovoltaic Cells will not be craftable. + B:photovoltaicCellEnabled=true + + # When set to false reinforced obsidian is not craftable. + B:reinforcedObsidianEnabled=true + + # If set to false reservoirs will not be craftable. + B:reservoirEnabled=true + + # If set to false: Dimensional Transceivers will not be craftable. + B:transceiverEnabled=true + + # When set to false: the travel anchor will not be craftable. + B:travelAnchorEnabled=true + + # If travelStaffBlinkThroughSolidBlocksEnabled is set to false and this is true: the travel staff can only be used to blink through transparent or partial blocks (e.g. torches). If both are false: only air blocks may be teleported through. + B:travelStaffBlinkThroughClearBlocksEnabled=true + + # Allows the travel staff to blink through unbreakable blocks such as warded blocks and bedrock. + B:travelStaffBlinkThroughUnbreakableBlocksEnabled=false +} + + +"killer joe settings" { + # The reach of attacks above and bellow Joe. + D:killerJoeAttackHeight=2.0 + + # The reach of attacks in front of Joe. + D:killerJoeAttackLength=4.0 + + # The reach of attacks to each side of Joe. + D:killerJoeAttackWidth=2.0 + + # The distance from which XP will be gathered to each side of Joe. + D:killerJoeHooverXpLength=10.0 + + # The distance from which XP will be gathered in front of Joe. + D:killerJoeHooverXpWidth=5.0 + + # Set whether the Killer Joe can attack through blocks. + B:killerJoeMustSee=false + + # The number of millibuckets of nutrient fluid used per attack. + I:killerJoeNutrientUsePerAttackMb=5 + + # Set whether the Killer Joe swings even if PvP is off (that swing will do nothing unless killerPvPoffIsIgnored is enabled). + B:killerPvPoffDisablesSwing=false + + # Set whether the Killer Joe ignores PvP settings and always hits players (killerPvPoffDisablesSwing must be off for this to work). + B:killerPvPoffIsIgnored=false +} + + +"loot config" { + # Adds Darksteel Ingots to loot tables [default: true] + B:lootDarkSteel=true + + # Adds Darksteel Boots to loot tables [default: true] + B:lootDarkSteelBoots=true + + # Adds Electric Steel Ingots to loot tables [default: true] + B:lootElectricSteel=true + + # Adds ender pearls to loot tables [default: true] + B:lootEnderPearl=true + + # Adds ItemConduitProbe to loot tables [default: true] + B:lootItemConduitProbe=true + + # Adds nether wart to loot tables [default: true] + B:lootNetherWart=true + + # Adds Phased Gold Ingots to loot tables [default: true] + B:lootPhasedGold=true + + # Adds Phased Iron Ingots to loot tables [default: true] + B:lootPhasedIron=true + + # Adds quartz to loot tables [default: true] + B:lootQuartz=true + + # Adds Redstone Alloy Ingots to loot tables [default: true] + B:lootRedstoneAlloy=true + + # Adds The Ender to loot tables [default: true] + B:lootTheEnder=true + + # Adds Travel Staff to loot tables [default: true] + B:lootTravelStaff=true +} + + +"magnet settings" { + # If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on) + B:magnetAllowDeactivatedInBaublesSlot=false + + # If true the magnet can be put into the 'amulet' Baubles slot (requires Baubles to be installed) + B:magnetAllowInBaublesSlot=true + + # If true the magnet will also work in the main inventory, not just the hotbar + B:magnetAllowInMainInventory=false + + # If true the magnet can be used as a battery. + B:magnetAllowPowerExtraction=false + + # The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on) + S:magnetBaublesType=AMULET + + # These items will not be picked up by the magnet. [default: [appliedenergistics2:item.ItemCrystalSeed], [Botania:livingrock], [Botania:manaTablet]] + S:magnetBlacklist < + appliedenergistics2:item.ItemCrystalSeed + Botania:livingrock + Botania:manaTablet + > + + # Maximum number of items the magnet can effect at a time. (-1 for unlimited) + I:magnetMaxItems=20 + + # Amount of RF power stored in a fully charged magnet + I:magnetPowerCapacityRF=100000 + + # The amount of RF power used per tick when the magnet is active + I:magnetPowerUsePerTickRF=1 + + # Range of the magnet in blocks. + I:magnetRange=5 +} + + +misc { + # Allows machines to run faster if another mod speeds up the tickrate. Running at higher tickrates is unsupported. Disable this if you run into any kind of problem. + B:allowExternalTickSpeedup=true + + # If true, quite clear glass will connect textures with fused quartz. [default: false] + B:clearGlassConnectToFusedQuartz=false + + # If true, quite clear glass will use the fused quartz border texture for the block instead of the white border. [default: false] + B:clearGlassSameTexture=false + + # Enables emptying vanilla water bottles without breaking the bottle. In combination with a water source block this allows duping of water without cost. + B:enableWaterFromBottles=true + + # Maximum level of XP the killer joe can contain. + I:killerJoeMaxXpLevel=2147483647 + + # Separates wither and normal skeletons into different entities, enables the powered spawner to treat them differently [EXPERIMENTAL - MAY CAUSE ISSUES WITH OTHER MODS] + B:replaceWitherSkeletons=true + + # Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds) - this should match with OpenBlocks when installed [default: xpjuice] + S:xpJuiceName=xpjuice + + # Maximum level of XP the xp obelisk can contain. + I:xpObeliskMaxXpLevel=2147483647 +} + + +"mob attractor settings" { + # The RF/t power use of a levele 1 mob attractor + I:attractorPowerPerTickLevelOne=20 + + # The RF/t power use of a levele 3 mob attractor + I:attractorPowerPerTickLevelThree=80 + + # The RF/t power use of a levele 2 mob attractor + I:attractorPowerPerTickLevelTwo=40 + + # The range of the mob attractor with no upgrades + I:attractorRangeLevelOne=16 + + # The range of the mob attractor with an octadic capacitor upgrade + I:attractorRangeLevelThree=64 + + # The range of the mob attractor with a double layer capacitor upgrade + I:attractorRangeLevelTwo=32 + + # The RF/t power use of a levele 1 spawn guard + I:spawnGuardPowerPerTickLevelOne=80 + + # The RF/t power use of a levele 3 spawn guard + I:spawnGuardPowerPerTickLevelThree=800 + + # The RF/t power use of a levele 2 spawn guard + I:spawnGuardPowerPerTickLevelTwo=300 + + # The range of the spawn guard with no upgrades + I:spawnGuardRangeLevelOne=64 + + # The range of the spawn guard with an octadic capacitor upgrade + I:spawnGuardRangeLevelThree=160 + + # The range of the spawn guard with a double layer capacitor upgrade + I:spawnGuardRangeLevelTwo=96 + + # When true slimes wont be allowed to spawn at all. Only added to aid testing in super flat worlds. [default: false] + B:spawnGuardStopAllSlimesDebug=false + + # When true no squid will be spawned. [default: false] + B:spawnGuardStopAllSquidSpawning=false +} + + +"mob config" { + # When set to true a list of all registered mobs will be dumped to config/enderio/mobTypes.txt The names are in the format required by EIOs mob blacklists. [default: false] + B:dumpMobNames=false +} + + +"personal settings" { + # If true, adds durability tooltips to tools and armor + B:addDurabilityTootip=true + + # If true, the RF/t and burn time of the fuel will be displayed in all tooltips for fluid containers with fuel. + B:addFuelTooltipsToAllFluidContainers=true + + # If true, adds burn duration tooltips to furnace fuels + B:addFurnaceFuelTootip=true + + # If false: you will not be able to access a ME access or crafting terminal using the Ender IO. + B:enderIoMeAccessEnabled=true + + # Volume of machine sounds. + D:machineSoundVolume=1.0 + + # The chance per level of Beheading that a skull will be dropped when using a TiC weapon + D:ticBeheadingSkullModifier=0.07500000298023224 + + # If true, machines will make sounds. + B:useMachineSounds=true + + # If true, shift-mouse wheel will change the conduit display mode when the YetaWrench is equipped. + B:useSneakMouseWheelYetaWrench=true + + # If true, shift-clicking the YetaWrench on a null or non wrenchable object will change the conduit display mode. + B:useSneakRightClickYetaWrench=false + + # The chance per looting level that a skull will be dropped when using a non-dark steel sword (0 = no chance, 1 = 100% chance) + D:vanillaSwordSkullLootingModifier=0.05000000074505806 + + # What kind of overlay to use when holding the yeta wrench + # + # 0 - Sideways scrolling in ceter of screen + # 1 - Vertical icon bar in bottom right + # 2 - Old-style group of icons in bottom right [range: 0 ~ 2, default: 0] + I:yetaWrenchOverlayMode=0 +} + + +"power settings" { + # The maximum IO for a single capacitor in RF/t + I:capacitorBankMaxIoRF=5000 + + # The maximum storage for a single capacitor in RF + I:capacitorBankMaxStorageRF=5000000 + + # The maximum IO for a single tier one capacitor in RF/t + I:capacitorBankTierOneMaxIoRF=1000 + + # The maximum storage for a single tier one capacitor in RF + I:capacitorBankTierOneMaxStorageRF=1000000 + + # The maximum IO for a single tier three capacitor in RF/t + I:capacitorBankTierThreeMaxIoRF=25000 + + # The maximum storage for a single tier three capacitor in RF + I:capacitorBankTierThreeMaxStorageRF=25000000 + + # The maximum IO for a single tier two capacitor in RF/t + I:capacitorBankTierTwoMaxIoRF=5000 + + # The maximum storage for a single tier two capacitor in RF + I:capacitorBankTierTwoMaxStorageRF=5000000 + + # The amount of power generated per BC engine cycle. Examples: BC Oil = 30, BC Fuel = 60 + I:fireWaterPowerPerCycleRF=80 + + # The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000 + I:fireWaterPowerTotalBurnTime=15000 + + # The amount of power generated per BC engine cycle. Examples: BC Oil = 30, BC Fuel = 60 + I:hootchPowerPerCycleRF=60 + + # The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000 + I:hootchPowerTotalBurnTime=6000 + + # Maximum output in RF/t of the Advanced Photovoltaic Panels. + I:maxPhotovoltaicAdvancedOutputRF=40 + + # Maximum output in RF/t of the Photovoltaic Panels. + I:maxPhotovoltaicOutputRF=10 + + # The total amount of RF required to paint one block + I:painterEnergyPerTaskRF=2000 + + # If set to false power conduits of different tiers cannot be connected. in this case a block such as a cap. bank is needed to bridge different tiered networks [default: false] + B:powerConduitCanDifferentTiersConnect=false + + # When set to true power conduits will output MJ if RF is not supported [default: true] + B:powerConduitOutputMJ=true + + # The maximum IO for the tier 1 power conduit + I:powerConduitTierOneRF=640 + + # The maximum IO for the tier 3 power conduit + I:powerConduitTierThreeRF=20480 + + # The maximum IO for the tier 2 power conduit + I:powerConduitTierTwoRF=5120 + + # The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6 + I:rocketFuelPowerPerCycleRF=160 + + # The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000 + I:rocketFuelPowerTotalBurnTime=7000 + + # The number of RF/t consumed by an unupgraded Slice'N'Splice + I:sliceAndSpliceLevelOnePowerPerTickRF=80 + + # The number of RF/t consumed by a Slice'N'Splice with an octadic capacitor upgrade. + I:sliceAndSpliceLevelThreePowerPerTickRF=320 + + # The number of RF/t consumed by a Slice'N'Splice with a double layer capacitor upgrade. + I:sliceAndSpliceLevelTwoPowerPerTickRF=160 + + # The amount of power generated per tick. + I:stirlingGeneratorBaseRfPerTick=20 + + # Burn time multiplier for the Stirling Generator, Tier 1 machine + D:stirlingGeneratorBurnTimeMultiplierT1=0.5 + + # Burn time multiplier for the Stirling Generator, Tier 2 machine + D:stirlingGeneratorBurnTimeMultiplierT2=0.6666666865348816 + + # Burn time multiplier for the Stirling Generator, Tier 3 machine + D:stirlingGeneratorBurnTimeMultiplierT3=0.6666666865348816 + + # Energy multiplier for the Stirling Generator, Tier 1 machine + D:stirlingGeneratorEnergyMultiplierT1=1.0 + + # Energy multiplier for the Stirling Generator, Tier 2 machine + D:stirlingGeneratorEnergyMultiplierT2=2.0 + + # Energy multiplier for the Stirling Generator, Tier 3 machine + D:stirlingGeneratorEnergyMultiplierT3=4.0 + + # Amount of energy lost when transfered by Dimensional Transceiver; 0 is no loss, 1 is 100% loss + D:transceiverEnergyLoss=0.1 + + # Maximum RF/t sent and received by a Dimensional Transceiver per tick. Input and output limits are not cumulative + I:transceiverMaxIoRF=20480 + + # Number of RF/t required to keep a Dimensional Transceiver connection open + I:transceiverUpkeepCostRF=10 + + # Power use (RF/t) used by the vat. + I:vatPowerUserPerTickRF=20 + + # The amount of power generated per tick. + I:zombieGeneratorRfPerTick=80 + + # The number of ticks one bucket of fuel lasts. + I:zombieGeneratorTicksPerMbFuel=10000 +} + + +"poweredspawner settings" { + # The chance a broken spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance + D:brokenSpawnerDropChance=1.0 + + # When a spawner is broken with these tools they will not drop a broken spawner [default: [RotaryCraft:rotarycraft_item_bedpick]] + S:brokenSpawnerToolBlacklist < + RotaryCraft:rotarycraft_item_bedpick + > + + # The number of levels it costs to add a broken spawner + I:powerSpawnerAddSpawnerCost=30 + + # Number of seconds in which spawned entities are protected from despawning + I:poweredSpawnerDespawnTimeSeconds=120 + + # RF per tick for a level 1 (non-upgraded) spawner. See PoweredSpanerConfig_Core.json for mob type multipliers + I:poweredSpawnerLevelOnePowerPerTickRF=160 + + # RF per tick for a level 3 spawner + I:poweredSpawnerLevelThreePowerPerTickRF=1500 + + # RF per tick for a level 2 spawner + I:poweredSpawnerLevelTwoPowerPerTickRF=500 + + # Min tick delay between spawns for a non-upgraded spawner + I:poweredSpawnerMaxDelayTicks=800 + + # Max number of entities in the nearby area until no more are spawned. A zero value will remove this check + I:poweredSpawnerMaxNearbyEntities=6 + + # Max distance of the closest player for the spawner to be active. A zero value will remove the player check + I:poweredSpawnerMaxPlayerDistance=0 + + # Number of tries to find a suitable spawning location + I:poweredSpawnerMaxSpawnTries=3 + + # Min tick delay between spawns for a non-upgraded spawner + I:poweredSpawnerMinDelayTicks=200 + + # Number of entities to spawn each time + I:poweredSpawnerSpawnCount=4 + + # Spawning range in X/Z + I:poweredSpawnerSpawnRange=4 + + # If true, regular spawn checks such as lighting level and dimension will be made before spawning mobs + B:poweredSpawnerUseVanillaSpawChecks=false +} + + +rail { + # When set to true the RF cost of sending a cart within the same dimension will be capped to the cross dimension cost [default: true] + B:enderRailCapSameDimensionPowerAtCrossDimensionCost=true + + # Whether Ender Rails are enabled [default: true] + B:enderRailEnabled=true + + # The amount of power required to transport a cart across dimensions + I:enderRailPowerRequireCrossDimensions=10000 + + # The amount of power required to teleport a cart per block in the same dimension + I:enderRailPowerRequiredPerBlock=10 + + # If true player in minecarts will be teleported. WARN: WIP, seems to cause a memory leak. [default: false] + B:enderRailTeleportPlayers=false + + # The number of ticks to wait for the track to clear before force spawning the next cart in a (RailCraft) linked set + I:enderRailTicksBeforeForceSpawningLinkedCarts=60 +} + + +"recipe settings" { + # When enabled peaceful recipes are added for soulbinder based crafting components. + B:addPeacefulRecipes=false + + # When enabled blocks with tile entities (e.g. machines) can be used as paint targets. + B:allowTileEntitiesAsPaintSource=true + + # Automatically create alloy smelter recipes with double and triple inputs and different slot allocations (1+1+1, 2+1, 1+2, 3 and 2) for single-input recipes. + B:crateSyntheticRecipes=true + + # Base level cost added to all recipes in the enchanter. + I:enchanterBaseLevelCost=4 + + # The number of conduits crafted per recipe. + I:numConduitsPerRecipe=8 + + # When set to true four dark steel blocks are required instead of ingots when making reinforced obsidian. + B:reinforcedObsidianUseDarkSteelBlocks=false + + # When true the Soul Binder requires an Enderman Skull to craft [default: true] + B:soulBinderRequiresEndermanSkull=true + + # When enabled the dim trans. will use a cheaper recipe + B:transceiverUseEasyRecipe=false + + # Create conduit binder in crafting table instead of furnace + B:useAlternateBinderRecipe=false + + # When enabled machines cost significantly more. + B:useHardRecipes=false + + # If true copper and tin will be used in recipes when registered in the ore dictionary + B:useModMetals=true + + # When enabled machine chassis will require steel instead of iron. + B:useSteelInChassi=false +} + + +"soul binder settings" { + # The number of levels required to create an attractor crystal. + I:soulBinderAttractorCystalLevels=10 + + # The number of RF required to create an attractor crystal. + I:soulBinderAttractorCystalRF=100000 + + # The number of levels required to change the type of a broken spawner. + I:soulBinderBrokenSpawnerLevels=15 + + # The number of RF required to change the type of a broken spawner. + I:soulBinderBrokenSpawnerRF=2500000 + + # The number of levels required to create an ender crystal. + I:soulBinderEnderCystalLevels=10 + + # The number of RF required to create an ender crystal. + I:soulBinderEnderCystalRF=100000 + + # The number of levels required to create an ender rail. + I:soulBinderEnderRailLevels=10 + + # The number of RF required to create an ender rail. + I:soulBinderEnderRailRF=100000 + + # The number of RF/t consumed by an unupgraded soul binder. + I:soulBinderLevelOnePowerPerTickRF=500 + + # The number of RF/t consumed by a soul binder with an octadic capacitor upgrade. + I:soulBinderLevelThreePowerPerTickRF=2000 + + # The number of RF/t consumed by a soul binder with a double layer capacitor upgrade. + I:soulBinderLevelTwoPowerPerTickRF=1000 + + # Maximum level of XP the soul binder can contain. + I:soulBinderMaxXPLevel=40 + + # The number of levels required to re-animate a mob head. + I:soulBinderReanimationLevels=10 + + # The number of RF required to to re-animated a mob head. + I:soulBinderReanimationRF=100000 + + # Entities listed here will can not be captured in a Soul Vial [default: ] + S:soulVesselBlackList < + > + + # When set to false, any mob with a 'boss bar' won't be able to be captured in the Soul Vial [default: false] + B:soulVesselCapturesBosses=false +} + + +"staff settings" { + # Set the max zoomed size of a travel anchor as an aprox. percentage of screen height [range: 0.0 ~ 1.0, default: 0.2] + S:travelAnchorZoomScale=0.2 + + # Lists the blocks that cannot be teleported through in the form 'modID:blockName' [default: [minecraft:bedrock], [Thaumcraft:blockWarded]] + S:travelStaffBlinkBlackList < + minecraft:bedrock + Thaumcraft:blockWarded + > + + # If set to false: the travel staff can not be used to shift-right click teleport, or blink. + B:travelStaffBlinkEnabled=true + + # Minimum number of ticks between 'blinks'. Values of 10 or less allow a limited sort of flight. + I:travelStaffBlinkPauseTicks=10 + + # If set to false: the travel staff can be used to blink through any block. + B:travelStaffBlinkThroughSolidBlocksEnabled=true + + # If set to false: the travel staff will not be craftable. + B:travelStaffEnabled=true + + # Max number of blocks teleported when shift clicking the staff. + I:travelStaffMaxBlinkDistance=16 + + # Maximum number of blocks that can be traveled using the Staff of Traveling. + I:travelStaffMaxDistance=128 + + # Number of RF required per block traveled using the Staff of Traveling. + D:travelStaffPowerPerBlockRF=250.0 +} + + +telepad { + # If true, the coordinates cannot be set via the GUI, the coord selector must be used. + B:lockCoords=true + + # If true, the dimension cannot be set via the GUI, the coord selector must be used. + B:lockDimension=true + + # Power for a teleport is calculated by the formula: + # power = [this value] * ln(0.005*distance + 1) + I:powerCoefficient=100000 + + # The amount of RF required for an interdimensional teleport. + I:powerInterdimensional=100000 + + # The number of RF/t consumed by a telepad. + I:telepadPowerPerTickRF=1000 + + # The amount of RF a telepad can store. + I:telepadPowerStorageRF=100000 +} + + +weather { + # The fluid required (in mB) to set the world to clear weather + I:weatherObeliskClearFluid=2000 + + # The fluid required (in mB) to set the world to rainy weather + I:weatherObeliskRainFluid=500 + + # The fluid required (in mB) to set the world to thundering weather + I:weatherObeliskThunderFluid=1000 +} + + diff --git a/config/enderio/OreDictionaryPreferences_Core.xml b/config/enderio/OreDictionaryPreferences_Core.xml new file mode 100644 index 0000000000..0bb1ac06a5 --- /dev/null +++ b/config/enderio/OreDictionaryPreferences_Core.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/enderio/OreDictionaryPreferences_User.xml b/config/enderio/OreDictionaryPreferences_User.xml new file mode 100644 index 0000000000..55ebcc2b24 --- /dev/null +++ b/config/enderio/OreDictionaryPreferences_User.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/config/enderio/PainterPaintSources_Core.xml b/config/enderio/PainterPaintSources_Core.xml new file mode 100644 index 0000000000..30d0006641 --- /dev/null +++ b/config/enderio/PainterPaintSources_Core.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + diff --git a/config/enderio/PainterPaintSources_User.xml b/config/enderio/PainterPaintSources_User.xml new file mode 100644 index 0000000000..1f6d9fbe25 --- /dev/null +++ b/config/enderio/PainterPaintSources_User.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/config/enderio/PoweredSpawnerConfig_Core.json b/config/enderio/PoweredSpawnerConfig_Core.json new file mode 100644 index 0000000000..aca7c91ab7 --- /dev/null +++ b/config/enderio/PoweredSpawnerConfig_Core.json @@ -0,0 +1,50 @@ +{ + + // This is the CORE FILE. Do not edit. The RF cost per tick for spawners of each entity type is multiplied by these values + "costMultiplier": { + + "Zombie" : "1", + "Creeper" : "1.5", + "Skeleton" : "2", + "Spider" : "1", + "CaveSpider" : "1", + "Silverfish" : "1", + "Witch" : "5", + "Slime" : "5", + "Enderman" : "10", + "SpecialMobs.SpecialEnderman" : "10", + + "LavaSlime" : "2", + "PigZombie" : "5", + "Ghast" : "10", + "Blaze" : "5", + + "SnowMan" : "1", + "VillagerGolem" : "10", + "Villager" : "1", + + "Wolf" : "1", + "Ozelot" : "1", + "EntityHorse" : "1", + "Bat" : "0.5", + + "Squid" : "0.5", + "Chicken" : "0.5", + "Sheep" : "0.5", + "Cow" : "0.5", + "Pig" : "0.5", + "MushroomCow" : "1", + + "enderzoo.Enderminy" : "10", + "enderzoo.ConcussionCreeper" : "1.5", + "enderzoo.enderzoo.FallenKnight" : "1", + "enderzoo.WitherWitch" : "3", + + "enderio.witherSkeleton" : "20" + }, + + "blackList": [ + "VillagerGolem", + "Villager" + ] +} \ No newline at end of file diff --git a/config/enderio/PoweredSpawnerConfig_User.json b/config/enderio/PoweredSpawnerConfig_User.json new file mode 100644 index 0000000000..fd24249287 --- /dev/null +++ b/config/enderio/PoweredSpawnerConfig_User.json @@ -0,0 +1,9 @@ +{ + + // New entities are added, one already in _Core will have their values replaced with those in this file + "costMultiplier": { + } + + // Adding a blackList section will completely replace the one in the core file. + +} \ No newline at end of file diff --git a/config/enderio/SAGMillRecipes_Core.xml b/config/enderio/SAGMillRecipes_Core.xml new file mode 100644 index 0000000000..aa09ecee41 --- /dev/null +++ b/config/enderio/SAGMillRecipes_Core.xml @@ -0,0 +1,2982 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/enderio/SAGMillRecipes_User.xml b/config/enderio/SAGMillRecipes_User.xml new file mode 100644 index 0000000000..44ae7ad95b --- /dev/null +++ b/config/enderio/SAGMillRecipes_User.xml @@ -0,0 +1,101 @@ + + + + + diff --git a/config/enderio/SliceAndSpliceRecipes_Core.xml b/config/enderio/SliceAndSpliceRecipes_Core.xml new file mode 100644 index 0000000000..a6995e5b41 --- /dev/null +++ b/config/enderio/SliceAndSpliceRecipes_Core.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/enderio/SliceAndSpliceRecipes_User.xml b/config/enderio/SliceAndSpliceRecipes_User.xml new file mode 100644 index 0000000000..baed1110bc --- /dev/null +++ b/config/enderio/SliceAndSpliceRecipes_User.xml @@ -0,0 +1,3 @@ + + + diff --git a/config/enderio/VatRecipes_Core.xml b/config/enderio/VatRecipes_Core.xml new file mode 100644 index 0000000000..266fb8b138 --- /dev/null +++ b/config/enderio/VatRecipes_Core.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/enderio/VatRecipes_User.xml b/config/enderio/VatRecipes_User.xml new file mode 100644 index 0000000000..b3f3bc4611 --- /dev/null +++ b/config/enderio/VatRecipes_User.xml @@ -0,0 +1,3 @@ + + + diff --git a/config/splash.properties b/config/splash.properties index 2eb0cd4034..6ae82a8b9c 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Wed Oct 09 02:31:39 CEST 2019 +#Thu Oct 10 04:06:42 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/logs/2019-10-09-1.log.gz b/logs/2019-10-09-1.log.gz index e0df02e6e3..2fa689065d 100644 Binary files a/logs/2019-10-09-1.log.gz and b/logs/2019-10-09-1.log.gz differ diff --git a/logs/2019-10-09-2.log.gz b/logs/2019-10-09-2.log.gz new file mode 100644 index 0000000000..36eee8ffa7 Binary files /dev/null and b/logs/2019-10-09-2.log.gz differ diff --git a/logs/2019-10-09-3.log.gz b/logs/2019-10-09-3.log.gz new file mode 100644 index 0000000000..27a3212817 Binary files /dev/null and b/logs/2019-10-09-3.log.gz differ diff --git a/logs/2019-10-09-4.log.gz b/logs/2019-10-09-4.log.gz new file mode 100644 index 0000000000..846a92b304 Binary files /dev/null and b/logs/2019-10-09-4.log.gz differ diff --git a/logs/2019-10-09-5.log.gz b/logs/2019-10-09-5.log.gz new file mode 100644 index 0000000000..8304733e88 Binary files /dev/null and b/logs/2019-10-09-5.log.gz differ diff --git a/logs/2019-10-09-6.log.gz b/logs/2019-10-09-6.log.gz new file mode 100644 index 0000000000..29ffdfed00 Binary files /dev/null and b/logs/2019-10-09-6.log.gz differ diff --git a/logs/2019-10-09-7.log.gz b/logs/2019-10-09-7.log.gz new file mode 100644 index 0000000000..52f02f707c Binary files /dev/null and b/logs/2019-10-09-7.log.gz differ diff --git a/logs/2019-10-10-1.log.gz b/logs/2019-10-10-1.log.gz new file mode 100644 index 0000000000..20fc48d4d1 Binary files /dev/null and b/logs/2019-10-10-1.log.gz differ diff --git a/logs/2019-10-10-2.log.gz b/logs/2019-10-10-2.log.gz new file mode 100644 index 0000000000..2a08b897e3 Binary files /dev/null and b/logs/2019-10-10-2.log.gz differ diff --git a/logs/2019-10-10-3.log.gz b/logs/2019-10-10-3.log.gz new file mode 100644 index 0000000000..f052dca82b Binary files /dev/null and b/logs/2019-10-10-3.log.gz differ diff --git a/logs/2019-10-10-4.log.gz b/logs/2019-10-10-4.log.gz new file mode 100644 index 0000000000..186a7ffa19 Binary files /dev/null and b/logs/2019-10-10-4.log.gz differ diff --git a/logs/2019-10-10-5.log.gz b/logs/2019-10-10-5.log.gz new file mode 100644 index 0000000000..7e49490bcd Binary files /dev/null and b/logs/2019-10-10-5.log.gz differ diff --git a/logs/2019-10-10-6.log.gz b/logs/2019-10-10-6.log.gz new file mode 100644 index 0000000000..7803858251 Binary files /dev/null and b/logs/2019-10-10-6.log.gz differ diff --git a/mods/EnderCore-1.7.10-0.2.0.39_beta.jar b/mods/EnderCore-1.7.10-0.2.0.39_beta.jar new file mode 100644 index 0000000000..1fdf703497 Binary files /dev/null and b/mods/EnderCore-1.7.10-0.2.0.39_beta.jar differ diff --git a/mods/EnderIO-1.7.10-2.3.0.432_beta.jar b/mods/EnderIO-1.7.10-2.3.0.432_beta.jar new file mode 100644 index 0000000000..80711b5846 Binary files /dev/null and b/mods/EnderIO-1.7.10-2.3.0.432_beta.jar differ diff --git a/saves/NEI/local/New World/NEI.dat b/saves/NEI/local/New World/NEI.dat index 74f929fd42..4796f879bf 100644 Binary files a/saves/NEI/local/New World/NEI.dat and b/saves/NEI/local/New World/NEI.dat differ diff --git a/saves/New World/DIM-1/data/villages.dat b/saves/New World/DIM-1/data/villages.dat index bbfef5a15b..c8bc45545a 100644 Binary files a/saves/New World/DIM-1/data/villages.dat and b/saves/New World/DIM-1/data/villages.dat differ diff --git a/saves/New World/DIM1/data/villages.dat b/saves/New World/DIM1/data/villages.dat index bbfef5a15b..c8bc45545a 100644 Binary files a/saves/New World/DIM1/data/villages.dat and b/saves/New World/DIM1/data/villages.dat differ diff --git a/saves/New World/data/villages.dat b/saves/New World/data/villages.dat index bbfef5a15b..c8bc45545a 100644 Binary files a/saves/New World/data/villages.dat and b/saves/New World/data/villages.dat differ diff --git a/saves/New World/level.dat b/saves/New World/level.dat index 8e4ac4e060..c74cfce812 100644 Binary files a/saves/New World/level.dat and b/saves/New World/level.dat differ diff --git a/saves/New World/level.dat_old b/saves/New World/level.dat_old index ddc26c0537..5c1066d134 100644 Binary files a/saves/New World/level.dat_old and b/saves/New World/level.dat_old differ diff --git a/saves/New World/region/r.0.0.mca b/saves/New World/region/r.0.0.mca index 2550b88006..92e6e9c5de 100644 Binary files a/saves/New World/region/r.0.0.mca and b/saves/New World/region/r.0.0.mca differ diff --git a/saves/New World/session.lock b/saves/New World/session.lock index 6ffc6e410a..265bc7f667 100644 Binary files a/saves/New World/session.lock and b/saves/New World/session.lock differ diff --git a/src/main/java/blocks/Block_TFFTMultiHatch.java b/src/main/java/blocks/Block_TFFTMultiHatch.java new file mode 100644 index 0000000000..afd5f6f03e --- /dev/null +++ b/src/main/java/blocks/Block_TFFTMultiHatch.java @@ -0,0 +1,39 @@ +package blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import tileentities.TE_TFFTMultiHatch; + +public class Block_TFFTMultiHatch extends BlockContainer { + + private static Block_TFFTMultiHatch instance = new Block_TFFTMultiHatch(); + + private Block_TFFTMultiHatch() { + super(Material.iron); + } + + public static Block_TFFTMultiHatch getInstance() { + return instance; + } + + public void registerBlock() { + final String blockName = "kekztech_tfftmultihatch_block"; + super.setBlockName(blockName); + super.setCreativeTab(CreativeTabs.tabMisc); + super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTMultiHatch"); + super.setHardness(5.0f); + super.setResistance(6.0f); + GameRegistry.registerBlock(getInstance(), blockName); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TE_TFFTMultiHatch(); + } + +} diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 5eb2916e02..33ad34d015 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -2,6 +2,7 @@ package kekztech; import blocks.Block_GDCUnit; import blocks.Block_TFFTCasing; +import blocks.Block_TFFTMultiHatch; import blocks.Block_TFFTStorageFieldBlockT1; import blocks.Block_TFFTStorageFieldBlockT2; import blocks.Block_TFFTStorageFieldBlockT3; @@ -11,6 +12,7 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -27,6 +29,7 @@ import tileentities.GTMTE_FluidMultiStorage; import tileentities.GTMTE_ModularNuclearReactor; import tileentities.GTMTE_SOFuelCellMK1; import tileentities.GTMTE_SOFuelCellMK2; +import tileentities.TE_TFFTMultiHatch; import util.Util; @Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION, @@ -61,6 +64,9 @@ public class KekzCore { Block_TFFTStorageFieldBlockT2.getInstance().registerBlock(); Block_TFFTStorageFieldBlockT3.getInstance().registerBlock(); Block_TFFTStorageFieldBlockT4.getInstance().registerBlock(); + + Block_TFFTMultiHatch.getInstance().registerBlock(); + GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); } @Mod.EventHandler diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java index 9b4d8b1bc4..2565ede1dc 100644 --- a/src/main/java/kekztech/MultiFluidHandler.java +++ b/src/main/java/kekztech/MultiFluidHandler.java @@ -9,11 +9,13 @@ import net.minecraftforge.fluids.FluidStack; public class MultiFluidHandler { - private static final int MAX_DISTINCT_FLUIDS = 25; + public static final int MAX_DISTINCT_FLUIDS = 25; - private final List fluids = new ArrayList<>(); + private final List fluids = new ArrayList<>(MAX_DISTINCT_FLUIDS); private final int capacityPerFluid; + private boolean locked = true; + public MultiFluidHandler(int capacityPerFluid) { this.capacityPerFluid = capacityPerFluid; } @@ -23,8 +25,18 @@ public class MultiFluidHandler { this.fluids.addAll(fluids); } + /** + * Lock internal tanks in case T.F.F.T is not running. + * + * @param state + * Lock state. + */ + public void setLock(boolean state) { + locked = state; + } + public boolean contains(FluidStack fluid) { - return fluids.contains(fluid); + return !locked && fluids.contains(fluid); } public int getCapacity() { @@ -32,11 +44,12 @@ public class MultiFluidHandler { } public List getFluids(){ - return fluids; + return (!locked) ? fluids : new ArrayList(); } public FluidStack getFluid(int slot) { - return fluids.get(slot); + return (!locked && fluids.size() > 0 && slot >= 0 && slot < MAX_DISTINCT_FLUIDS) + ? fluids.get(slot) : null; } public NBTTagCompound getAsNBTTag(NBTTagCompound nbt) { @@ -49,35 +62,67 @@ public class MultiFluidHandler { } public ArrayList getInfoData() { - final ArrayList lines = new ArrayList<>(fluids.size() + 1); + final ArrayList lines = new ArrayList<>(fluids.size()); lines.add(EnumChatFormatting.YELLOW + "Stored Fluids:" + EnumChatFormatting.RESET); for(int i = 0; i < fluids.size(); i++) { lines.add(i + " - " + fluids.get(i).getLocalizedName() + ": " + fluids.get(i).amount + "L (" + (Math.round(100.0f * fluids.get(i).amount / getCapacity())) + "%)"); } - lines.add(EnumChatFormatting.YELLOW + "Operational Data:" + EnumChatFormatting.RESET); return lines; } - public int pushFluid(FluidStack push) { + /** + * Fill fluid into a tank. + * + * @param push + * Fluid type and quantity to be inserted. + * @param doPush + * If false, fill will only be simulated. + * @return Amount of fluid that was (or would have been, if simulated) filled. + */ + public int pushFluid(FluidStack push, boolean doPush) { + if(locked) { + return 0; + } if(fluids.size() == MAX_DISTINCT_FLUIDS && !contains(push)) { return 0; } else if (fluids.size() < MAX_DISTINCT_FLUIDS && !contains(push)) { - final int fit = Math.min(getCapacity(), push.amount); - fluids.add(new FluidStack(push.getFluid(), fit)); + // Add new fluid + final int remcap = getCapacity(); + final int fit = Math.min(remcap, push.amount); + if(doPush) { + fluids.add(new FluidStack(push.getFluid(), fit)); + } return fit; } else { + // Add to existing fluid final FluidStack fs = fluids.get(fluids.indexOf(push)); final int remcap = getCapacity() - fs.amount; final int fit = Math.min(remcap, push.amount); - fs.amount += fit; + if(doPush) { + fs.amount += fit; + } return fit; } } - public int pushFluid(FluidStack push, int slot) { + /** + * Fill fluid into the specified tank. + * + * @param push + * Fluid type and quantity to be inserted. + * @param slot + * Tank the fluid should go into. + * @param doPush + * If false, fill will only be simulated. + * @return Amount of fluid that was (or would have been, if simulated) filled. + */ + public int pushFluid(FluidStack push, int slot, boolean doPush) { + if(locked) { + return 0; + } if(slot < 0 || slot >= MAX_DISTINCT_FLUIDS) { return 0; } @@ -87,27 +132,56 @@ public class MultiFluidHandler { final FluidStack fs = fluids.get(slot); final int remcap = getCapacity() - fs.amount; final int fit = Math.min(remcap, push.amount); - fs.amount += fit; + if(doPush) { + fs.amount += fit; + } return fit; } } - public int pullFluid(FluidStack pull) { + /** + * Drains fluid out of the internal tanks. + * + * @param pull + * Fluid type and quantity to be pulled. + * @param doPull + * If false, drain will only be simulated. + * @return Amount of fluid that was (or would have been, if simulated) pulled. + */ + public int pullFluid(FluidStack pull, boolean doPull) { + if(locked) { + return 0; + } if(!contains(pull)) { return 0; } else { - final FluidStack pulled = fluids.get(fluids.indexOf(pull)); - final int rec = Math.min(pull.amount, pulled.amount); - if(pulled.amount <= rec) { - fluids.remove(pulled); - } else { - pulled.amount -= rec; + final FluidStack src = fluids.get(fluids.indexOf(pull)); + final int rec = Math.min(pull.amount, src.amount); + if(doPull) { + src.amount -= rec; + } + if(src.amount == 0) { + fluids.remove(src); } return rec; } } - public int pullFluid(FluidStack pull, int slot) { + /** + * Drains fluid out of the specified internal tank. + * + * @param pull + * Fluid type and quantity to be pulled. + * @param slot + * Tank fluid should be drained from. + * @param doPull + * If false, drain will only be simulated. + * @return Amount of fluid that was (or would have been, if simulated) pulled. + */ + public int pullFluid(FluidStack pull, int slot, boolean doPull) { + if(locked) { + return 0; + } if(slot < 0 || slot >= MAX_DISTINCT_FLUIDS) { return 0; } @@ -116,16 +190,26 @@ public class MultiFluidHandler { } else { final FluidStack pulled = fluids.get(slot); final int rec = Math.min(pull.amount, pulled.amount); - if(pulled.amount <= rec) { - fluids.remove(pulled); - } else { + if(doPull) { pulled.amount -= rec; } + if(pulled.amount == 0) { + fluids.remove(pulled); + } return rec; } } + /** + * Test whether the given fluid type and quantity can be inserted into the internal tanks. + * @param push + * Fluid type and quantity to be tested + * @return True if there is sufficient space + */ public boolean couldPush(FluidStack push) { + if(locked) { + return false; + } if(fluids.size() == MAX_DISTINCT_FLUIDS && !contains(push)) { return false; } else if (fluids.size() < MAX_DISTINCT_FLUIDS && !contains(push)) { diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java index 32d17d1cf5..051f27047d 100644 --- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java @@ -1,9 +1,10 @@ package tileentities; import java.util.ArrayList; +import java.util.HashSet; import java.util.Iterator; - import blocks.Block_TFFTCasing; +import blocks.Block_TFFTMultiHatch; import blocks.Block_TFFTStorageFieldBlockT1; import blocks.Block_TFFTStorageFieldBlockT2; import blocks.Block_TFFTStorageFieldBlockT3; @@ -39,9 +40,11 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { private final Block STORAGE_FIELD2 = Block_TFFTStorageFieldBlockT2.getInstance(); private final Block STORAGE_FIELD3 = Block_TFFTStorageFieldBlockT3.getInstance(); private final Block STORAGE_FIELD4 = Block_TFFTStorageFieldBlockT4.getInstance(); + private final Block MULTI_HATCH = Block_TFFTMultiHatch.getInstance(); private final int CASING_TEXTURE_ID = 176; private MultiFluidHandler mfh; + private HashSet multiHatches = new HashSet<>(); private int runningCost = 0; private boolean doVoidExcess = false; @@ -115,7 +118,10 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { this.mEUt = runningCost; super.mMaxProgresstime = 10; - // TODO skip all of the currently existing code in here when there are only multi hatches + // If there are no basic I/O hatches, let multi hatches handle it and skip a lot of code! + if(multiHatches.size() > 0 && super.mInputHatches.size() == 0 && super.mOutputHatches.size() == 0) { + return true; + } // Suck in fluids final ArrayList inputHatchFluids = super.getStoredFluids(); @@ -123,7 +129,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { for(FluidStack fluidStack : inputHatchFluids) { - final int pushed = mfh.pushFluid(fluidStack); + final int pushed = mfh.pushFluid(fluidStack, true); final FluidStack toDeplete = fluidStack.copy(); toDeplete.amount = pushed; super.depleteInput(toDeplete); @@ -153,11 +159,11 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { possibleOutput += outputHatch.getCapacity() - outputHatch.getFluidAmount(); } } - + System.out.println("Output Capacity: " + possibleOutput); // Output as much as possible final FluidStack tempStack = storedFluid.copy(); tempStack.amount = possibleOutput; - possibleOutput = mfh.pullFluid(tempStack, config); + tempStack.amount = mfh.pullFluid(tempStack, config, true); super.addOutput(tempStack); } else { @@ -179,7 +185,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { final FluidStack tempStack = storedFluid.copy(); tempStack.amount = possibleOutput; // TODO possible concurrent modification exception as pullFluid calls remove() without an iterator - possibleOutput = mfh.pullFluid(tempStack); + tempStack.amount = mfh.pullFluid(tempStack, true); super.addOutput(tempStack); } } @@ -187,6 +193,16 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { return true; } + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + super.onPostTick(aBaseMetaTileEntity, aTick); + + if(mfh != null) { + mfh.setLock(!super.getBaseMetaTileEntity().isActive()); + } + + } + public Vector3ic rotateOffsetVector(Vector3ic forgeDirection, int x, int y, int z) { final Vector3i offset = new Vector3i(); @@ -221,7 +237,18 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { return offset; } - + + /** + * Checks structural integrity and registers machine parts. + * Appears to often not run but can be jump started by forcing a block update on the controller. + * (Place a piece of dirt on the front face and remove it again. Dirty fix lol.) + * + * @param thisController + * Object reference to this controller block's Tile Entity. + * @param guiSlotItem + * References the item stack that can be placed in that GUI slot + * in the top right. + */ @Override public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { try { @@ -257,10 +284,19 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { && !super.addEnergyInputToMachineList(currentTE, CASING_TEXTURE_ID)) { // If it's not a hatch, is it the right casing for this machine? Check block and block meta. + // Also check for multi hatch if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) { // Seems to be valid casing. Decrement counter. minCasingAmount--; - } else { + } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == MULTI_HATCH) { + final TE_TFFTMultiHatch mh = + (TE_TFFTMultiHatch) thisController.getWorld().getTileEntity( + thisController.getXCoord() + offset.x(), + thisController.getYCoord() + offset.y(), + thisController.getZCoord() + offset.z()); + multiHatches.add(mh); + } + else { formationChecklist = false; } } @@ -326,9 +362,17 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID)) { // If it's not a hatch, is it the right casing for this machine? Check block and block meta. + // Also check for multi hatch if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) { // Seems to be valid casing. Decrement counter. minCasingAmount--; + } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == MULTI_HATCH) { + final TE_TFFTMultiHatch mh = + (TE_TFFTMultiHatch) thisController.getWorld().getTileEntity( + thisController.getXCoord() + offset.x(), + thisController.getYCoord() + offset.y(), + thisController.getZCoord() + offset.z()); + multiHatches.add(mh); } else if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameAE2) || thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameStained)) { // do nothing lol @@ -341,7 +385,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { } } - // Front slice + // Back slice for(int X = -2; X <= 2; X++) { for(int Y = -2; Y <= 2; Y++) { // Get next TE @@ -361,6 +405,13 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) { // Seems to be valid casing. Decrement counter. minCasingAmount--; + } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == MULTI_HATCH) { + final TE_TFFTMultiHatch mh = + (TE_TFFTMultiHatch) thisController.getWorld().getTileEntity( + thisController.getXCoord() + offset.x(), + thisController.getYCoord() + offset.y(), + thisController.getZCoord() + offset.z()); + multiHatches.add(mh); } else { formationChecklist = false; } @@ -407,11 +458,15 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { mfh = new MultiFluidHandler(capacityPerFluid, mfh.getFluids()); } } + for(TE_TFFTMultiHatch mh : multiHatches) { + mh.setMultiFluidHandler(mfh); + } } return formationChecklist; } catch (Exception ex) { System.err.println("CAUGHT CHECKMACHINE EXCEPTION"); + ex.printStackTrace(); } return false; } @@ -431,6 +486,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { public String[] getInfoData() { final ArrayList ll = mfh.getInfoData(); + ll.add(EnumChatFormatting.YELLOW + "Operational Data:" + EnumChatFormatting.RESET); ll.add("Auto-voiding: " + doVoidExcess); ll.add("Per-Fluid Capacity: " + mfh.getCapacity() + "L"); ll.add("Running Cost: " + (-super.mEUt) + "EU/t"); diff --git a/src/main/java/tileentities/TE_TFFTMultiHatch.java b/src/main/java/tileentities/TE_TFFTMultiHatch.java new file mode 100644 index 0000000000..94d7d9283a --- /dev/null +++ b/src/main/java/tileentities/TE_TFFTMultiHatch.java @@ -0,0 +1,120 @@ +package tileentities; + +import java.util.List; + +import kekztech.MultiFluidHandler; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler { + + private MultiFluidHandler mfh; + + public void setMultiFluidHandler(MultiFluidHandler mfh) { + this.mfh = mfh; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return (mfh != null) ? mfh.pushFluid(resource, doFill) : 0; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return (mfh != null) ? new FluidStack(resource.getFluid(), mfh.pullFluid(resource, doDrain)) : null; + } + + /** + * Drains fluid out of 0th internal tank. + * + * @param from + * Orientation the fluid is drained to. + * @param maxDrain + * Maximum amount of fluid to drain. + * @param doDrain + * If false, drain will only be simulated. + * @return FluidStack representing the Fluid and amount that was (or would have been, if + * simulated) drained. + */ + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if(mfh != null) { + final FluidStack drain = mfh.getFluid(0); + if(drain != null) { + return new FluidStack( + drain.getFluid(), + mfh.pullFluid(new FluidStack(drain.getFluid(), maxDrain), 0, doDrain) + ); + } + } + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return (mfh != null) ? mfh.couldPush(new FluidStack(fluid, 1)) : false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return (mfh != null) ? mfh.contains(new FluidStack(fluid, 1)) : false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if(mfh == null) { + return null; + } + final List fluids = mfh.getFluids(); + final FluidTankInfo[] tankInfo = new FluidTankInfo[fluids.size()]; + for(int i = 0; i < tankInfo.length; i++) { + tankInfo[i] = new FluidTankInfo(fluids.get(i), mfh.getCapacity()); + } + return tankInfo; + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + nbt = (nbt == null) ? new NBTTagCompound() : nbt; + + super.writeToNBT(nbt); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + nbt = (nbt == null) ? new NBTTagCompound() : nbt; + + super.readFromNBT(nbt); + } + + + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/src/main/java/tileentities/TFFTMultiHatch.java b/src/main/java/tileentities/TFFTMultiHatch.java deleted file mode 100644 index 2ce6f6985f..0000000000 --- a/src/main/java/tileentities/TFFTMultiHatch.java +++ /dev/null @@ -1,138 +0,0 @@ -package tileentities; - -import gregtech.api.enums.Textures.BlockIcons; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; -import kekztech.MultiFluidHandler; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -public class TFFTMultiHatch extends GT_MetaTileEntity_Hatch { - - private MultiFluidHandler multiFluidHandler; - - public TFFTMultiHatch(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 3, - new String[]{"Exclusive fluid I/O for the T.F.F.T", "Capacity: " + 8000 * (aTier + 1) + "L"}, new ITexture[0]); - } - - public TFFTMultiHatch(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, 3, aDescription, aTextures); - } - - public TFFTMultiHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, 3, aDescription, aTextures); - } - - public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE_IN)}; - } - - public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE_IN)}; - } - - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new TFFTMultiHatch(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - public boolean isSimpleMachine() { - return true; - } - - public boolean isFacingValid(byte aFacing) { - return true; - } - - public boolean isAccessAllowed(EntityPlayer aPlayer) { - return true; - } - - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - if (aBaseMetaTileEntity.isClientSide()) { - return true; - } else { - return true; - } - } - - public boolean doesFillContainers() { - return false; - } - - public boolean doesEmptyContainers() { - return false; - } - - public boolean canTankBeFilled() { - return true; - } - - public boolean canTankBeEmptied() { - return true; - } - - public boolean displaysItemStack() { - return false; - } - - public boolean displaysStackSize() { - return false; - } - - public boolean isFluidInputAllowed(FluidStack aFluid) { - return (multiFluidHandler != null) ? multiFluidHandler.couldPush(aFluid) : false; - } - - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return false; - } - - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return false; - } - - public int getCapacity() { - return (multiFluidHandler != null) ? multiFluidHandler.getCapacity() : 0; - } - - public int getTankPressure() { - return -100; - } - - public void setMultiFluidHandler(MultiFluidHandler multiFluidHandler) { - this.multiFluidHandler = multiFluidHandler; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - -} diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch.png new file mode 100644 index 0000000000..5c9b1189b6 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch.png differ diff --git a/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png new file mode 100644 index 0000000000..96e1fb32bf Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png differ -- cgit