aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-02-04 20:25:22 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-02-04 20:25:22 +1000
commitdf07c3247fe4c44c7c3539eecbc2af69bc305b49 (patch)
treeabf68870cc92bb61514e5e2e8de942ae413e2c60 /src/Java/gtPlusPlus/core
parentd10ed0cdab2df584b867177de85f897f83bad187 (diff)
downloadGT5-Unofficial-df07c3247fe4c44c7c3539eecbc2af69bc305b49.tar.gz
GT5-Unofficial-df07c3247fe4c44c7c3539eecbc2af69bc305b49.tar.bz2
GT5-Unofficial-df07c3247fe4c44c7c3539eecbc2af69bc305b49.zip
+ Added more casings for multiblocks.
+ Added the Fish Pond. $ Added support for more textures in TAE.java. - Disabled GT ASM.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/block/ModBlocks.java2
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index 24e589ad97..04ada83922 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -23,6 +23,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.GregtechMetaCasingBlocks3;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
@@ -39,6 +40,7 @@ public final class ModBlocks {
public static Block blockGriefSaver;
public static Block blockCasingsMisc;
public static Block blockCasings2Misc;
+ public static Block blockCasings3Misc;
public static Block blockMetaTileEntity;
public static Block blockHeliumGenerator;
public static Block blockNHG;
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index db5a6e2a74..953d32f138 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -44,7 +44,6 @@ public class COMPAT_HANDLER {
//Free IDs
/*
- 829
---
859
to
@@ -99,6 +98,7 @@ public class COMPAT_HANDLER {
GregtechComponentAssembler.run();
GregtechTeslaTower.run();
GregtechSuperTanks.run();
+ GregtechIndustrialFishPond.run();
//New Horizons Content
NewHorizonsAccelerator.run();