aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-13 15:45:29 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-13 15:45:29 +1000
commitf7390af19986b4e4370379bb46dee71f12b717e8 (patch)
treec250545984b437c99d1951975fbcbd12da205985 /src/Java/gtPlusPlus/xmod/gregtech/api
parentf82bd998288253230713cb146f6294be2d02260c (diff)
downloadGT5-Unofficial-f7390af19986b4e4370379bb46dee71f12b717e8.tar.gz
GT5-Unofficial-f7390af19986b4e4370379bb46dee71f12b717e8.tar.bz2
GT5-Unofficial-f7390af19986b4e4370379bb46dee71f12b717e8.zip
+ Added High Quality Industrial Diamond.
+ Added various material components. + Added a debug machine used for calling the Garbage Collector. + Added recipe to obtain Hot Water. + Added way to obtain Dragonsblood. + Added lots of quick access fluids directly to FluidUtils. % Updated English Locale. $ Fixed issue preventing all Multiblocks from forming. $ Fixed some minor texture issues.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java8
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 68fe121081..6e9a099e72 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -427,6 +427,7 @@ public enum GregtechItemList implements GregtechItemContainer {
//Debug machine
Pollution_Creator,
+ Garbage_Collector_Debug_Machine,
//Basically is an automatic Cauldron
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index e0f768830d..e9f8546545 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -1252,10 +1252,10 @@ GT_MetaTileEntity_MultiBlockBase {
}
//Check type
- Class <?> aHatchType = ReflectionUtils.getTypeOfGenericObject(aList);
- if (!aHatchType.isInstance(aTileEntity)) {
- return false;
- }
+ /*
+ * Class <?> aHatchType = ReflectionUtils.getTypeOfGenericObject(aList); if
+ * (!aHatchType.isInstance(aTileEntity)) { return false; }
+ */
if (aList.isEmpty()) {