diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-31 04:09:13 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-31 04:09:13 +0000 |
| commit | d015262242110df899f6ffe7a9f84780382e8584 (patch) | |
| tree | 81d67a472a9edbe166af8cc294fe84ef911792f5 | |
| parent | c0daba1659c667342da1529c31896a98768a8eda (diff) | |
| download | GT5-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.
3 files changed, 7 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index c0a53d65c1..42ae12af58 100644 --- a/build.gradle +++ b/build.gradle @@ -50,9 +50,14 @@ dependencies { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 +//Compile against UTF-8 +compileJava.options.encoding = 'UTF-8' +compileTestJava.options.encoding = 'UTF-8' +javadoc.options.encoding = 'UTF-8' + //Jar Info archivesBaseName = "GT-PlusPlus" -version = "1.7.02.64-nightly" +version = "1.7.02.69-nightly" minecraft.version = "1.7.10-10.13.4.1614-1.7.10" minecraft { 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); |