diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png b/core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png
new file mode 100644
index 0000000000..79a5b53632
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png differ
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 3f58eb636e..a04ef3df0d 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -198,12 +198,12 @@ server.outdated = [crimson]伺服器版本過舊！[]
 server.outdated.client = [crimson]客戶端版本過舊！[]
 server.version = [gray]v{0} {1}
 server.custombuild = [accent]自訂客戶端
-confirmban = 您確定要封禁該玩家嗎？
-confirmkick = 您確定要踢出該玩家嗎？
-confirmvotekick = 您確定要投票剔除該名玩家嗎?
-confirmunban = 您確定要解除封禁該玩家嗎？
-confirmadmin = 您確定要晉升這個玩家為管理員嗎？
-confirmunadmin = 您確定要解除這個玩家的管理員嗎？
+confirmban = 您確定要封禁「[white]{0}[]」嗎？
+confirmkick = 您確定要踢出「[white]{0}[]」嗎？
+confirmvotekick = 您確定要投票剔除「[white]{0}[]」嗎?
+confirmunban = 您確定要解除封禁這個玩家嗎？
+confirmadmin = 您確定要晉升「[white]{0}[]」為管理員嗎？
+confirmunadmin = 您確定要解除「[white]{0}[]」的管理員嗎？
 joingame.title = 加入遊戲
 joingame.ip = IP位址：
 disconnect = 已中斷連線。
@@ -380,7 +380,7 @@ editor.unsaved = [scarlet]尚未儲存變更！[]\n您確定要退出嗎？
 editor.resizemap = 調整地圖大小
 editor.mapname = 地圖名稱：
 editor.overwrite = [accent]警告！這將會覆蓋現有的地圖。
-editor.overwrite.confirm = [scarlet]警告！[]同名地圖存在，確定要覆蓋現有地圖？
+editor.overwrite.confirm = [scarlet]警告！[]同名地圖存在，確定要覆蓋現有地圖？\n「[accent]{0}[]」
 editor.exists = 具有該名稱的地圖已經存在。
 editor.selectmap = 選取要載入的地圖：
 
diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png
index ed88955a45..da67eb0440 100644
Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 138224f476..6daeb4a479 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,56 +13,56 @@ force-projector-top
   index: -1
 mend-projector-top
   rotate: false
-  xy: 719, 534
+  xy: 785, 600
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 1832, 795
+  xy: 1315, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overdrive-projector-top
   rotate: false
-  xy: 719, 468
+  xy: 785, 534
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shock-mine
   rotate: false
-  xy: 1558, 777
+  xy: 1473, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1145, 489
+  xy: 691, 302
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1077, 387
+  xy: 725, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1111, 421
+  xy: 793, 302
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1145, 455
+  xy: 759, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -104,490 +104,497 @@ armored-conveyor-0-3
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 1673, 991
+  xy: 1222, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 1757, 1033
+  xy: 1264, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 163, 708
+  xy: 1306, 869
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 1013, 1422
+  xy: 163, 708
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 35, 4
+  xy: 1013, 1422
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 589, 317
+  xy: 1348, 915
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 1707, 991
+  xy: 1386, 953
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 1791, 1033
+  xy: 35, 4
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 69, 4
+  xy: 589, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 623, 317
+  xy: 1222, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 657, 317
+  xy: 1420, 953
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 555, 283
+  xy: 69, 4
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 555, 249
+  xy: 623, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 589, 283
+  xy: 1222, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 623, 283
+  xy: 1454, 953
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 589, 249
+  xy: 657, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1179, 353
+  xy: 929, 236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1179, 319
+  xy: 963, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1009, 285
+  xy: 963, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1043, 285
+  xy: 997, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1077, 285
+  xy: 1031, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1111, 285
+  xy: 1065, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1145, 285
+  xy: 1099, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1179, 285
+  xy: 1133, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 545, 1279
+  xy: 1167, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 691, 302
+  xy: 1201, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 725, 302
+  xy: 1235, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 691, 268
+  xy: 997, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 759, 302
+  xy: 1031, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 725, 268
+  xy: 1065, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 793, 302
+  xy: 1099, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 759, 268
+  xy: 1133, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 827, 302
+  xy: 1167, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 793, 268
+  xy: 1201, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 861, 302
+  xy: 1235, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0-0
   rotate: false
-  xy: 1218, 769
+  xy: 1373, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1-0
   rotate: false
-  xy: 1218, 735
+  xy: 1383, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2-0
   rotate: false
-  xy: 1252, 769
+  xy: 1383, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-3-0
   rotate: false
-  xy: 1218, 701
+  xy: 1399, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-4-0
   rotate: false
-  xy: 1252, 735
+  xy: 1417, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-5-0
   rotate: false
-  xy: 1218, 667
+  xy: 1417, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-6-0
   rotate: false
-  xy: 1252, 701
+  xy: 1303, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-7-0
   rotate: false
-  xy: 1252, 667
+  xy: 1303, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1456, 675
+  xy: 1473, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1490, 709
+  xy: 1473, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1524, 743
+  xy: 1473, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1490, 675
+  xy: 1897, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1524, 709
+  xy: 1897, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1558, 743
+  xy: 1897, 1039
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1524, 675
+  xy: 1931, 1115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1558, 709
+  xy: 1931, 1081
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1558, 675
+  xy: 1965, 1115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1592, 751
+  xy: 1931, 1047
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1592, 717
+  xy: 1965, 1081
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1592, 683
+  xy: 1999, 1115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1218, 633
+  xy: 1965, 1047
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1252, 633
+  xy: 1999, 1081
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1286, 641
+  xy: 1999, 1047
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1320, 641
+  xy: 1931, 1013
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1354, 641
+  xy: 1965, 1013
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1388, 641
+  xy: 1999, 1013
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1422, 641
+  xy: 1340, 847
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 895, 297
+  xy: 1177, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-mass-conveyor-edge
+mass-conveyor
   rotate: false
   xy: 583, 1373
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-mass-conveyor-top
+mass-conveyor-edge
   rotate: false
   xy: 681, 1373
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+mass-conveyor-top
+  rotate: false
+  xy: 779, 1358
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 mass-driver-base
   rotate: false
-  xy: 877, 1358
+  xy: 583, 1275
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1866, 761
+  xy: 1349, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1218, 803
+  xy: 1349, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1252, 803
+  xy: 1365, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 1490, 641
+  xy: 1358, 813
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -622,14 +629,14 @@ blast-drill-top
   index: -1
 drill-top
   rotate: false
-  xy: 732, 864
+  xy: 798, 930
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 turbine-generator-liquid
   rotate: false
-  xy: 732, 864
+  xy: 798, 930
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -664,308 +671,308 @@ laser-drill-top
   index: -1
 mechanical-drill
   rotate: false
-  xy: 798, 666
+  xy: 864, 666
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-rotator
   rotate: false
-  xy: 864, 666
+  xy: 719, 600
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-top
   rotate: false
-  xy: 719, 600
+  xy: 719, 534
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 oil-extractor
   rotate: false
-  xy: 583, 1275
+  xy: 681, 1275
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-liquid
   rotate: false
-  xy: 681, 1275
+  xy: 779, 1260
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-rotator
   rotate: false
-  xy: 779, 1260
+  xy: 877, 1260
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-top
   rotate: false
-  xy: 877, 1260
+  xy: 975, 1317
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 pneumatic-drill
   rotate: false
-  xy: 785, 402
+  xy: 851, 468
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-rotator
   rotate: false
-  xy: 851, 468
+  xy: 851, 402
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-top
   rotate: false
