aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-02-25 15:25:58 +0100
committerGitHub <noreply@github.com>2021-02-25 15:25:58 +0100
commitbfc3fbcf29de80435c05b90e1653e14a6fddff25 (patch)
tree09231f6f7b340dccaac252682ebeb71a48f37099 /src/main/java/gregtech/common
parent99ef1802df8436007a89ccd0f72287aceeaf8d85 (diff)
parent54f372380925459fd7d03581919a531655228856 (diff)
downloadGT5-Unofficial-bfc3fbcf29de80435c05b90e1653e14a6fddff25.tar.gz
GT5-Unofficial-bfc3fbcf29de80435c05b90e1653e14a6fddff25.tar.bz2
GT5-Unofficial-bfc3fbcf29de80435c05b90e1653e14a6fddff25.zip
Merge pull request #444 from repo-alt/experimental
Reshuffle new constructor args to avoid conflict with GT++ ASM
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
index 57d9646f1b..34f99510ea 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
@@ -31,12 +31,12 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
private AENetworkProxy gridProxy = null;
public GT_MetaTileEntity_Hatch_OutputBus_ME(int aID, String aName, String aNameRegional) {
- super(aID, aName, aNameRegional, 1, 0, new String[]{
- "Item Output for Multiblocks", "Stores directly into ME"});
+ super(aID, aName, aNameRegional, 1, new String[]{
+ "Item Output for Multiblocks", "Stores directly into ME"}, 0);
}
public GT_MetaTileEntity_Hatch_OutputBus_ME(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
- super(aName, aTier, 0, aDescription, aTextures);
+ super(aName, aTier, aDescription, 0, aTextures);
}
@Override