aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-01 13:13:20 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-01 13:13:20 +1000
commit3311449b3bcadbd9f571abb7374655dde57042fd (patch)
treecfa5bebdf736913f297c8dc277bf492c115f0367 /src/Java/gtPlusPlus/core
parent3e52e019bda7ad6d5d2d06565881c1135bb33160 (diff)
downloadGT5-Unofficial-3311449b3bcadbd9f571abb7374655dde57042fd.tar.gz
GT5-Unofficial-3311449b3bcadbd9f571abb7374655dde57042fd.tar.bz2
GT5-Unofficial-3311449b3bcadbd9f571abb7374655dde57042fd.zip
+ Added a Large Naquadah Reactor.
+ Added a Custom Naquadah Input hatch for the Reactor.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/block/ModBlocks.java3
-rw-r--r--src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java1
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java1
3 files changed, 5 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index be98bdf3f4..f958dc27d7 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -32,9 +32,12 @@ public final class ModBlocks {
//public static Block blockStaballoy;
// WIP TODO public static Block blockToolBuilder;
public static Block blockGriefSaver;
+
public static Block blockCasingsMisc;
public static Block blockCasings2Misc;
public static Block blockCasings3Misc;
+ public static Block blockCasings4Misc;
+
public static Block blockMetaTileEntity;
public static Block blockHeliumGenerator;
public static Block blockNHG;
diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
index 934c0c22e4..f4669bfe35 100644
--- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
+++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
@@ -169,6 +169,7 @@ public class GuiBaseGrindle extends GuiContainer {
// Valid Datastick?
this.fontRendererObj.drawStringWithShadow(I18n.format("Insert device into port.", new Object[0]), 10, 8, Utils.rgbtoHexValue(255, 125, 125));
this.mPageDataArray = new String[][] {{}};
+ this.mCurrentPage = 0;
}
// Inventory Label
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 810abdbc32..207e2b5bc8 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -116,6 +116,7 @@ public class COMPAT_HANDLER {
GregtechThreadedBuffers.run();
GregtechIndustrialMixer.run();
GregtechCustomHatches.run();
+ GregtechNaqReactor.run();
//New Horizons Content
NewHorizonsAccelerator.run();