-  xy: 851, 402
+  xy: 719, 336
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 1403, 1103
+  xy: 1469, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 1469, 1169
+  xy: 1403, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 1403, 1037
+  xy: 1469, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 1469, 1103
+  xy: 1535, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 1688, 923
+  xy: 555, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1150, 795
+  xy: 1101, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1077, 557
+  xy: 1324, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1077, 319
+  xy: 725, 234
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 place-arrow
   rotate: false
-  xy: 1073, 1317
+  xy: 975, 1219
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1179, 523
+  xy: 725, 302
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1179, 523
+  xy: 725, 302
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1009, 319
+  xy: 691, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1043, 353
+  xy: 759, 302
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1043, 319
+  xy: 793, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1077, 353
+  xy: 861, 302
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1111, 387
+  xy: 827, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1145, 421
+  xy: 861, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1145, 421
+  xy: 861, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1145, 421
+  xy: 861, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1145, 421
+  xy: 861, 268
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1179, 455
+  xy: 691, 234
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1111, 353
+  xy: 759, 234
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1145, 387
+  xy: 793, 234
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1179, 421
+  xy: 827, 234
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1111, 319
+  xy: 861, 234
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1111, 319
+  xy: 861, 234
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1145, 353
+  xy: 895, 270
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1179, 387
+  xy: 929, 270
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1145, 319
+  xy: 895, 236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1832, 829
+  xy: 1305, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1866, 829
+  xy: 1339, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1594, 785
+  xy: 1263, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1628, 786
+  xy: 1297, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1662, 787
+  xy: 1331, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -993,140 +1000,140 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1866, 795
+  xy: 1315, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1798, 761
+  xy: 1269, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1832, 761
+  xy: 1269, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1286, 777
+  xy: 1337, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1320, 777
+  xy: 1337, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1286, 743
+  xy: 1371, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1354, 777
+  xy: 1371, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1286, 709
+  xy: 1405, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1320, 743
+  xy: 1405, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1388, 777
+  xy: 1269, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1286, 675
+  xy: 1303, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1354, 743
+  xy: 1371, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1422, 777
+  xy: 1405, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1320, 675
+  xy: 1439, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1354, 709
+  xy: 1439, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1388, 743
+  xy: 1439, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1456, 777
+  xy: 1337, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alpha-mech-pad
   rotate: false
-  xy: 477, 1285
+  xy: 583, 1499
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dart-ship-pad
   rotate: false
-  xy: 743, 996
+  xy: 809, 996
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 delta-mech-pad
   rotate: false
-  xy: 809, 996
+  xy: 875, 996
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1140,42 +1147,42 @@ glaive-ship-pad
   index: -1
 javelin-ship-pad
   rotate: false
-  xy: 798, 732
+  xy: 864, 798
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 omega-mech-pad
   rotate: false
-  xy: 975, 1317
+  xy: 1073, 1317
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 tau-mech-pad
   rotate: false
-  xy: 1337, 1169
+  xy: 1271, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident-ship-pad
   rotate: false
-  xy: 1403, 1169
+  xy: 1337, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 657, 283
+  xy: 1222, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-full
   rotate: false
-  xy: 657, 283
+  xy: 1222, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1203,14 +1210,14 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 623, 249
+  xy: 1488, 953
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1179, 489
+  xy: 827, 302
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1231,14 +1238,14 @@ differential-generator-top
   index: -1
 diode-arrow
   rotate: false
-  xy: 929, 297
+  xy: 1177, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 895, 229
+  xy: 1216, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1294,35 +1301,35 @@ impact-reactor-plasma-3
   index: -1
 power-source
   rotate: false
-  xy: 1320, 709
+  xy: 1337, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1422, 709
+  xy: 1381, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-reactor-center
   rotate: false
-  xy: 1367, 1235
+  xy: 1465, 1235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-lights
   rotate: false
-  xy: 1465, 1235
+  xy: 1563, 1235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 turbine-generator-top
   rotate: false
-  xy: 1337, 1037
+  xy: 1403, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1350,182 +1357,182 @@ alloy-smelter-top
   index: -1
 blast-mixer
   rotate: false
-  xy: 583, 1499
+  xy: 479, 1211
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-blast-mixer-full
   rotate: false
-  xy: 583, 1499
+  xy: 479, 1211
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 809, 1194
+  xy: 743, 1062
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 743, 1062
+  xy: 809, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 809, 1128
+  xy: 875, 1194
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 875, 1194
+  xy: 809, 1062
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 809, 1062
+  xy: 875, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 875, 1128
+  xy: 875, 1062
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 kiln-top
   rotate: false
-  xy: 864, 798
+  xy: 864, 732
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-smelter-top
   rotate: false
-  xy: 864, 798
+  xy: 864, 732
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver
   rotate: false
-  xy: 851, 600
+  xy: 719, 402
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-bottom
   rotate: false
-  xy: 719, 402
+  xy: 785, 468
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-weave
   rotate: false
-  xy: 785, 468
+  xy: 851, 534
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor-top
   rotate: false
-  xy: 851, 534
+  xy: 785, 402
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 1354, 675
+  xy: 1371, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1388, 709
+  xy: 1405, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1422, 743
+  xy: 1439, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 1073, 1087
+  xy: 1073, 1021
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-spinner
   rotate: false
-  xy: 1073, 1021
+  xy: 1139, 1153
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press
   rotate: false
-  xy: 1139, 1087
+  xy: 1139, 1021
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame0
   rotate: false
-  xy: 1139, 1021
+  xy: 1205, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame1
   rotate: false
-  xy: 1205, 1169
+  xy: 1205, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame2
   rotate: false
-  xy: 1205, 1103
+  xy: 1271, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-liquid
   rotate: false
-  xy: 1271, 1169
+  xy: 1205, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-top
   rotate: false
-  xy: 1205, 1037
+  xy: 1271, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 1524, 641
+  xy: 1358, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1539,14 +1546,14 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 657, 249
+  xy: 1522, 953
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-2
   rotate: false
-  xy: 479, 1219
+  xy: 479, 1145
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1567,14 +1574,14 @@ block-4
   index: -1
 hail-heat
   rotate: false
-  xy: 1288, 845
+  xy: 930, 671
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 732, 666
+  xy: 798, 666
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1588,112 +1595,112 @@ meltdown-heat
   index: -1
 ripple-heat
   rotate: false
-  xy: 1073, 1219
+  xy: 1171, 1235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 salvo-heat
   rotate: false
-  xy: 851, 336
+  xy: 941, 1153
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-panel-left
   rotate: false
-  xy: 941, 1153
+  xy: 941, 1087
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-panel-right
   rotate: false
-  xy: 941, 1087
+  xy: 1007, 1153
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scorch-heat
   rotate: false
-  xy: 1524, 777
+  xy: 1407, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 1469, 1037
+  xy: 1535, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 command-center
   rotate: false
-  xy: 521, 417
+  xy: 653, 549
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 crawler-factory
   rotate: false
-  xy: 743, 1194
+  xy: 743, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dagger-factory
   rotate: false
-  xy: 743, 1194
+  xy: 743, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 draug-factory
   rotate: false
-  xy: 743, 1194
+  xy: 743, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phantom-factory
   rotate: false
-  xy: 743, 1194
+  xy: 743, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spirit-factory
   rotate: false
-  xy: 743, 1194
+  xy: 743, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wraith-factory
   rotate: false
-  xy: 743, 1194
+  xy: 743, 1128
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 crawler-factory-top
   rotate: false
-  xy: 743, 1128
+  xy: 809, 1194
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dagger-factory-top
   rotate: false
-  xy: 875, 1062
+  xy: 743, 996
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 draug-factory-top
   rotate: false
-  xy: 732, 930
+  xy: 732, 864
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1749,21 +1756,21 @@ ground-factory
   index: -1
 phantom-factory-top
   rotate: false
