diff --git a/build.gradle b/build.gradle
index 84b21359c1..4eecade40c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,11 @@ buildscript{
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
     }
+
     dependencies{
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.5'
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
+        classpath files('tools/filters.jar')
     }
 }
 
@@ -40,7 +42,7 @@ allprojects{
                 }catch(e){ //github can get angry sometimes
                     arcHash = "-SNAPSHOT";
                 }
-            } 
+            }
             return arcHash
         }
 
@@ -87,7 +89,6 @@ allprojects{
             }catch(Exception ignored){}
 
             if(pfile.exists()){
-
                 props.load(new FileInputStream(pfile))
 
                 String buildid = getBuildVersion()
@@ -196,7 +197,7 @@ project(":core"){
         build.finalizedBy(finish)
 
         //forces JITPack to compile arc and its submodules
-        if(!localArc()) compile "com.github.anuken:arc:${getArcHash()}"
+        if(!localArc()) compile "com.github.Anuken.Arc:${getArcHash()}"
 
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 22ebe33317..e0bb744add 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -46,275 +46,289 @@ bridge-conveyor-end
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-0-1
+conveyor-0-0
   rotate: false
   xy: 329, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-0-2
+conveyor-0-1
   rotate: false
   xy: 295, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-0-3
+conveyor-0-2
   rotate: false
   xy: 329, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-1-0
+conveyor-0-3
   rotate: false
   xy: 295, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-1-1
+conveyor-1-0
   rotate: false
   xy: 329, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-1-2
+conveyor-1-1
   rotate: false
   xy: 295, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-1-3
+conveyor-1-2
   rotate: false
   xy: 329, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-2-0
+conveyor-1-3
   rotate: false
   xy: 295, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-2-1
+conveyor-2-0
   rotate: false
   xy: 329, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-2-2
+conveyor-2-1
   rotate: false
   xy: 295, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-2-3
+conveyor-2-2
   rotate: false
   xy: 329, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-3-0
+conveyor-2-3
   rotate: false
   xy: 295, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-3-1
+conveyor-3-0
   rotate: false
   xy: 329, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-3-2
+conveyor-3-1
   rotate: false
   xy: 329, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-3-3
+conveyor-3-2
   rotate: false
   xy: 301, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-4-0
+conveyor-3-3
   rotate: false
   xy: 335, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-4-1
+conveyor-4-0
   rotate: false
   xy: 401, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-4-2
+conveyor-4-1
   rotate: false
   xy: 435, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-4-3
+conveyor-4-2
   rotate: false
   xy: 499, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+conveyor-4-3
+  rotate: false
+  xy: 533, 1011
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-0
+  rotate: false
+  xy: 1951, 1297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 403, 879
+  xy: 1985, 1289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 437, 879
+  xy: 369, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 371, 845
+  xy: 403, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 405, 845
+  xy: 437, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 439, 845
+  xy: 371, 845
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 397, 811
+  xy: 405, 845
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 397, 777
+  xy: 439, 845
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 431, 811
+  xy: 397, 811
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 397, 743
+  xy: 397, 777
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 431, 777
+  xy: 431, 811
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 397, 709
+  xy: 397, 743
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 431, 743
+  xy: 431, 777
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 397, 675
+  xy: 397, 709
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 431, 709
+  xy: 431, 743
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 397, 641
+  xy: 397, 675
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 431, 675
+  xy: 431, 709
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 397, 607
+  xy: 397, 641
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 431, 641
+  xy: 431, 675
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 397, 573
+  xy: 397, 607
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1019, 1243
+  xy: 985, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -328,21 +342,21 @@ mass-driver-turret
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1679, 1333
+  xy: 1713, 1367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1713, 1367
+  xy: 1747, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1747, 1401
+  xy: 1781, 1435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -615,35 +629,35 @@ coal3
   index: -1
 copper1
   rotate: false
-  xy: 533, 1011
+  xy: 1407, 1403
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 1407, 1403
+  xy: 1435, 1521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 1435, 1521
+  xy: 1441, 1487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 1475, 1453
+  xy: 1475, 1419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 1475, 1419
+  xy: 1475, 1385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -669,16 +683,30 @@ ice-cliff-edge
   orig: 32, 32
   offset: 0, 0
   index: -1
+snow-cliff-edge
+  rotate: false
+  xy: 927, 1277
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 363, 577
+  xy: 363, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 363, 577
+  xy: 363, 543
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snow-cliff-edge-1
+  rotate: false
+  xy: 363, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -697,16 +725,30 @@ ice-cliff-edge-2
   orig: 32, 32
   offset: 0, 0
   index: -1
+snow-cliff-edge-2
+  rotate: false
+  xy: 961, 1277
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 generic-cliff-side
   rotate: false
-  xy: 363, 543
+  xy: 363, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 363, 543
+  xy: 363, 509
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snow-cliff-side
+  rotate: false
+  xy: 363, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -720,7 +762,7 @@ grass-cliff-edge
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 363, 475
+  xy: 363, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -734,7 +776,7 @@ grass-cliff-edge-2
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 363, 441
+  xy: 363, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -748,7 +790,7 @@ grass2
   index: -1
 grass3
   rotate: false
-  xy: 363, 509
+  xy: 363, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -762,7 +804,7 @@ grassedge
   index: -1
 ice2
   rotate: false
-  xy: 363, 407
+  xy: 363, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -783,7 +825,7 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 363, 373
+  xy: 363, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -804,14 +846,14 @@ rockshadow1
   index: -1
 icerockshadow2
   rotate: false
-  xy: 363, 339
+  xy: 363, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 363, 339
+  xy: 363, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -825,56 +867,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 1121, 1243
+  xy: 1087, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 1087, 1209
+  xy: 1155, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 1155, 1243
+  xy: 1121, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 1257, 1209
+  xy: 1291, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 1291, 1209
+  xy: 993, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 993, 1175
+  xy: 993, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 993, 1141
+  xy: 1027, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 1027, 1175
+  xy: 993, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -888,21 +930,21 @@ metalflooredge
   index: -1
 rock2
   rotate: false
-  xy: 1849, 1401
+  xy: 1815, 1333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 1849, 1367
+  xy: 1849, 1333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 1849, 1333
+  xy: 1883, 1501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -916,21 +958,21 @@ sandedge
   index: -1
 shrubshadow
   rotate: false
-  xy: 1917, 1331
+  xy: 1927, 1535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1927, 1535
+  xy: 1951, 1501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1951, 1501
+  xy: 1951, 1467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -951,42 +993,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 1985, 1391
+  xy: 1985, 1493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 1985, 1357
+  xy: 1985, 1459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 1985, 1323
+  xy: 1985, 1425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 1679, 1299
+  xy: 1985, 1391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1985, 1459
+  xy: 1995, 1561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1985, 1425
+  xy: 1985, 1527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1007,70 +1049,70 @@ taredge
   index: -1
 thorium1
   rotate: false
-  xy: 1849, 1299
+  xy: 1747, 1299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1883, 1297
+  xy: 1781, 1299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1917, 1297
+  xy: 1815, 1299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1951, 1297
+  xy: 1849, 1299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1985, 1289
+  xy: 1883, 1297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 369, 879
+  xy: 1917, 1297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 397, 539
+  xy: 397, 573
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 431, 573
+  xy: 431, 607
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 397, 505
+  xy: 397, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 431, 539
+  xy: 431, 573
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1133,7 +1175,7 @@ conduit-liquid
   index: -1
 cross-1
   rotate: false
-  xy: 1441, 1487
+  xy: 1441, 1453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1161,7 +1203,7 @@ cross-4
   index: -1
 place-arrow
   rotate: false
-  xy: 1781, 1435
+  xy: 1815, 1469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1350,21 +1392,21 @@ conduit-top-6
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1257, 1243
+  xy: 1223, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1223, 1209
+  xy: 1291, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1291, 1243
+  xy: 1257, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1392,70 +1434,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1747, 1435
+  xy: 1781, 1469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1781, 1469
+  xy: 1815, 1503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1815, 1503
+  xy: 1679, 1333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1747, 1367
+  xy: 1781, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1781, 1401
+  xy: 1815, 1435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1815, 1435
+  xy: 1849, 1469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1849, 1469
+  xy: 1747, 1333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1747, 1333
+  xy: 1781, 1367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1781, 1367
+  xy: 1815, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1815, 1401
+  xy: 1849, 1435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1567,7 +1609,7 @@ fusion-reactor-top
   index: -1
 power-node
   rotate: false
-  xy: 1815, 1469
+  xy: 1849, 1503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1581,21 +1623,21 @@ power-node-large
   index: -1
 powerinfinite
   rotate: false
-  xy: 1849, 1503
+  xy: 1713, 1333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 1713, 1333
+  xy: 1747, 1367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1815, 1333
+  xy: 1849, 1367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1777,14 +1819,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 1053, 1209
+  xy: 1121, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 1027, 1107
+  xy: 1061, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1819,21 +1861,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1849, 1435
+  xy: 1781, 1333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1781, 1333
+  xy: 1815, 1367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 1917, 1399
+  xy: 1917, 1365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1854,7 +1896,7 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 1951, 1331
+  xy: 1951, 1433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1938,7 +1980,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 363, 645
+  xy: 363, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2036,21 +2078,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 1883, 1365
+  xy: 1883, 1331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 1883, 1331
+  xy: 1917, 1501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 1917, 1501
+  xy: 1917, 1467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2176,7 +2218,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 1815, 1367
+  xy: 1849, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2239,7 +2281,7 @@ wraith-factory-top-open
   index: -1
 deflector-wall
   rotate: false
-  xy: 1475, 1487
+  xy: 1475, 1453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2260,7 +2302,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 363, 679
+  xy: 363, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2295,7 +2337,7 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 427, 249
+  xy: 427, 267
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -2344,7 +2386,7 @@ error
   index: -1
 laser
   rotate: false
-  xy: 483, 611
+  xy: 483, 653
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2365,7 +2407,7 @@ laserfull
   index: -1
 minelaser
   rotate: false
-  xy: 427, 199
+  xy: 427, 217
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2414,21 +2456,21 @@ scorch2
   index: -1
 scorch3
   rotate: false
-  xy: 397, 283
+  xy: 397, 317
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 397, 181
+  xy: 397, 215
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 397, 79
+  xy: 397, 113
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -2449,7 +2491,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 1917, 1365
+  xy: 1917, 1331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2463,7 +2505,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 431, 607
+  xy: 431, 641
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2615,13 +2657,6 @@ block-icon-conveyor
   orig: 32, 32
   offset: 0, 0
   index: -1
-conveyor-0-0
-  rotate: false
-  xy: 1863, 1571
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 block-icon-copper-wall
   rotate: false
   xy: 1897, 1569
@@ -3847,13 +3882,6 @@ block-icon-titanium-conveyor
   orig: 32, 32
   offset: 0, 0
   index: -1
-titanium-conveyor-0-0
-  rotate: false
-  xy: 165, 8
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 block-icon-trident-ship-pad
   rotate: false
   xy: 827, 1271
@@ -3947,112 +3975,112 @@ block-icon-wraith-factory
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 1441, 1453
+  xy: 1441, 1419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 1441, 1419
+  xy: 1441, 1385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 1441, 1385
+  xy: 1469, 1521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 1469, 1521
+  xy: 1475, 1487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 1475, 1385
+  xy: 363, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 363, 781
+  xy: 363, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 363, 747
+  xy: 363, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 363, 713
+  xy: 363, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lava-cliff-edge
   rotate: false
-  xy: 985, 1209
+  xy: 1053, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lava-cliff-edge-1
   rotate: false
-  xy: 1053, 1243
+  xy: 1019, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lava-cliff-edge-2
   rotate: false
-  xy: 1019, 1209
+  xy: 1087, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lava-cliff-side
   rotate: false
-  xy: 1087, 1243
+  xy: 1053, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 1189, 1243
+  xy: 1155, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 1155, 1209
+  xy: 1223, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 1223, 1243
+  xy: 1189, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 1189, 1209
+  xy: 1257, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4108,770 +4136,742 @@ trident-ship
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 993, 1107
+  xy: 1027, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 1027, 1141
+  xy: 1061, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 1061, 1175
+  xy: 993, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 993, 1073
+  xy: 1027, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 1061, 1141
+  xy: 1095, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 1095, 1175
+  xy: 1027, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 1027, 1073
+  xy: 1061, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 1061, 1107
+  xy: 1095, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 1095, 1141
+  xy: 1129, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 1129, 1175
+  xy: 1061, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 1061, 1073
+  xy: 1095, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 1095, 1107
+  xy: 1129, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 1129, 1141
+  xy: 1163, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 1163, 1175
+  xy: 1095, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 1095, 1073
+  xy: 1129, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 1129, 1107
+  xy: 1163, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 1163, 1141
+  xy: 1197, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 1197, 1175
+  xy: 1129, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 1129, 1073
+  xy: 1163, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 1163, 1107
+  xy: 1197, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 1197, 1141
+  xy: 1231, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 1231, 1175
+  xy: 1163, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 1163, 1073
+  xy: 1197, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 1197, 1107
+  xy: 1231, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 1231, 1141
+  xy: 1265, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 1265, 1175
+  xy: 1197, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 1197, 1073
+  xy: 1231, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 1231, 1107
+  xy: 1265, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 1265, 1141
+  xy: 1231, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 1231, 1073
+  xy: 1265, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 1265, 1107
+  xy: 1265, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 1265, 1073
+  xy: 369, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 369, 33
+  xy: 1299, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 1299, 1175
+  xy: 1299, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 1299, 1141
+  xy: 1299, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 1299, 1107
+  xy: 1299, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 1299, 1073
+  xy: 1325, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 1325, 1243
+  xy: 1325, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 1325, 1209
+  xy: 1333, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 1333, 1175
+  xy: 1333, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 1333, 1141
+  xy: 1333, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 1333, 1107
+  xy: 1333, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 1333, 1073
+  xy: 1503, 1525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 1503, 1525
+  xy: 1509, 1491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 1509, 1491
+  xy: 1509, 1457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 1509, 1457
+  xy: 1509, 1423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 1509, 1423
+  xy: 1509, 1389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 1509, 1389
+  xy: 1543, 1504
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 1543, 1504
+  xy: 1543, 1470
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 1543, 1470
+  xy: 1543, 1436
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 1543, 1436
+  xy: 1543, 1402
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 1543, 1402
+  xy: 1577, 1499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 1577, 1499
+  xy: 1577, 1465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 1577, 1465
+  xy: 1577, 1431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 1577, 1431
+  xy: 1577, 1397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 1577, 1397
+  xy: 1543, 1368
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 1543, 1368
+  xy: 1577, 1363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 1577, 1363
+  xy: 1509, 1355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 1509, 1355
+  xy: 1543, 1334
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 1543, 1334
+  xy: 1577, 1329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 1577, 1329
+  xy: 1611, 1499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 1611, 1499
+  xy: 1611, 1465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 1611, 1465
+  xy: 1611, 1431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 1611, 1431
+  xy: 1611, 1397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 1611, 1397
+  xy: 1611, 1363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 1611, 1363
+  xy: 1611, 1329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 1611, 1329
+  xy: 1621, 1533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 1621, 1533
+  xy: 1655, 1537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 1655, 1537
+  xy: 1689, 1537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 1689, 1537
+  xy: 1723, 1537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 1723, 1537
+  xy: 1757, 1537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 1757, 1537
+  xy: 1791, 1537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 1791, 1537
+  xy: 1825, 1537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 1825, 1537
+  xy: 1859, 1537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 1859, 1537
+  xy: 1893, 1535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 1893, 1535
+  xy: 1645, 1499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 1645, 1499
+  xy: 1645, 1465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 1645, 1465
+  xy: 1645, 1431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 1645, 1431
+  xy: 1645, 1397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 1645, 1397
+  xy: 1645, 1363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 1645, 1363
+  xy: 1645, 1329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 1645, 1329
+  xy: 1679, 1503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 1679, 1503
+  xy: 1679, 1469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 1679, 1469
+  xy: 1713, 1503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 1713, 1503
+  xy: 1679, 1435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 1679, 1435
+  xy: 1713, 1469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 1713, 1469
+  xy: 1747, 1503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 1747, 1503
+  xy: 1679, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 1679, 1401
+  xy: 1713, 1435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 1713, 1435
+  xy: 1747, 1469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 1747, 1469
+  xy: 1781, 1503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 1781, 1503
+  xy: 1679, 1367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 1679, 1367
+  xy: 1713, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 1713, 1401
+  xy: 1747, 1435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 1883, 1501
+  xy: 1883, 1467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 1883, 1467
+  xy: 1883, 1433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 1883, 1433
+  xy: 1883, 1399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 1883, 1399
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow-cliff-edge
-  rotate: false
-  xy: 1951, 1467
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow-cliff-edge-1
-  rotate: false
-  xy: 1951, 1433
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow-cliff-edge-2
-  rotate: false
-  xy: 1951, 1399
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow-cliff-side
-  rotate: false
-  xy: 1951, 1365
+  xy: 1883, 1365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 1961, 1561
+  xy: 1951, 1399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 1995, 1561
+  xy: 1951, 1365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 1985, 1527
+  xy: 1951, 1331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 1985, 1493
+  xy: 1961, 1561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge
   rotate: false
-  xy: 1713, 1299
+  xy: 1985, 1357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-1
   rotate: false
-  xy: 1747, 1299
+  xy: 1985, 1323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-2
   rotate: false
-  xy: 1781, 1299
+  xy: 1679, 1299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-side
   rotate: false
-  xy: 1815, 1299
+  xy: 1713, 1299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4920,7 +4920,7 @@ item-biomatter
   index: -1
 item-blast-compound
   rotate: false
-  xy: 363, 305
+  xy: 363, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4934,7 +4934,7 @@ item-coal
   index: -1
 item-copper
   rotate: false
-  xy: 363, 271
+  xy: 363, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4948,7 +4948,7 @@ item-dense-alloy
   index: -1
 item-lead
   rotate: false
-  xy: 363, 237
+  xy: 363, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4962,63 +4962,63 @@ item-phase-fabric
   index: -1
 item-plastanium
   rotate: false
-  xy: 363, 203
+  xy: 363, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 363, 169
+  xy: 363, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 363, 135
+  xy: 363, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 363, 101
+  xy: 363, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 363, 67
+  xy: 951, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 951, 1243
+  xy: 951, 1209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 951, 1209
+  xy: 985, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 985, 1243
+  xy: 1019, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 1121, 1209
+  xy: 1189, 1243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5323,14 +5323,14 @@ discord-banner
   index: -1
 empty-sector
   rotate: false
-  xy: 363, 611
+  xy: 363, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 465, 643
+  xy: 465, 685
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5358,42 +5358,42 @@ icon-effect
   index: -1
 icon-liquid
   rotate: false
-  xy: 465, 607
+  xy: 465, 649
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 449, 521
+  xy: 431, 537
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 449, 503
+  xy: 449, 555
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 446, 449
+  xy: 428, 465
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 446, 431
+  xy: 428, 447
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 446, 413
+  xy: 428, 429
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5477,7 +5477,7 @@ icon-arrow-right
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 397, 67
+  xy: 204, 1727
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5491,7 +5491,7 @@ icon-back
   index: -1
 icon-ban
   rotate: false
-  xy: 391, 17
+  xy: 446, 431
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5512,7 +5512,7 @@ icon-cancel
   index: -1
 icon-chat
   rotate: false
-  xy: 204, 1727
+  xy: 2036, 1855
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5526,56 +5526,56 @@ icon-check
   index: -1
 icon-copy
   rotate: false
-  xy: 431, 521
+  xy: 431, 555
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 2036, 1855
+  xy: 1335, 1277
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 391, 1
+  xy: 403, 55
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 565, 1101
+  xy: 403, 39
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 581, 1101
+  xy: 391, 17
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 565, 1085
+  xy: 391, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 581, 1085
+  xy: 467, 561
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 565, 1069
+  xy: 467, 545
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5596,14 +5596,14 @@ icon-eraser
   index: -1
 icon-exit
   rotate: false
-  xy: 581, 1069
+  xy: 565, 1101
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 465, 625
+  xy: 465, 667
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5617,7 +5617,7 @@ icon-file-image
   index: -1
 icon-file-text
   rotate: false
-  xy: 565, 1053
+  xy: 581, 1101
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5631,7 +5631,7 @@ icon-fill
   index: -1
 icon-floppy
   rotate: false
-  xy: 581, 1053
+  xy: 565, 1085
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5645,14 +5645,14 @@ icon-floppy-16
   index: -1
 icon-folder
   rotate: false
-  xy: 597, 1061
+  xy: 581, 1085
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 613, 1061
+  xy: 565, 1069
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5666,14 +5666,14 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 629, 1061
+  xy: 581, 1069
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 645, 1061
+  xy: 565, 1053
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5687,56 +5687,56 @@ icon-grid
   index: -1
 icon-hold
   rotate: false
-  xy: 1335, 1277
+  xy: 1321, 1435
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 1321, 1435
+  xy: 547, 983
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 467, 1003
+  xy: 581, 1053
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 483, 1003
+  xy: 597, 1061
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 465, 541
+  xy: 216, 1727
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 467, 987
+  xy: 613, 1061
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 427, 351
+  xy: 2036, 1843
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 403, 33
+  xy: 1315, 1345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5750,21 +5750,21 @@ icon-line
   index: -1
 icon-link
   rotate: false
-  xy: 467, 971
+  xy: 629, 1061
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 443, 367
+  xy: 1347, 1277
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 483, 987
+  xy: 645, 1061
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5792,28 +5792,28 @@ icon-loading
   index: -1
 icon-locked
   rotate: false
-  xy: 465, 589
+  xy: 465, 631
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 409, 67
+  xy: 547, 971
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 499, 995
+  xy: 467, 1003
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 403, 55
+  xy: 228, 1727
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5827,7 +5827,7 @@ icon-menu-large
   index: -1
 icon-missing
   rotate: false
-  xy: 216, 1727
+  xy: 428, 417
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5841,287 +5841,287 @@ icon-mission-background
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 2036, 1843
+  xy: 427, 405
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 1347, 1277
+  xy: 427, 393
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 427, 339
+  xy: 427, 381
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 403, 43
+  xy: 427, 369
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 1315, 1345
+  xy: 1335, 1289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-paste
   rotate: false
-  xy: 465, 571
+  xy: 465, 613
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 228, 1727
+  xy: 427, 357
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 465, 553
+  xy: 465, 595
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 467, 955
+  xy: 483, 1003
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 431, 503
+  xy: 465, 577
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 427, 327
+  xy: 427, 345
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 483, 971
+  xy: 467, 987
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 427, 315
+  xy: 427, 333
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 427, 303
+  xy: 427, 321
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 499, 979
+  xy: 467, 971
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 428, 485
+  xy: 449, 537
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 515, 995
+  xy: 483, 987
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 483, 955
+  xy: 499, 995
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 428, 467
+  xy: 428, 519
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 499, 963
+  xy: 467, 955
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 515, 979
+  xy: 483, 971
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 531, 995
+  xy: 499, 979
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 515, 963
+  xy: 515, 995
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 531, 979
+  xy: 483, 955
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 446, 485
+  xy: 428, 501
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 428, 449
+  xy: 446, 519
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 427, 291
+  xy: 427, 309
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 446, 467
+  xy: 428, 483
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 547, 995
+  xy: 499, 963
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 427, 279
+  xy: 427, 297
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 427, 267
+  xy: 427, 285
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 531, 963
+  xy: 515, 979
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 428, 431
+  xy: 446, 501
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 547, 979
+  xy: 531, 995
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 547, 963
+  xy: 515, 963
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 428, 413
+  xy: 446, 483
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocked
   rotate: false
-  xy: 428, 395
+  xy: 446, 465
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 428, 379
+  xy: 531, 979
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 444, 379
+  xy: 547, 995
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 446, 395
+  xy: 446, 447
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 427, 363
+  xy: 531, 963
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6135,7 +6135,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 465, 740
+  xy: 397, 71
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -6166,7 +6166,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 465, 661
+  xy: 465, 703
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -6190,7 +6190,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 465, 698
+  xy: 465, 740
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -6198,14 +6198,14 @@ scroll-knob-vertical-black
   index: -1
 sector-edge
   rotate: false
-  xy: 1917, 1467
+  xy: 1917, 1433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sector-select
   rotate: false
-  xy: 1917, 1433
+  xy: 1917, 1399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6226,21 +6226,21 @@ slider
   index: -1
 slider-knob
   rotate: false
-  xy: 397, 465
+  xy: 397, 499
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 397, 425
+  xy: 397, 459
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 397, 385
+  xy: 397, 419
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
@@ -6290,13 +6290,6 @@ alpha-drone
   orig: 48, 48
   offset: 0, 0
   index: -1
-unit-icon-alpha-drone
-  rotate: false
-  xy: 1998, 1867
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
 dagger
   rotate: false
   xy: 785, 1490
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index f42c2663f7..0f7056fd41 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/tools/build.gradle b/tools/build.gradle
index efff317f98..af81536264 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -7,7 +7,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.tools.texturepacker.TexturePacker
 
 import javax.imageio.ImageIO
-import java.awt.image.BufferedImage
+import java.awt.image.BufferedImage 
 
 def outFolder = "../core/assets-raw/sprites_out/"
 def genFolder = "../core/assets-raw/sprites_out/generated/"
@@ -123,7 +123,7 @@ task scaleSprites(){
 
 task pack(){
     dependsOn 'cleanSprites', 'scaleSprites'
-    finalizedBy 'cleanup'
+    //finalizedBy 'cleanup'
 
     doLast{