From 460496339b9b3b0ceee38a222f5068c9e8a39d0d Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 9 Mar 2018 17:51:01 -0500 Subject: [PATCH] Un-broke multiblock breaking, tweaked build script --- core/assets/version.properties | 2 +- core/src/io/anuke/mindustry/input/DesktopInput.java | 3 ++- upload-build.sh | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 22b8569a19..25f6a3c4b4 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,5 +1,5 @@ #Autogenerated file. Do not modify. -#Fri Mar 09 17:11:02 EST 2018 +#Fri Mar 09 17:44:08 EST 2018 version=release androidBuildCode=364 name=Mindustry diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 4baa52614f..3d70d62363 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -157,7 +157,8 @@ public class DesktopInput extends InputHandler{ } boolean select(){ - return !Inputs.keyDown("select") && !Inputs.keyRelease("select"); + return !Inputs.keyDown("select") && !Inputs.keyRelease("select") && + !Inputs.keyDown("break") && !Inputs.keyRelease("break"); } public int tilex(){ diff --git a/upload-build.sh b/upload-build.sh index 30cbb02323..81c18758fd 100644 --- a/upload-build.sh +++ b/upload-build.sh @@ -24,9 +24,11 @@ fi touch $FILE1 -echo "### Build "$TRAVIS_BUILD_NUMBER", Commit "$TRAVIS_COMMIT"." >> $FILE1 +echo "#### Latest Bleeding Edge Build: "$TRAVIS_BUILD_NUMBER"" >> $FILE1 +echo "###### Commit: "$TRAVIS_COMMIT"" >> $FILE1 echo >> $FILE1 -echo "Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 +echo "[Desktop JAR download.]("$DESKFILE")" >> $FILE1 +echo "*Requires Java to run, as usual.*" >> $FILE1 git add $FILE1 git add $DESKFILE