Merge branches 'asset-manager' and 'master' of https://github.com/Anuken/Mindustry

.github/workflows/gradle.yml

@@ -0,0 +1,17 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Run unit tests with gradle
+      run: ./gradlew test

core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java

@@ -33,7 +33,9 @@ public class MirrorFilter extends GenerateFilter{
             mirror(v3, v1.x, v1.y, v2.x, v2.y);
             Tile tile = in.tile(v3.x, v3.y);
             in.floor = tile.floor();
+            if(!tile.block().synthetic()){
                 in.block = tile.block();
+            }
             in.ore = tile.overlay();
         }
     }

core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java

@@ -101,7 +101,7 @@ public class MendProjector extends Block{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        Drawf.dashCircle(x * tilesize, y * tilesize, range, Pal.accent);
+        Drawf.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range, Pal.accent);
     }
 
     @Override

ios/build.gradle

@@ -36,6 +36,12 @@ task copyAssets(){
     }
 }
 
+task deploy{
+    dependsOn copyAssets
+    dependsOn createIPA
+}
+
+
 build.dependsOn copyAssets
 
 launchIPhoneSimulator.dependsOn build