aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-01-31 04:09:13 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-01-31 04:09:13 +0000
commitd015262242110df899f6ffe7a9f84780382e8584 (patch)
tree81d67a472a9edbe166af8cc294fe84ef911792f5 /src
parentc0daba1659c667342da1529c31896a98768a8eda (diff)
downloadGT5-Unofficial-d015262242110df899f6ffe7a9f84780382e8584.tar.gz
GT5-Unofficial-d015262242110df899f6ffe7a9f84780382e8584.tar.bz2
GT5-Unofficial-d015262242110df899f6ffe7a9f84780382e8584.zip
% 5.08 Soldering Iron Compatibility on Pollution Scrubbers. (Doesn't matter because there is no pollution in .08)
$ Fixed Gradle not building in UTF-8 encoding, as opposed to the system default. (May fix some material compound symbols). $ Fixed weird symbols in Cyclotron container.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
index fff86ba7bd..921871cebe 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
@@ -229,4 +229,4 @@ public class CONTAINER_Cyclotron extends GT_ContainerMetaTile_Machine {
public String trans(String aKey, String aEnglish) {
return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false);
}
-} \ No newline at end of file
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
index 022dcaaef2..eb6a9bfcd3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
@@ -638,7 +638,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
}
- @Override
public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
float aZ) {
this.mSaveRotor = Utils.invertBoolean(mSaveRotor);