-  xy: 785, 534
+  xy: 851, 600
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rally-point
   rotate: false
-  xy: 719, 336
+  xy: 785, 336
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 repair-point-base
   rotate: false
-  xy: 1388, 675
+  xy: 1381, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1784,119 +1791,119 @@ revenant-factory-top
   index: -1
 spirit-factory-top
   rotate: false
-  xy: 1139, 1153
+  xy: 1139, 1087
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-factory
   rotate: false
-  xy: 1563, 1235
+  xy: 1661, 1235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 wraith-factory-top
   rotate: false
-  xy: 1535, 1103
+  xy: 1601, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 875, 996
+  xy: 732, 930
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 895, 263
+  xy: 1177, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 insulator-wall
   rotate: false
-  xy: 929, 229
+  xy: 1250, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 insulator-wall-large
   rotate: false
-  xy: 864, 864
+  xy: 798, 732
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-huge2
   rotate: false
-  xy: 1171, 1235
+  xy: 1269, 1235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-huge3
   rotate: false
-  xy: 1269, 1235
+  xy: 1367, 1235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-large1
   rotate: false
-  xy: 941, 1021
+  xy: 1007, 1087
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large2
   rotate: false
-  xy: 1007, 1087
+  xy: 1073, 1153
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large3
   rotate: false
-  xy: 1073, 1153
+  xy: 1007, 1021
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large4
   rotate: false
-  xy: 1007, 1021
+  xy: 1073, 1087
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1422, 675
+  xy: 1433, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1456, 709
+  xy: 1451, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1490, 743
+  xy: 1451, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1490, 743
+  xy: 1451, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1945,7 +1952,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 930, 647
+  xy: 1080, 921
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -1959,7 +1966,7 @@ laser
   index: -1
 laser-end
   rotate: false
-  xy: 1661, 1259
+  xy: 1759, 1259
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
@@ -1973,7 +1980,7 @@ minelaser
   index: -1
 minelaser-end
   rotate: false
-  xy: 1735, 1259
+  xy: 477, 1277
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
@@ -1994,7 +2001,7 @@ missile-back
   index: -1
 particle
   rotate: false
-  xy: 1715, 1025
+  xy: 1306, 903
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2015,28 +2022,28 @@ shell
   index: -1
 shell-back
   rotate: false
-  xy: 543, 1313
+  xy: 1348, 949
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 1073, 1536
+  xy: 1833, 1283
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1456, 641
+  xy: 1374, 847
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 895, 331
+  xy: 1600, 1038
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -2050,7 +2057,7 @@ arc
   index: -1
 block-arc-full
   rotate: false
-  xy: 1688, 957
+  xy: 1556, 954
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2064,140 +2071,140 @@ block-blast-drill-full
   index: -1
 block-bridge-conduit-full
   rotate: false
-  xy: 1688, 889
+  xy: 555, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1688, 889
+  xy: 555, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conveyor-full
   rotate: false
-  xy: 1722, 957
+  xy: 589, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1722, 957
+  xy: 589, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 1722, 923
+  xy: 623, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliff-full
   rotate: false
-  xy: 1722, 889
+  xy: 589, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 1741, 991
+  xy: 657, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-coal-centrifuge-full
   rotate: false
-  xy: 479, 1153
+  xy: 479, 1079
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 coal-centrifuge
   rotate: false
-  xy: 479, 1153
+  xy: 479, 1079
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-combustion-generator-full
   rotate: false
-  xy: 1775, 999
+  xy: 623, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 1775, 999
+  xy: 623, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conduit-full
   rotate: false
-  xy: 1756, 957
+  xy: 657, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-container-full
   rotate: false
-  xy: 479, 1087
+  xy: 479, 1013
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 container
   rotate: false
-  xy: 479, 1087
+  xy: 479, 1013
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 1756, 923
+  xy: 1590, 954
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1756, 923
+  xy: 1590, 954
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-full
   rotate: false
-  xy: 1756, 889
+  xy: 1348, 881
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 1756, 889
+  xy: 1348, 881
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-large-full
   rotate: false
-  xy: 479, 1021
+  xy: 131, 4
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 copper-wall-large
   rotate: false
-  xy: 479, 1021
+  xy: 131, 4
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2246,21 +2253,21 @@ core-shard
   index: -1
 block-craters-full
   rotate: false
-  xy: 1809, 999
+  xy: 1841, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cryofluidmixer-full
   rotate: false
-  xy: 131, 4
+  xy: 545, 1209
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-cultivator-full
   rotate: false
-  xy: 545, 1209
+  xy: 611, 1209
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2274,77 +2281,77 @@ block-cyclone-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 1790, 965
+  xy: 1875, 1175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-1-full
   rotate: false
-  xy: 1790, 931
+  xy: 1909, 1183
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-2-full
   rotate: false
-  xy: 1790, 897
+  xy: 1943, 1183
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-3-full
   rotate: false
-  xy: 1825, 1033
+  xy: 1977, 1183
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-4-full
   rotate: false
-  xy: 1824, 965
+  xy: 2011, 1183
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-5-full
   rotate: false
-  xy: 1824, 931
+  xy: 1833, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-6-full
   rotate: false
-  xy: 1824, 897
+  xy: 1867, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1843, 999
+  xy: 1659, 1135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-full
   rotate: false
-  xy: 1858, 965
+  xy: 1693, 1143
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-water-full
   rotate: false
-  xy: 1858, 931
+  xy: 1727, 1143
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-deepwater-full
   rotate: false
-  xy: 1858, 897
+  xy: 1659, 1101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2365,70 +2372,70 @@ differential-generator
   index: -1
 block-diode-full
   rotate: false
-  xy: 1038, 829
+  xy: 1693, 1109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 1038, 829
+  xy: 1693, 1109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-distributor-full
   rotate: false
-  xy: 611, 1209
+  xy: 545, 1143
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 distributor
   rotate: false
-  xy: 611, 1209
+  xy: 545, 1143
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-door-full
   rotate: false
-  xy: 1072, 829
+  xy: 1727, 1109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 1072, 829
+  xy: 1727, 1109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-door-large-full
   rotate: false
-  xy: 545, 1143
+  xy: 677, 1209
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-large
   rotate: false
-  xy: 545, 1143
+  xy: 677, 1209
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 1106, 829
+  xy: 1761, 1117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 1140, 829
+  xy: 1795, 1117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2456,21 +2463,21 @@ block-fuse-full
   index: -1
 block-graphite-press-full
   rotate: false
-  xy: 677, 1209
+  xy: 611, 1143
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 graphite-press
   rotate: false
-  xy: 677, 1209
+  xy: 611, 1143
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-grass-full
   rotate: false
-  xy: 1174, 829
+  xy: 1829, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2484,63 +2491,63 @@ block-ground-factory-full
   index: -1
 block-hail-full
   rotate: false
-  xy: 1288, 811
+  xy: 1863, 1107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1322, 811
+  xy: 1080, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1356, 811
+  xy: 1114, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1390, 811
+  xy: 1148, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1424, 811
+  xy: 1075, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1458, 811
+  xy: 1075, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 1492, 811
+  xy: 1109, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-illuminator-full
   rotate: false
-  xy: 1526, 811
+  xy: 1075, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1526, 811
+  xy: 1075, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2554,91 +2561,91 @@ block-impact-reactor-full
   index: -1
 block-incinerator-full
   rotate: false
-  xy: 1560, 811
+  xy: 1109, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 1560, 811
+  xy: 1109, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-inverted-sorter-full
   rotate: false
-  xy: 1790, 863
+  xy: 1143, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1790, 863
+  xy: 1143, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-source-full
   rotate: false
