diff options
| author | Technus <daniel112092@gmail.com> | 2017-01-09 23:05:55 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-01-09 23:05:55 +0100 |
| commit | 92b968f1355389423f3615ec3d6ce440ee07c517 (patch) | |
| tree | 12a5ac7cbb2cd7cfa2c5182841245b001d03c151 | |
| parent | 7b11e084ae29237d80c029e7355f9961e0cf66fc (diff) | |
| parent | 02d872331c03d11a9b2885a283b4fdb80c59a729 (diff) | |
| download | GT5-Unofficial-92b968f1355389423f3615ec3d6ce440ee07c517.tar.gz GT5-Unofficial-92b968f1355389423f3615ec3d6ce440ee07c517.tar.bz2 GT5-Unofficial-92b968f1355389423f3615ec3d6ce440ee07c517.zip | |
Merge branch 'experimental' into eM
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build.properties b/build.properties index 3a85752603..1f4b5bacdb 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.27.05 +gt.version=5.09.27.06 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 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(); |