aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-07-26 00:56:21 +0200
committerGitHub <noreply@github.com>2016-07-26 00:56:21 +0200
commitbd51aba156acafbe19ffb561bf74422c246c1834 (patch)
tree5f4f2df2b5f50abd597eb4009d499ef6dba872cd /src/main/java/gregtech/loaders/preload
parent5a15ee7e4ae224c485c1ed5f126a6eb35c7c2beb (diff)
parent3bbd32136f9a5845503609a32251edc0c5653c2d (diff)
downloadGT5-Unofficial-bd51aba156acafbe19ffb561bf74422c246c1834.tar.gz
GT5-Unofficial-bd51aba156acafbe19ffb561bf74422c246c1834.tar.bz2
GT5-Unofficial-bd51aba156acafbe19ffb561bf74422c246c1834.zip
Merge pull request #576 from Muramasa-/UBCSupport
UBC Support / Ore System Restructure
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java7
1 files changed, 7 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 4944281606..f3fc20e0b1 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
@@ -1,6 +1,7 @@
package gregtech.loaders.preload;
import codechicken.nei.api.API;
+import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.GT_Mod;
@@ -135,7 +136,13 @@ public class GT_Loader_Item_Block_And_Fluid
GregTech_API.sBlockCasings4 = new GT_Block_Casings4();
GregTech_API.sBlockGranites = new GT_Block_Granites();
GregTech_API.sBlockConcretes = new GT_Block_Concretes();
+ GregTech_API.sBlockStones = new GT_Block_Stones();
GregTech_API.sBlockOres1 = new GT_Block_Ores();
+ if(Loader.isModLoaded("UndergroundBiomes")) {
+ GregTech_API.sBlockOresUb1 = new GT_Block_Ores_UB1();
+ GregTech_API.sBlockOresUb2 = new GT_Block_Ores_UB2();
+ GregTech_API.sBlockOresUb3 = new GT_Block_Ores_UB3();
+ }
GregTech_API.sBlockMetal1 = new GT_Block_Metal("gt.blockmetal1", new Materials[]{
Materials.Adamantium,
Materials.Aluminium,