From fa99a9b335403b26a2d656f586802d9af50b47bb Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 2 Jun 2021 11:30:13 -0400 Subject: [PATCH 1/4] It's not even pre-alpha yet --- build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b3e911106a..9c75d7a3c9 100644 --- a/build.gradle +++ b/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' diff --git a/gradle.properties b/gradle.properties index 0152a046ab..0d662cd2bc 100644 --- a/gradle.properties +++ b/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=5364d0187882a5e2f09850fe2505608dd7cf93f3 +archash=4db7abe679c53dbcef400b65da75247ffa6334d3 From e16ce5b65185313f6fe86a20923071c8508ca5a7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 2 Jun 2021 11:34:41 -0400 Subject: [PATCH 2/4] Removed BuildConfig import --- android/src/mindustry/android/AndroidLauncher.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 69543be82e..1b0402da69 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/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"); From c9a1de1148ce13884e148270c95985afd9fba034 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 2 Jun 2021 11:47:42 -0400 Subject: [PATCH 3/4] arc --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0d662cd2bc..696bad812c 100644 --- a/gradle.properties +++ b/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 From 662473936ca7d8819e2fb601a2f960563623b4f6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 2 Jun 2021 12:41:19 -0400 Subject: [PATCH 4/4] Remove unused shader --- core/src/mindustry/graphics/Shaders.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index 75d61a2178..089e2e5ddb 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/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();