aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-01-09 23:05:55 +0100
committerTechnus <daniel112092@gmail.com>2017-01-09 23:05:55 +0100
commit92b968f1355389423f3615ec3d6ce440ee07c517 (patch)
tree12a5ac7cbb2cd7cfa2c5182841245b001d03c151 /src/main
parent7b11e084ae29237d80c029e7355f9961e0cf66fc (diff)
parent02d872331c03d11a9b2885a283b4fdb80c59a729 (diff)
downloadGT5-Unofficial-92b968f1355389423f3615ec3d6ce440ee07c517.tar.gz
GT5-Unofficial-92b968f1355389423f3615ec3d6ce440ee07c517.tar.bz2
GT5-Unofficial-92b968f1355389423f3615ec3d6ce440ee07c517.zip
Merge branch 'experimental' into eM
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index fc4e4df8fd..05c7af0021 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -669,6 +669,7 @@ public class GT_Loader_Item_Block_And_Fluid
GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Mercury, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3));
GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Amber, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6));
GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L));
+ GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.BloodInfusedIron, GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron", 1L, 0));
new Values();