From f2a952fcfe0633176587d5fcb25e2b7afcbbe03d Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 20 Feb 2018 19:40:19 -0500 Subject: [PATCH] Possible build upload script fix --- core/assets/version.properties | 4 ++-- core/src/io/anuke/mindustry/core/Control.java | 2 +- upload-build.sh | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 2404c816db..87ddfe831a 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Mon Feb 19 20:43:00 EST 2018 +#Tue Feb 20 17:36:29 EST 2018 version=beta -androidBuildCode=248 +androidBuildCode=249 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 7528e67520..bdf06f1027 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -354,7 +354,7 @@ public class Control extends Module{ if(!state.is(State.menu)){ input.update(); - if(Inputs.keyTap("pause") && !ui.restart.isShown() && !Net.active() && (state.is(State.paused) || state.is(State.playing))){ + if(Inputs.keyTap("pause") && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){ state.set(state.is(State.playing) ? State.paused : State.playing); } diff --git a/upload-build.sh b/upload-build.sh index e21bebebb2..bf2f3c36d1 100644 --- a/upload-build.sh +++ b/upload-build.sh @@ -17,8 +17,9 @@ if [ ! -e $FILE1 ]; then touch $FILE1 fi -NEWLINE="\n" -echo "### Commit #"$TRAVIS_COMMIT".${NEWLINE}Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 +echo "### Commit #"$TRAVIS_COMMIT"." >> $FILE1 +echo >> $FILE1 +echo "Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 git add $FILE1 git add $DESKFILE