-  xy: 1824, 863
+  xy: 1075, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1824, 863
+  xy: 1075, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-void-full
   rotate: false
-  xy: 1858, 863
+  xy: 1109, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1858, 863
+  xy: 1109, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-junction-full
   rotate: false
-  xy: 980, 813
+  xy: 1143, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 980, 813
+  xy: 1143, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-kiln-full
   rotate: false
-  xy: 611, 1143
+  xy: 545, 1077
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 kiln
   rotate: false
-  xy: 611, 1143
+  xy: 545, 1077
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-lancer-full
   rotate: false
-  xy: 545, 1077
+  xy: 677, 1143
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2680,35 +2687,35 @@ launch-pad-large
   index: -1
 block-liquid-junction-full
   rotate: false
-  xy: 980, 779
+  xy: 1075, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 980, 779
+  xy: 1075, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 980, 745
+  xy: 1109, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-source-full
   rotate: false
-  xy: 980, 711
+  xy: 1143, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 980, 711
+  xy: 1143, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2722,21 +2729,21 @@ block-liquid-tank-full
   index: -1
 block-liquid-void-full
   rotate: false
-  xy: 980, 677
+  xy: 1109, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 980, 677
+  xy: 1109, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 1014, 795
+  xy: 1143, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2748,7 +2755,7 @@ block-mass-conveyor-full
   orig: 96, 96
   offset: 0, 0
   index: -1
-mass-conveyor
+mass-conveyor-icon
   rotate: false
   xy: 1545, 1431
   size: 96, 96
@@ -2764,21 +2771,21 @@ block-mass-driver-full
   index: -1
 block-mechanical-drill-full
   rotate: false
-  xy: 677, 1143
+  xy: 611, 1077
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-mechanical-pump-full
   rotate: false
-  xy: 1048, 795
+  xy: 1143, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1048, 795
+  xy: 1143, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2792,98 +2799,98 @@ block-meltdown-full
   index: -1
 block-melter-full
   rotate: false
-  xy: 1014, 761
+  xy: 1182, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1014, 761
+  xy: 1182, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mend-projector-full
   rotate: false
-  xy: 611, 1077
+  xy: 677, 1077
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mend-projector
   rotate: false
-  xy: 611, 1077
+  xy: 677, 1077
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-mender-full
   rotate: false
-  xy: 1082, 795
+  xy: 1067, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 1082, 795
+  xy: 1067, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-message-full
   rotate: false
-  xy: 1014, 727
+  xy: 1067, 395
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1014, 727
+  xy: 1067, 395
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-2-full
   rotate: false
-  xy: 1048, 761
+  xy: 1101, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-3-full
   rotate: false
-  xy: 1116, 795
+  xy: 1101, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-5-full
   rotate: false
-  xy: 1014, 693
+  xy: 1135, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1048, 727
+  xy: 1135, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-full
   rotate: false
-  xy: 1082, 761
+  xy: 1067, 361
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1048, 693
+  xy: 1135, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2911,294 +2918,294 @@ block-oil-extractor-full
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1082, 727
+  xy: 1009, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1116, 761
+  xy: 1256, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1082, 693
+  xy: 1256, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1116, 727
+  xy: 1256, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1150, 761
+  xy: 1256, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1116, 693
+  xy: 1298, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-overdrive-projector-full
   rotate: false
-  xy: 677, 1077
+  xy: 545, 1011
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overdrive-projector
   rotate: false
-  xy: 677, 1077
+  xy: 545, 1011
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-overflow-gate-full
   rotate: false
-  xy: 1150, 727
+  xy: 1290, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 1150, 727
+  xy: 1290, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1150, 693
+  xy: 1290, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conduit-full
   rotate: false
-  xy: 1184, 795
+  xy: 1290, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1184, 795
+  xy: 1290, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conveyor-full
   rotate: false
-  xy: 1184, 761
+  xy: 1290, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1184, 761
+  xy: 1290, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-full
   rotate: false
-  xy: 1184, 727
+  xy: 1909, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1184, 727
+  xy: 1909, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-large-full
   rotate: false
-  xy: 545, 1011
+  xy: 611, 1011
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-wall-large
   rotate: false
-  xy: 545, 1011
+  xy: 611, 1011
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-phase-weaver-full
   rotate: false
-  xy: 611, 1011
+  xy: 677, 1011
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-pine-full
   rotate: false
-  xy: 930, 747
+  xy: 1941, 1217
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-plastanium-compressor-full
   rotate: false
-  xy: 677, 1011
+  xy: 534, 945
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor
   rotate: false
-  xy: 677, 1011
+  xy: 534, 945
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-plastanium-conveyor-full
   rotate: false
-  xy: 1184, 693
+  xy: 1943, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plastanium-wall-full
   rotate: false
-  xy: 1014, 659
+  xy: 1977, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1014, 659
+  xy: 1977, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plastanium-wall-large-full
   rotate: false
-  xy: 534, 945
+  xy: 534, 879
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-wall-large
   rotate: false
-  xy: 534, 945
+  xy: 534, 879
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1048, 659
+  xy: 2011, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pneumatic-drill-full
   rotate: false
-  xy: 534, 879
+  xy: 600, 945
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-power-node-full
   rotate: false
-  xy: 1082, 659
+  xy: 1601, 1077
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 1082, 659
+  xy: 1601, 1077
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-node-large-full
   rotate: false
-  xy: 600, 945
+  xy: 534, 813
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 600, 945
+  xy: 534, 813
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-power-source-full
   rotate: false
-  xy: 1116, 659
+  xy: 1600, 1043
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-void-full
   rotate: false
-  xy: 1150, 659
+  xy: 1605, 1009
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1150, 659
+  xy: 1605, 1009
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1184, 659
+  xy: 1693, 1075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1009, 625
+  xy: 1727, 1075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pyratite-mixer-full
   rotate: false
-  xy: 534, 813
+  xy: 666, 945
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pyratite-mixer
   rotate: false
-  xy: 534, 813
+  xy: 666, 945
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1009, 591
+  xy: 1761, 1083
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3212,133 +3219,133 @@ block-ripple-full
   index: -1
 block-rock-full
   rotate: false
-  xy: 1995, 1743
+  xy: 1991, 1217
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1043, 625
+  xy: 1795, 1083
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-rotary-pump-full
   rotate: false
-  xy: 666, 945
+  xy: 600, 879
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 666, 945
+  xy: 600, 879
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-router-full
   rotate: false
-  xy: 1009, 557
+  xy: 1829, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1009, 557
+  xy: 1829, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-rtg-generator-full
   rotate: false
-  xy: 600, 879
+  xy: 534, 747
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 600, 879
+  xy: 534, 747
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-salt-full
   rotate: false
-  xy: 1043, 591
+  xy: 1863, 1073
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1077, 625
+  xy: 1169, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-salvo-full
   rotate: false
-  xy: 534, 747
+  xy: 666, 879
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1009, 523
+  xy: 1169, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1043, 557
+  xy: 1169, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-water-full
   rotate: false
-  xy: 1077, 591
+  xy: 1009, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1111, 625
+  xy: 1025, 345
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scatter-full
   rotate: false
-  xy: 666, 879
+  xy: 600, 813
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1009, 489
+  xy: 1324, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1043, 523
+  xy: 1324, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1043, 523
+  xy: 1324, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3373,119 +3380,119 @@ scrap-wall-huge1
   index: -1
 block-scrap-wall-large-full
   rotate: false
-  xy: 600, 813
+  xy: 666, 813
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-separator-full
   rotate: false
-  xy: 666, 813
+  xy: 600, 747
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 666, 813
+  xy: 600, 747
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1111, 591
+  xy: 1324, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1145, 625
+  xy: 1290, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1009, 455
+  xy: 1324, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shock-mine-full
   rotate: false
