Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	gradle.properties

android/src/mindustry/android/AndroidLauncher.java

@@ -15,7 +15,6 @@ import arc.func.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import dalvik.system.*;
-import io.anuke.mindustry.*;
 import mindustry.*;
 import mindustry.game.Saves.*;
 import mindustry.io.*;
@@ -232,7 +231,7 @@ public class AndroidLauncher extends AndroidApplication{
         super.onResume();
 
         //TODO enable once GPGS is set up on the GP console
-        if(false && BuildConfig.FLAVOR.equals("gp")){
+        if(false && getPackageName().endsWith(".gp")){
             try{
                 if(gpService == null){
                     serviceClass = Class.forName("mindustry.android.GPGameService");

build.gradle

@@ -36,7 +36,7 @@ allprojects{
 
     ext{
         versionNumber = '7'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'pre-alpha'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'dev'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'

core/src/mindustry/graphics/Shaders.java

@@ -48,12 +48,12 @@ public class Shaders{
         tar = new SurfaceShader("tar");
         slag = new SurfaceShader("slag");
         space = new SpaceShader("space");
-        caustics = new SurfaceShader("caustics"){
-            @Override
-            public String textureName(){
-                return "caustics";
-            }
-        };
+        //caustics = new SurfaceShader("caustics"){
+        //    @Override
+        //    public String textureName(){
+        //        return "caustics";
+        //    }
+        //};
         planet = new PlanetShader();
         planetGrid = new PlanetGridShader();
         atmosphere = new AtmosphereShader();

gradle.properties

@@ -8,4 +8,4 @@ kapt.use.worker.api=true
 kapt.include.compile.classpath=false
 # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues
 kotlin.stdlib.default.dependency=false
-archash=4db7abe679c53dbcef400b65da75247ffa6334d3
+archash=5a9d95001fc988df2681616ebc33152b9c88ea92