aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2016-11-02 16:59:01 +1000
committerGitHub <noreply@github.com>2016-11-02 16:59:01 +1000
commit3bd9cddd494682db29f8897f5f573ccd1dca1c2c (patch)
tree40fb17d2633d8d5b60f0794deaa4356335de29dd /src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
parentcfde0e80a2b7083c8c9ec5664b5e9d0fa446ed9c (diff)
parent5944aec4eda2db647e34b9c46bbab0512b56b6a4 (diff)
downloadGT5-Unofficial-3bd9cddd494682db29f8897f5f573ccd1dca1c2c.tar.gz
GT5-Unofficial-3bd9cddd494682db29f8897f5f573ccd1dca1c2c.tar.bz2
GT5-Unofficial-3bd9cddd494682db29f8897f5f573ccd1dca1c2c.zip
Merge pull request #33 from draknyte1/laptopMerge
Things I fixed during my workspace clone.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
index 8a92d34a8e..39b7fb41bd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
@@ -5,6 +5,7 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -14,6 +15,7 @@ public class Gregtech_Blocks {
//Casing Blocks
ModBlocks.blockCasingsMisc = new GregtechMetaCasingBlocks();
+ ModBlocks.blockCasings2Misc = new GregtechMetaCasingBlocks2();
//ModBlocks.blockMetaTileEntity = new GregtechBlockMachines();
//registerDefailtGtTe();