-  xy: 1043, 489
+  xy: 1761, 1049
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1077, 523
+  xy: 1795, 1049
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-silicon-smelter-full
   rotate: false
-  xy: 600, 747
+  xy: 666, 747
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 600, 747
+  xy: 666, 747
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-slag-full
   rotate: false
-  xy: 1111, 557
+  xy: 1829, 1039
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1145, 591
+  xy: 1863, 1039
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-pine-full
   rotate: false
-  xy: 1038, 863
+  xy: 1995, 1643
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrock-full
   rotate: false
-  xy: 1088, 913
+  xy: 1977, 1593
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1179, 625
+  xy: 1059, 327
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-full
   rotate: false
-  xy: 1009, 421
+  xy: 1043, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1009, 421
+  xy: 1043, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3506,21 +3513,21 @@ solar-panel-large
   index: -1
 block-sorter-full
   rotate: false
-  xy: 1043, 455
+  xy: 1043, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1043, 455
+  xy: 1043, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spawn-full
   rotate: false
-  xy: 1077, 489
+  xy: 1077, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3541,119 +3548,119 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1111, 523
+  xy: 1077, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-pine-full
   rotate: false
-  xy: 930, 697
+  xy: 941, 971
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-spore-press-full
   rotate: false
-  xy: 666, 747
+  xy: 534, 681
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1145, 557
+  xy: 1093, 327
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1179, 591
+  xy: 1127, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-surge-tower-full
   rotate: false
-  xy: 534, 681
+  xy: 600, 681
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 surge-tower
   rotate: false
-  xy: 534, 681
+  xy: 600, 681
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-surge-wall-full
   rotate: false
-  xy: 1009, 387
+  xy: 1161, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1009, 387
+  xy: 1161, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-surge-wall-large-full
   rotate: false
-  xy: 600, 681
+  xy: 666, 681
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 surge-wall-large
   rotate: false
-  xy: 600, 681
+  xy: 666, 681
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-swarmer-full
   rotate: false
-  xy: 666, 681
+  xy: 521, 615
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-tainted-water-full
   rotate: false
-  xy: 1043, 421
+  xy: 1111, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tar-full
   rotate: false
-  xy: 1077, 455
+  xy: 1111, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1111, 489
+  xy: 1145, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thermal-generator-full
   rotate: false
-  xy: 521, 615
+  xy: 521, 549
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 521, 615
+  xy: 521, 549
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -3688,28 +3695,28 @@ thorium-reactor
   index: -1
 block-thorium-wall-full
   rotate: false
-  xy: 1145, 523
+  xy: 1145, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1145, 523
+  xy: 1145, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thorium-wall-large-full
   rotate: false
-  xy: 521, 549
+  xy: 587, 615
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 521, 549
+  xy: 587, 615
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -3730,77 +3737,77 @@ thruster
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1179, 557
+  xy: 1179, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1179, 557
+  xy: 1179, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-full
   rotate: false
-  xy: 1009, 353
+  xy: 1179, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall
   rotate: false
-  xy: 1009, 353
+  xy: 1179, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-large-full
   rotate: false
-  xy: 587, 615
+  xy: 521, 483
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titanium-wall-large
   rotate: false
-  xy: 587, 615
+  xy: 521, 483
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-turbine-generator-full
   rotate: false
-  xy: 521, 483
+  xy: 653, 615
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 turbine-generator
   rotate: false
-  xy: 521, 483
+  xy: 653, 615
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-underflow-gate-full
   rotate: false
-  xy: 1043, 387
+  xy: 1195, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-unloader-full
   rotate: false
-  xy: 1077, 421
+  xy: 1213, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1077, 421
+  xy: 1213, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3821,21 +3828,21 @@ vault
   index: -1
 block-water-extractor-full
   rotate: false
-  xy: 653, 615
+  xy: 587, 549
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-water-full
   rotate: false
-  xy: 1111, 455
+  xy: 1213, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-wave-full
   rotate: false
-  xy: 587, 549
+  xy: 521, 417
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -3856,112 +3863,112 @@ block-white-tree-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 827, 268
+  xy: 1634, 1043
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 861, 268
+  xy: 1639, 1009
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 691, 234
+  xy: 1624, 975
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 725, 234
+  xy: 1624, 941
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 759, 234
+  xy: 1658, 975
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 793, 234
+  xy: 1658, 941
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 827, 234
+  xy: 1182, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 861, 234
+  xy: 1177, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-2-0
   rotate: false
-  xy: 653, 549
+  xy: 587, 483
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-1
   rotate: false
-  xy: 587, 483
+  xy: 521, 351
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-2
   rotate: false
-  xy: 521, 351
+  xy: 653, 483
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-3
   rotate: false
-  xy: 653, 483
+  xy: 587, 417
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-4
   rotate: false
-  xy: 587, 417
+  xy: 653, 417
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-5
   rotate: false
-  xy: 653, 417
+  xy: 587, 351
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-6
   rotate: false
-  xy: 587, 351
+  xy: 653, 351
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-7
   rotate: false
-  xy: 653, 351
+  xy: 743, 1194
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -4143,7 +4150,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 929, 263
+  xy: 1222, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4157,21 +4164,21 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 963, 277
+  xy: 1256, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 1330, 845
+  xy: 1025, 421
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 997, 251
+  xy: 1324, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4192,21 +4199,21 @@ item-blast-compound-tiny
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 917, 381
+  xy: 1130, 921
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 1372, 845
+  xy: 1025, 379
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1065, 251
+  xy: 1250, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4227,21 +4234,21 @@ item-coal-tiny
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 917, 331
+  xy: 980, 721
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1414, 845
+  xy: 155, 175
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1133, 251
+  xy: 1211, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4262,21 +4269,21 @@ item-copper-tiny
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1188, 921
+  xy: 1030, 763
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 1456, 845
+  xy: 975, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 963, 209
+  xy: 1211, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4297,21 +4304,21 @@ item-graphite-tiny
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1188, 871
+  xy: 1080, 821
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 1498, 845
+  xy: 967, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1031, 217
+  xy: 1245, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4332,21 +4339,21 @@ item-lead-tiny
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1238, 937
+  xy: 1130, 871
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 1540, 845
+  xy: 1180, 929
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1099, 217
+  xy: 1318, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4360,35 +4367,35 @@ item-metaglass-small
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 479, 1003
+  xy: 1759, 1241
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1238, 887
+  xy: 1080, 771
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 155, 175
+  xy: 1180, 887
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1167, 217
+  xy: 1318, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1936, 1925
+  xy: 551, 1325
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4402,28 +4409,28 @@ item-phase-fabric-tiny
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1288, 937
+  xy: 1130, 821
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 967, 605
+  xy: 1180, 845
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1201, 217
+  xy: 1279, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 1977, 1567
+  xy: 1936, 1925
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4437,28 +4444,28 @@ item-plastanium-tiny
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1288, 887
+  xy: 1130, 771
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 967, 563
+  xy: 1180, 803
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1031, 183
+  xy: 1313, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1809, 1307
+  xy: 1977, 1567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4472,21 +4479,21 @@ item-pyratite-tiny
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1338, 937
+  xy: 1030, 713
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 967, 521
+  xy: 1180, 761
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1099, 183
+  xy: 1313, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4500,28 +4507,28 @@ item-sand-small
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 1761, 1641
+  xy: 1761, 1159
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1338, 887
+  xy: 1080, 721
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 967, 479
+  xy: 1180, 719
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1167, 183
+  xy: 1352, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4535,280 +4542,280 @@ item-scrap-small
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 2003, 1575
+  xy: 895, 318
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1388, 937
+  xy: 1130, 721
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 967, 437
+  xy: 1180, 677
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1582, 853
+  xy: 1347, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 980, 651
+  xy: 555, 223
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 581, 231
+  xy: 1635, 1093
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1388, 887
+  xy: 1783, 1151
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 967, 395
+  xy: 1222, 945
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1650, 855
+  xy: 1211, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 555, 223
+  xy: 1358, 753
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 1809, 1263
+  xy: 1605, 991
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1438, 937
+  xy: 917, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 967, 353
+  xy: 1222, 903
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1718, 855
+  xy: 1203, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1558, 649
+  xy: 1702, 1893
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 1055, 1550
+  xy: 1761, 1641
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1438, 887
+  xy: 1205, 987
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 967, 311
+  xy: 1264, 945
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1594, 819
+  xy: 1237, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1702, 1893
+  xy: 1807, 1535
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 497, 1003
+  xy: 2003, 1575
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 1488, 937
+  xy: 1255, 987
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1659, 1067
+  xy: 1222, 861
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1662, 821
+  xy: 1229, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1807, 1535
+  xy: 609, 1473
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 2027, 1607
+  xy: 1358, 735
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 1488, 887
+  xy: 1305, 987
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lancer
   rotate: false
