aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorOneEyeMaker <oneeyemaker@gmail.com>2016-07-26 07:42:29 +0300
committerGitHub <noreply@github.com>2016-07-26 07:42:29 +0300
commit4c20885d144e5b2eaa7177668f71a32ecc694b9f (patch)
tree939330459ab8f5df90b9339e0fbfe90aac292c9a /src/main/java/gregtech/loaders/preload
parentbe3a6292bb02d5aef5d8fd8052b53394743b0b00 (diff)
parent3abf4381db1dd9b528ec8c0df7fbeecc8d00fd35 (diff)
downloadGT5-Unofficial-4c20885d144e5b2eaa7177668f71a32ecc694b9f.tar.gz
GT5-Unofficial-4c20885d144e5b2eaa7177668f71a32ecc694b9f.tar.bz2
GT5-Unofficial-4c20885d144e5b2eaa7177668f71a32ecc694b9f.zip
Merge pull request #3 from Blood-Asp/experimental
Update changes
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,