From 838e12cc0a3532bc0c93c30bcd757e15229b9425 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 25 Apr 2020 12:30:18 -0400
Subject: [PATCH] stop

---
 core/assets/bundles/bundle.properties         |  2 +-
 core/src/mindustry/core/Control.java          | 10 +++++++
 .../world/blocks/units/UnitFactory.java       | 29 ++++++++++---------
 gradle.properties                             |  2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 79216f1adc..dd64107454 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -640,7 +640,7 @@ setting.linear.name = Linear Filtering
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
-setting.animatedwater.name = Animated Water
+setting.animatedwater.name = Animated Fluids
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.playerindicators.name = Player Indicators
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 8af49d390a..6c035f1cca 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -377,6 +377,16 @@ public class Control implements ApplicationListener, Loadable{
             Core.app.post(() -> Core.app.post(this::playTutorial));
         }
 
+        if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){
+            app.post(() -> app.post(() -> {
+                FloatingDialog dialog = new FloatingDialog("Don't play 6.0");
+                dialog.cont.add("6.0 is not ready for testing. Don't play it, and don't report any issues with it.\n[scarlet]This dialog cannot be closed. If you know what you're doing, you should know how to disable it.")
+                .grow().wrap().get().setAlignment(Align.center);
+                dialog.setFillParent(true);
+                dialog.show();
+            }));
+        }
+
         //display UI scale changed dialog
         if(Core.settings.getBool("uiscalechanged", false)){
             Core.app.post(() -> Core.app.post(() -> {
diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index 8977ffbf89..0252564073 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -149,26 +149,29 @@ public class UnitFactory extends Block{
             if(currentPlan != -1){
                 UnitPlan plan = plans[currentPlan];
 
-                TextureRegion region = plan.unit.icon(Cicon.full);
+                Draw.draw(Layer.blockOver, () -> {
+                    TextureRegion region = plan.unit.icon(Cicon.full);
 
-                Shaders.build.region = region;
-                Shaders.build.progress = progress / plan.time;
-                Shaders.build.color.set(Pal.accent);
-                Shaders.build.color.a = speedScl;
-                Shaders.build.time = -time / 20f;
+                    Shaders.build.region = region;
+                    Shaders.build.progress = progress / plan.time;
+                    Shaders.build.color.set(Pal.accent);
+                    Shaders.build.color.a = speedScl;
+                    Shaders.build.time = -time / 20f;
 
-                Draw.shader(Shaders.build);
-                Draw.rect(region, x, y);
-                Draw.shader();
+                    Draw.shader(Shaders.build);
+                    Draw.rect(region, x, y);
+                    Draw.shader();
 
-                Draw.color(Pal.accent);
-                Draw.alpha(speedScl);
+                    Draw.color(Pal.accent);
+                    Draw.alpha(speedScl);
 
-                Lines.lineAngleCenter(x + Mathf.sin(time, 20f, Vars.tilesize / 2f * size - 2f), y, 90, size * Vars.tilesize - 4f);
+                    Lines.lineAngleCenter(x + Mathf.sin(time, 20f, Vars.tilesize / 2f * size - 2f), y, 90, size * Vars.tilesize - 4f);
 
-                Draw.reset();
+                    Draw.reset();
+                });
             }
 
+            Draw.z(Layer.blockOver);
             Draw.rect(topRegion, x, y);
         }
 
diff --git a/gradle.properties b/gradle.properties
index 50169db7b3..b3ae2b151f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=907d6db786c2629697cbfd3863ce0edd23a179f1
+archash=1a08af7c65c887436d305a69928d9845ccfa3874