-  xy: 864, 732
+  xy: 732, 666
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1701, 1067
+  xy: 1264, 903
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1730, 821
+  xy: 1313, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 609, 1473
+  xy: 197, 18
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 1066, 1851
+  xy: 551, 1281
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 1573, 988
+  xy: 1505, 987
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1743, 1067
+  xy: 1306, 945
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1798, 829
+  xy: 1271, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 197, 18
+  xy: 551, 1299
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 599, 231
+  xy: 607, 231
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 1623, 989
+  xy: 1555, 988
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1785, 1067
+  xy: 1222, 819
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1730, 787
+  xy: 1247, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4822,56 +4829,56 @@ liquid-slag-small
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 1055, 1532
+  xy: 1055, 1550
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 1588, 938
+  xy: 980, 671
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1673, 1025
+  xy: 1264, 861
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1798, 795
+  xy: 1281, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 1809, 1281
+  xy: 581, 223
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 515, 1003
+  xy: 2027, 1607
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 1588, 888
+  xy: 1030, 663
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mass-driver
   rotate: false
-  xy: 779, 1358
+  xy: 877, 1358
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -4885,35 +4892,35 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1490, 777
+  xy: 1381, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ripple
   rotate: false
-  xy: 975, 1219
+  xy: 1073, 1219
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 salvo
   rotate: false
-  xy: 785, 336
+  xy: 851, 336
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scatter
   rotate: false
-  xy: 1007, 1153
+  xy: 941, 1021
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 1456, 743
+  xy: 1381, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4927,168 +4934,168 @@ spectre
   index: -1
 swarmer
   rotate: false
-  xy: 1271, 1103
+  xy: 1337, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 1709, 1109
+  xy: 975, 371
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-vanguard-full
   rotate: false
-  xy: 1761, 1209
+  xy: 1025, 613
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 1535, 1169
+  xy: 1469, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 963, 243
+  xy: 1290, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1031, 251
+  xy: 1216, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1099, 251
+  xy: 1211, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1167, 251
+  xy: 1245, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 997, 217
+  xy: 1245, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1065, 217
+  xy: 1284, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1133, 217
+  xy: 1284, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1201, 251
+  xy: 1279, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 997, 183
+  xy: 1313, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1065, 183
+  xy: 1279, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1133, 183
+  xy: 1352, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1201, 183
+  xy: 1347, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1616, 854
+  xy: 1347, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1684, 855
+  xy: 1245, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1752, 855
+  xy: 1203, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1628, 820
+  xy: 1237, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1696, 821
+  xy: 1279, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1764, 821
+  xy: 1347, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1696, 787
+  xy: 1247, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1764, 787
+  xy: 1281, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5116,21 +5123,21 @@ shape-3
   index: -1
 alpha
   rotate: false
-  xy: 988, 913
+  xy: 1995, 1793
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-base
   rotate: false
-  xy: 930, 797
+  xy: 1995, 1743
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-leg
   rotate: false
-  xy: 1995, 1793
+  xy: 1995, 1693
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5158,77 +5165,77 @@ chaos-array-leg
   index: -1
 crawler
   rotate: false
-  xy: 1138, 913
+  xy: 1091, 971
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 1138, 863
+  xy: 1141, 971
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1995, 1643
+  xy: 930, 921
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 1173, 971
+  xy: 930, 871
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 1223, 987
+  xy: 980, 921
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 1273, 987
+  xy: 930, 821
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart
   rotate: false
-  xy: 1323, 987
+  xy: 980, 871
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta
   rotate: false
-  xy: 1373, 987
+  xy: 1030, 921
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-base
   rotate: false
-  xy: 1423, 987
+  xy: 930, 771
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-leg
   rotate: false
-  xy: 1473, 987
+  xy: 980, 821
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug
   rotate: false
-  xy: 1977, 1593
+  xy: 1030, 871
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5256,49 +5263,49 @@ eradicator-leg
   index: -1
 eruptor
   rotate: false
-  xy: 798, 930
+  xy: 732, 798
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 eruptor-base
   rotate: false
-  xy: 732, 798
+  xy: 798, 864
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 eruptor-leg
   rotate: false
-  xy: 798, 864
+  xy: 864, 930
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 fortress
   rotate: false
-  xy: 864, 930
+  xy: 732, 732
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 fortress-base
   rotate: false
-  xy: 732, 732
+  xy: 798, 798
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-base
   rotate: false
-  xy: 732, 732
+  xy: 798, 798
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 fortress-leg
   rotate: false
-  xy: 798, 798
+  xy: 864, 864
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -5319,14 +5326,14 @@ glaive
   index: -1
 javelin
   rotate: false
-  xy: 1523, 987
+  xy: 1355, 987
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-shield
   rotate: false
-  xy: 1538, 937
+  xy: 1405, 987
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5340,42 +5347,42 @@ lich
   index: -1
 omega
   rotate: false
-  xy: 1600, 1039
+  xy: 1601, 1111
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-armor
   rotate: false
-  xy: 785, 600
+  xy: 719, 468
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 omega-base
   rotate: false
-  xy: 941, 963
+  xy: 1667, 1177
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-leg
   rotate: false
-  xy: 999, 963
+  xy: 917, 470
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 phantom
   rotate: false
-  xy: 1057, 963
+  xy: 917, 412
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 1115, 963
+  xy: 917, 354
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5396,105 +5403,105 @@ revenant
   index: -1
 spirit
   rotate: false
-  xy: 1711, 1209
+  xy: 975, 571
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau
   rotate: false
-  xy: 930, 905
+  xy: 1725, 1177
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-base
   rotate: false
-  xy: 1659, 1109
+  xy: 975, 471
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-leg
   rotate: false
-  xy: 1709, 1159
+  xy: 975, 421
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titan
   rotate: false
-  xy: 1271, 1037
+  xy: 1337, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 1337, 1103
+  xy: 1403, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident
   rotate: false
-  xy: 930, 847
+  xy: 1783, 1201
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 vanguard
   rotate: false
-  xy: 1759, 1159
+  xy: 1025, 563
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith
   rotate: false
-  xy: 1238, 837
+  xy: 1025, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 988, 855
+  xy: 1841, 1209
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 1038, 913
+  xy: 1891, 1217
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 bomber-equip
   rotate: false
-  xy: 1995, 1693
+  xy: 991, 971
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 1995, 1693
+  xy: 991, 971
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 1088, 863
+  xy: 1041, 971
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chaos-equip
   rotate: false
