New icon / Windows deployment fixes / Map fixes / Menu fix

core/assets/bundles/bundle.properties

@@ -601,6 +601,8 @@ block.core-foundation.name = Core: Foundation
 block.core-nucleus.name = Core: Nucleus
 block.deepwater.name = Deep Water
 block.water.name = Water
+block.tainted-water.name = Tainted Water
+block.darksand-tainted-water.name = Dark Sand Tainted Water
 block.tar.name = Tar
 block.stone.name = Stone
 block.sand.name = Sand

core/src/io/anuke/mindustry/ui/fragments/HudFragment.java

@@ -63,7 +63,7 @@ public class HudFragment extends Fragment{
                         @Override
                         public void act(float delta){
                             setSize(getPrefWidth(), getPrefHeight());
-                            setPosition(0, 0, Align.topLeft);
+                            setPosition(0, Core.graphics.getHeight(), Align.topLeft);
                             super.act(delta);
                         }
 
@@ -78,6 +78,7 @@ public class HudFragment extends Fragment{
                         }
                     };
 
+                    select.visible(() -> !state.is(State.menu));
                     select.left();
                     select.defaults().size(dsize).left();
 
@@ -120,7 +121,8 @@ public class HudFragment extends Fragment{
                     }).get();
 
                     select.addImage("blank").color(Pal.accent).width(3f).fillY();
-                    cont.add(select).prefSize(dsize*4 + 3, dsize).left();
+                    Core.scene.add(select);
+                    cont.add().size(dsize*4 + 3, dsize).left();
                 }
 
                 cont.row();

desktop/build.gradle

@@ -98,6 +98,20 @@ task packrCmd(){
     }
 }
 
+task copyTemplate(){
+    doLast{
+        copy{
+            into "packr-out/"
+            from "${JDK_DIR}/templates/${getPlatform().toString().toLowerCase()}"
+        }
+
+        copy{
+            into "packr-out/"
+            from "build/libs/desktop-release.jar"
+        }
+    }
+}
+
 task packrZip(){
     task clearOut(type: Delete){
         doLast{
@@ -133,17 +147,22 @@ task packrZip(){
         }
     }
     
-    dependsOn "packrCmd"
     finalizedBy "clearOut"
 
     if(project.hasProperty("platform")){
+        def plat = getPlatform()
+        if(plat == PackrConfig.Platform.Windows32 || plat == PackrConfig.Platform.Windows64){
+            dependsOn "copyTemplate"
+        }else{
+            dependsOn "packrCmd"
 
-        if(getPlatform() == PackrConfig.Platform.MacOS){
-            dependsOn "fixMac"
-        }
+            if(getPlatform() == PackrConfig.Platform.MacOS){
+                dependsOn "fixMac"
+            }
 
-        if(getPlatform() == PackrConfig.Platform.Windows32){
-            dependsOn "fixWindows32"
+            if(getPlatform() == PackrConfig.Platform.Windows32){
+                dependsOn "fixWindows32"
+            }
         }
 
         task rzip(type: Zip){