From 6211afb9041f3170ed117fd922c623c5a4dd4bd3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 16 Jan 2018 15:52:26 -0500
Subject: [PATCH] Minor bugfixes, ready for next release

---
 android/AndroidManifest.xml                     | 4 ++--
 core/assets/bundles/bundle.properties           | 2 +-
 core/src/io/anuke/mindustry/Vars.java           | 2 +-
 core/src/io/anuke/mindustry/core/NetClient.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 6594944cbb..0d0f04d86b 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.anuke.mindustry"
-    android:versionCode="54"
-    android:versionName="3.3b6" >
+    android:versionCode="55"
+    android:versionName="3.3b7" >
 
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f7f46f938e..671b3db77a 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -18,7 +18,7 @@ text.public=Public
 text.players={0} players online
 text.players.single={0} player online
 text.server.mismatch=Packet error: possible client/server version mismatch.\nMake sure you and the host have the\nlatest version of Mindustry!
-.server.closing=[accent]Closing server...
+text.server.closing=[accent]Closing server...
 text.server.kicked.kick=You have been kicked from the server!
 text.server.kicked.invalidPassword=Invalid password!
 text.server.connected={0} has joined.
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 59660d9214..89b8f38e3a 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -10,7 +10,7 @@ import io.anuke.ucore.UCore;
 import io.anuke.ucore.scene.ui.layout.Unit;
 
 public class Vars{
-	public static final boolean testAndroid = true;
+	public static final boolean testAndroid = false;
 	//shorthand for whether or not this is running on android
 	public static final boolean android = (Gdx.app.getType() == ApplicationType.Android) || testAndroid;
 	//shorthand for whether or not this is running on GWT
diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java
index 1c53359df0..f65e825439 100644
--- a/core/src/io/anuke/mindustry/core/NetClient.java
+++ b/core/src/io/anuke/mindustry/core/NetClient.java
@@ -48,7 +48,7 @@ public class NetClient extends Module {
     IntSet requests = new IntSet();
     IntSet recieved = new IntSet();
     float playerSyncTime = 2;
-    float dataTimeout = 60*10;
+    float dataTimeout = 60*13; //13 seconds timeout
 
     public NetClient(){