-  xy: 1601, 1097
+  xy: 917, 528
   size: 56, 136
   orig: 56, 136
   offset: 0, 0
@@ -5508,70 +5515,70 @@ eradication-equip
   index: -1
 eruption-equip
   rotate: false
-  xy: 917, 589
+  xy: 930, 713
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 917, 539
+  xy: 980, 771
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 917, 481
+  xy: 1030, 813
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 917, 431
+  xy: 1080, 871
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles-equip
   rotate: false
-  xy: 1538, 887
+  xy: 1455, 987
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun-equip
   rotate: false
-  xy: 1638, 939
+  xy: 1080, 671
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles-equip
   rotate: false
-  xy: 1638, 889
+  xy: 1130, 671
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 1661, 1209
+  xy: 975, 621
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 1659, 1159
+  xy: 975, 521
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-blaster-equip
   rotate: false
-  xy: 1759, 1109
+  xy: 1025, 513
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 0060e3f66e..8eade4f1e0 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index aab64f68ad..ddc58efa59 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png
index d263559418..9798603f5e 100644
Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ
diff --git a/core/assets/sprites/sprites6.png b/core/assets/sprites/sprites6.png
index 7bd921b560..665c0ebe18 100644
Binary files a/core/assets/sprites/sprites6.png and b/core/assets/sprites/sprites6.png differ
diff --git a/core/src/mindustry/entities/def/BuilderComp.java b/core/src/mindustry/entities/def/BuilderComp.java
index 3d7bb56660..361a703a21 100644
--- a/core/src/mindustry/entities/def/BuilderComp.java
+++ b/core/src/mindustry/entities/def/BuilderComp.java
@@ -75,7 +75,7 @@ abstract class BuilderComp implements Unitc, DrawLayerFlyingc{
             if(!current.initialized && !current.breaking && Build.validPlace(team(), current.x, current.y, current.block, current.rotation)){
                 boolean hasAll = !Structs.contains(current.block.requirements, i -> !core.items().has(i.item));
 
-                if(hasAll){
+                if(hasAll || state.rules.infiniteResources){
                     Build.beginPlace(team(), current.x, current.y, current.block, current.rotation);
                 }else{
                     current.stuck = true;
diff --git a/core/src/mindustry/entities/def/TileComp.java b/core/src/mindustry/entities/def/TileComp.java
index 6fdeefe611..bd7eb2a312 100644
--- a/core/src/mindustry/entities/def/TileComp.java
+++ b/core/src/mindustry/entities/def/TileComp.java
@@ -26,6 +26,7 @@ import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
+import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
@@ -319,6 +320,40 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
         noSleep();
     }
 
+    public boolean acceptPayload(Tilec source, Payload payload){
+        return false;
+    }
+
+    public void handlePayload(Tilec source, Payload payload){
+
+    }
+
+    /**
+     * Tries dumping a payload.
+     * @param todump payload to dump.
+     * @return whether the payload was moved successfully
+     */
+    public boolean dumpPayload(@NonNull Payload todump){
+        Array<Tilec> proximity = proximity();
+        int dump = rotation();
+
+        if(proximity.size == 0) return false;
+
+        for(int i = 0; i < proximity.size; i++){
+            Tilec other = proximity.get((i + dump) % proximity.size);
+
+            if(other.team() == team() && other.acceptPayload(this, todump)){
+                other.handlePayload(this, todump);
+                incrementDump(proximity.size);
+                return true;
+            }
+
+            incrementDump(proximity.size);
+        }
+
+        return false;
+    }
+
     public void handleItem(Tilec source, Item item){
         items.add(item, 1);
     }
diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java
index e13705301d..f682c0e6f2 100644
--- a/core/src/mindustry/graphics/Drawf.java
+++ b/core/src/mindustry/graphics/Drawf.java
@@ -4,17 +4,31 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 
-import static mindustry.Vars.renderer;
+import static mindustry.Vars.*;
 
 public class Drawf{
 
+    public static void selected(int x, int y, Block block, Color color){
+        Draw.color(color);
+        for(int i = 0; i < 4; i++){
+            Point2 p = Geometry.d8edge[i];
+            float offset = -Math.max(block.size - 1, 0) / 2f * tilesize;
+            Draw.rect("block-select",
+            x*tilesize + block.offset() + offset * p.x,
+            y*tilesize + block.offset() + offset * p.y, i * 90);
+        }
+        Draw.reset();
+    }
+
     public static void shadow(float x, float y, float rad){
         Draw.color(0, 0, 0, 0.4f);
         Draw.rect("circle-shadow", x, y, rad, rad);
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index f962694168..24819ea5cd 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -229,15 +229,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public void drawSelected(int x, int y, Block block, Color color){
-        Draw.color(color);
-        for(int i = 0; i < 4; i++){
-            Point2 p = Geometry.d8edge[i];
-            float offset = -Math.max(block.size - 1, 0) / 2f * tilesize;
-            Draw.rect("block-select",
-                x*tilesize + block.offset() + offset * p.x,
-                y*tilesize + block.offset() + offset * p.y, i * 90);
-        }
-        Draw.reset();
+        Drawf.selected(x, y, block, color);
     }
 
     public void drawBreaking(BuildRequest request){
diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java
index 76926cf89b..62b009c100 100644
--- a/core/src/mindustry/ui/fragments/PlayerListFragment.java
+++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java
@@ -116,9 +116,9 @@ public class PlayerListFragment extends Fragment{
                     t.defaults().size(bs);
 
                     t.addImageButton(Icon.hammer, Styles.clearPartiali,
-                            () -> ui.showConfirm("$confirm", "$confirmban", () -> Call.onAdminRequest(user, AdminAction.ban)));
+                            () -> ui.showConfirm("$confirm", Core.bundle.format("confirmban",  user.name()), () -> Call.onAdminRequest(user, AdminAction.ban)));
                     t.addImageButton(Icon.cancel, Styles.clearPartiali,
-                            () -> ui.showConfirm("$confirm", "$confirmkick", () -> Call.onAdminRequest(user, AdminAction.kick)));
+                            () -> ui.showConfirm("$confirm", Core.bundle.format("confirmkick",  user.name()), () -> Call.onAdminRequest(user, AdminAction.kick)));
 
                     t.row();
 
@@ -128,9 +128,9 @@ public class PlayerListFragment extends Fragment{
                         String id = user.uuid();
 
                         if(netServer.admins.isAdmin(id, connection.address)){
-                            ui.showConfirm("$confirm", "$confirmunadmin", () -> netServer.admins.unAdminPlayer(id));
+                            ui.showConfirm("$confirm", Core.bundle.format("confirmunadmin",  user.name()), () -> netServer.admins.unAdminPlayer(id));
                         }else{
-                            ui.showConfirm("$confirm", "$confirmadmin", () -> netServer.admins.adminPlayer(id, user.usid()));
+                            ui.showConfirm("$confirm", Core.bundle.format("confirmadmin",  user.name()), () -> netServer.admins.adminPlayer(id, user.usid()));
                         }
                     }).update(b -> b.setChecked(user.admin()))
                         .disabled(b -> net.client())
@@ -144,7 +144,7 @@ public class PlayerListFragment extends Fragment{
                 button.add().growY();
 
                 button.addImageButton(Icon.hammer, Styles.clearPartiali,
-                    () -> ui.showConfirm("$confirm", "$confirmvotekick", () -> Call.sendChatMessage("/votekick " + user.name()))).size(h);
+                        () -> ui.showConfirm("$confirm", Core.bundle.format("confirmvotekick",  user.name()), () -> Call.sendChatMessage("/votekick " + user.name()))).size(h);
             }
 
             content.add(button).padBottom(-6).width(350f).maxHeight(h + 14);
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 04ce018c7a..f5ee1aafa8 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -43,6 +43,7 @@ public class Block extends UnlockableContent{
     public boolean outputsLiquid = false;
     public boolean consumesPower = true;
     public boolean outputsPower = false;
+    public boolean outputsPayload = false;
 
     public int itemCapacity = 10;
     public float liquidCapacity = 10f;
diff --git a/core/src/mindustry/world/blocks/distribution/MassConveyor.java b/core/src/mindustry/world/blocks/distribution/MassConveyor.java
index 95708cecf3..fdcd23fec6 100644
--- a/core/src/mindustry/world/blocks/distribution/MassConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/MassConveyor.java
@@ -11,8 +11,8 @@ import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.payloads.*;
 
 import static mindustry.Vars.*;
 
@@ -29,6 +29,7 @@ public class MassConveyor extends Block{
         size = 3;
         rotate = true;
         update = true;
+        outputsPayload = true;
     }
 
     @Override
@@ -39,10 +40,27 @@ public class MassConveyor extends Block{
         edgeRegion = Core.atlas.find(name + "-edge");
     }
 
-    public class MassConveyorEntity extends TileEntity implements MassAcceptor{
+    @Override
+    protected TextureRegion[] generateIcons(){
+        return new TextureRegion[]{Core.atlas.find(name + "-icon")};
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        for(int i = 0; i < 4; i++){
+            Tilec other = world.ent(x + Geometry.d4x[i] * size, y + Geometry.d4y[i] * size);
+            if(other != null && other.block().outputsPayload && other.block().size == size){
+                Drawf.selected(other.tileX(), other.tileY(), other.block(), Pal.accent);
+            }
+        }
+    }
+
+    public class MassConveyorEntity extends TileEntity{
         public @Nullable Payload item;
         public float progress, itemRotation, animation;
-        public @Nullable MassAcceptor next;
+        public @Nullable Tilec next;
         public boolean blocked;
         public int step = -1, stepAccepted = -1;
 
@@ -52,9 +70,9 @@ public class MassConveyor extends Block{
 
             Tilec accept = nearby(Geometry.d4[rotation()].x * size, Geometry.d4[rotation()].y * size);
             //next block must be aligned and of the same size
-            if(accept instanceof MassAcceptor && accept.block().size == size &&
+            if(accept != null && accept.block().size == size &&
                 tileX() + Geometry.d4[rotation()].x * size == accept.tileX() && tileY() + Geometry.d4[rotation()].y * size == accept.tileY()){
-                next = (MassAcceptor)accept;
+                next = accept;
             }
 
             int ntrns = 1 + size/2;
@@ -73,6 +91,7 @@ public class MassConveyor extends Block{
                 animation = 0f;
             }
 
+            //TODO nondeterministic input priority
             int curStep = curStep();
             if(curStep > step){
                 boolean valid = step != -1;
@@ -83,21 +102,21 @@ public class MassConveyor extends Block{
                         //trigger update forward
                         next.updateTile();
 
-                        if(next.acceptMass(item, this)){
+                        if(next.acceptPayload(this, item)){
                             //move forward.
-                            next.handleMass(item, this);
+                            next.handlePayload(this, item);
                             item = null;
                         }
                     }else if(!blocked){
                         //dump item forward
                         float trnext = size * tilesize / 2f, cx = Geometry.d4[rotation()].x, cy = Geometry.d4[rotation()].y, rot = rotation() * 90;
 
-                        item.dump(x + cx * trnext, y + cy * trnext, rotation() * 90);
-                        item = null;
+                        if(item.dump(x + cx * trnext, y + cy * trnext, rotation() * 90)){
+                            item = null;
+                        }
                     }
                 }
             }
-
         }
 
         @Override 
@@ -172,13 +191,13 @@ public class MassConveyor extends Block{
         }
 
         @Override
-        public boolean acceptMass(Payload item, Tilec source){
+        public boolean acceptPayload(Tilec source, Payload payload){
             return this.item == null;
         }
 
         @Override
-        public void handleMass(Payload item, Tilec source){
-            this.item = item;
+        public void handlePayload(Tilec source, Payload payload){
+            this.item = payload;
             this.stepAccepted = curStep();
             this.itemRotation = source.rotation() * 90;
             this.animation = 0;
@@ -189,8 +208,9 @@ public class MassConveyor extends Block{
                 return !blocked || next != null;
             }else{
                 Tilec accept = nearby(Geometry.d4[direction].x * size, Geometry.d4[direction].y * size);
-                return accept instanceof MassAcceptor && accept.block().size == size &&
-                    accept.tileX() + Geometry.d4[accept.rotation()].x * size == tileX() && accept.tileY() + Geometry.d4[accept.rotation()].y * size == tileY();
+                return accept != null && accept.block().size == size && accept.block().outputsPayload &&
+                    //block must either be facing this one, or not be rotating
+                    ((accept.tileX() + Geometry.d4[accept.rotation()].x * size == tileX() && accept.tileY() + Geometry.d4[accept.rotation()].y * size == tileY()) || !accept.block().rotate);
             }
         }
 
@@ -219,7 +239,7 @@ public class MassConveyor extends Block{
         }
 
         int curStep(){
-            return (int)(Time.time() / moveTime);
+            return (int)((Time.time()) / moveTime);
         }
 
         float fract(){
@@ -227,36 +247,4 @@ public class MassConveyor extends Block{
         }
     }
 
-    public interface MassAcceptor extends Tilec{
-        boolean acceptMass(Payload item, Tilec source);
-        void handleMass(Payload item, Tilec source);
-    }
-
-    public interface Payload{
-        void draw(float x, float y, float rotation);
-        void dump(float x, float y, float rotation);
-    }
-
-    public static class UnitPayload implements Payload{
-        public Unitc unit;
-
-        public UnitPayload(Unitc unit){
-            this.unit = unit;
-        }
-
-        @Override
-        public void dump(float x, float y, float rotation){
-            unit.set(x, y);
-            unit.rotation(rotation);
-            unit.add();
-        }
-
-        @Override
-        public void draw(float x, float y, float rotation){
-            Drawf.shadow(x, y, 24);
-            Draw.rect("pneumatic-drill", x, y, rotation);
-            Drawf.shadow(x, y, 20);
-            Draw.rect(unit.type().icon(Cicon.full), x, y, rotation - 90);
-        }
-    }
 }
diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java
new file mode 100644
index 0000000000..4857c7fb56
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/Payload.java
@@ -0,0 +1,12 @@
+package mindustry.world.blocks.payloads;
+
+public interface Payload{
+
+    /** draws this payload at a position. */
+    void draw(float x, float y, float rotation);
+
+    /** @return whether this payload was dumped. */
+    default boolean dump(float x, float y, float rotation){
+        return false;
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/UnitPayload.java b/core/src/mindustry/world/blocks/payloads/UnitPayload.java
new file mode 100644
index 0000000000..918edf85cc
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/UnitPayload.java
@@ -0,0 +1,31 @@
+package mindustry.world.blocks.payloads;
+
+import arc.graphics.g2d.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+
+public class UnitPayload implements Payload{
+    public Unitc unit;
+
+    public UnitPayload(Unitc unit){
+        this.unit = unit;
+    }
+
+    @Override
+    public boolean dump(float x, float y, float rotation){
+        unit.set(x, y);
+        unit.rotation(rotation);
+        unit.add();
+
+        return true;
+    }
+
+    @Override
+    public void draw(float x, float y, float rotation){
+        Drawf.shadow(x, y, 24);
+        Draw.rect("pneumatic-drill", x, y, rotation);
+        Drawf.shadow(x, y, 20);
+        Draw.rect(unit.type().icon(Cicon.full), x, y, rotation - 90);
+    }
+}