diff options
| author | Alkalus <draknyte1@hotmail.com> | 2016-11-02 16:59:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 16:59:01 +1000 |
| commit | 3bd9cddd494682db29f8897f5f573ccd1dca1c2c (patch) | |
| tree | 40fb17d2633d8d5b60f0794deaa4356335de29dd /src/Java/gtPlusPlus/core/block/ModBlocks.java | |
| parent | cfde0e80a2b7083c8c9ec5664b5e9d0fa446ed9c (diff) | |
| parent | 5944aec4eda2db647e34b9c46bbab0512b56b6a4 (diff) | |
| download | GT5-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/core/block/ModBlocks.java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/ModBlocks.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index af7e5d833e..3b6f061ca7 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -6,6 +6,7 @@ import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced; import gtPlusPlus.core.fluids.FluidRegistryHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; @@ -30,6 +31,7 @@ public final class ModBlocks { public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels"); public static Block blockFluidJackDaniels; + public static Block blockCasings2Misc; |