diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png
new file mode 100644
index 0000000000..579b161654
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png
new file mode 100644
index 0000000000..51393d3ac5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png
new file mode 100644
index 0000000000..12ca285e12
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png
new file mode 100644
index 0000000000..7dc15898bf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/ice-cliff-edge-1.png
deleted file mode 100644
index 752311f80d..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/ice-cliff-edge-1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/ice-cliff-edge-2.png
deleted file mode 100644
index fb2b33d3f8..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/ice-cliff-edge-2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/ice-cliff-edge.png
deleted file mode 100644
index 2819b78843..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/ice-cliff-edge.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-cliff-side.png b/core/assets-raw/sprites/blocks/environment/ice-cliff-side.png
deleted file mode 100644
index fba14c2f59..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/ice-cliff-side.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/sand-cliff-edge-1.png
deleted file mode 100644
index 7811175144..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/sand-cliff-edge-1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/sand-cliff-edge-2.png
deleted file mode 100644
index 9b19b6e2e4..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/sand-cliff-edge-2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/sand-cliff-edge.png
deleted file mode 100644
index 26a01f04a1..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/sand-cliff-edge.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand-cliff-side.png b/core/assets-raw/sprites/blocks/environment/sand-cliff-side.png
deleted file mode 100644
index 5468b77b59..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/sand-cliff-side.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/snow-cliff-edge-1.png
deleted file mode 100644
index 5355ae6578..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/snow-cliff-edge-1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/snow-cliff-edge-2.png
deleted file mode 100644
index 566b5c2989..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/snow-cliff-edge-2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/snow-cliff-edge.png
deleted file mode 100644
index c99aafe67d..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/snow-cliff-edge.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow-cliff-side.png b/core/assets-raw/sprites/blocks/environment/snow-cliff-side.png
deleted file mode 100644
index 8fb62c768f..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/snow-cliff-side.png and /dev/null differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index f46f7cbe76..1b53a968fa 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,308 +13,308 @@ background
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 333, 5
+  xy: 353, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 343, 15
+  xy: 363, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 353, 25
+  xy: 353, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 967, 356
+  xy: 987, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 977, 356
+  xy: 997, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 967, 346
+  xy: 987, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 977, 346
+  xy: 997, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 987, 355
+  xy: 1007, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 997, 355
+  xy: 1007, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 987, 345
+  xy: 409, 48
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 997, 345
+  xy: 409, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1007, 349
+  xy: 961, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1007, 339
+  xy: 971, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 409, 48
+  xy: 413, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 409, 38
+  xy: 413, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 961, 336
+  xy: 413, 8
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 971, 336
+  xy: 981, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 413, 28
+  xy: 991, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 413, 18
+  xy: 701, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 413, 8
+  xy: 711, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 981, 335
+  xy: 721, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 991, 335
+  xy: 731, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 533, 71
+  xy: 673, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 532, 61
+  xy: 563, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 543, 81
+  xy: 573, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 553, 91
+  xy: 583, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 543, 71
+  xy: 593, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 542, 61
+  xy: 603, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 553, 81
+  xy: 613, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 553, 71
+  xy: 623, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 552, 61
+  xy: 633, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 563, 88
+  xy: 643, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 563, 78
+  xy: 653, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 573, 88
+  xy: 663, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 573, 78
+  xy: 673, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 583, 88
+  xy: 562, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 583, 78
+  xy: 572, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 593, 88
+  xy: 582, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 593, 78
+  xy: 592, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 603, 88
+  xy: 602, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 603, 78
+  xy: 612, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 657, 118
+  xy: 737, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 657, 108
+  xy: 741, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 657, 98
+  xy: 747, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -356,21 +356,21 @@ blast-drill-top
   index: -1
 carbide-drill
   rotate: false
-  xy: 343, 5
+  xy: 363, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-rotator
   rotate: false
-  xy: 353, 15
+  xy: 373, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-top
   rotate: false
-  xy: 363, 25
+  xy: 363, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -454,21 +454,21 @@ plasma-drill-top
   index: -1
 tungsten-drill
   rotate: false
-  xy: 633, 88
+  xy: 662, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-rotator
   rotate: false
-  xy: 633, 78
+  xy: 672, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-top
   rotate: false
-  xy: 643, 88
+  xy: 683, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -559,35 +559,35 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 353, 5
+  xy: 373, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 363, 15
+  xy: 383, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 373, 25
+  xy: 373, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 711, 161
+  xy: 517, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 721, 161
+  xy: 527, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -599,44 +599,72 @@ dirtedge
   orig: 12, 12
   offset: 0, 0
   index: -1
+generic-cliff-edge
+  rotate: false
+  xy: 567, 181
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+generic-cliff-edge-1
+  rotate: false
+  xy: 555, 171
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+generic-cliff-edge-2
+  rotate: false
+  xy: 565, 171
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+generic-cliff-side
+  rotate: false
+  xy: 522, 161
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 grass-cliff-edge
   rotate: false
-  xy: 505, 171
+  xy: 552, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 517, 181
+  xy: 562, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 527, 181
+  xy: 522, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 515, 171
+  xy: 520, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 795, 302
+  xy: 532, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 507, 181
+  xy: 542, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -650,42 +678,42 @@ grassedge
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 547, 181
+  xy: 527, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 535, 171
+  xy: 542, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 557, 181
+  xy: 540, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 545, 171
+  xy: 527, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 537, 181
+  xy: 532, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 525, 171
+  xy: 530, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -699,35 +727,35 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 567, 181
+  xy: 537, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 555, 171
+  xy: 552, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 555, 171
+  xy: 552, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 565, 171
+  xy: 550, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 565, 171
+  xy: 550, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -741,56 +769,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 547, 131
+  xy: 575, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 562, 151
+  xy: 585, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 560, 141
+  xy: 595, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 557, 101
+  xy: 622, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 577, 178
+  xy: 632, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 587, 178
+  xy: 572, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 597, 178
+  xy: 582, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 607, 178
+  xy: 592, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -811,49 +839,49 @@ oiledge
   index: -1
 rock2
   rotate: false
-  xy: 677, 108
+  xy: 533, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 736, 241
+  xy: 543, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 736, 231
+  xy: 553, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 736, 221
+  xy: 543, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 736, 211
+  xy: 542, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 889, 317
+  xy: 533, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 512, 61
+  xy: 532, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -867,49 +895,49 @@ sandedge
   index: -1
 shrubshadow
   rotate: false
-  xy: 741, 201
+  xy: 552, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 737, 171
+  xy: 573, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 741, 161
+  xy: 573, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 747, 181
+  xy: 583, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 747, 171
+  xy: 583, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 741, 191
+  xy: 563, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 737, 181
+  xy: 563, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -930,42 +958,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 871, 295
+  xy: 623, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 881, 295
+  xy: 633, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 893, 307
+  xy: 633, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 523, 91
+  xy: 643, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 873, 305
+  xy: 613, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 883, 305
+  xy: 623, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -979,91 +1007,91 @@ stoneedge
   index: -1
 thorium1
   rotate: false
-  xy: 523, 81
+  xy: 643, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 533, 91
+  xy: 653, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 523, 71
+  xy: 653, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 522, 61
+  xy: 663, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 533, 81
+  xy: 663, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 543, 91
+  xy: 673, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten1
   rotate: false
-  xy: 613, 78
+  xy: 632, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten2
   rotate: false
-  xy: 623, 88
+  xy: 642, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten3
   rotate: false
-  xy: 623, 78
+  xy: 652, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 643, 78
+  xy: 683, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 653, 88
+  xy: 683, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 653, 78
+  xy: 682, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 663, 88
+  xy: 893, 331
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1077,63 +1105,63 @@ wateredge
   index: -1
 block-border
   rotate: false
-  xy: 941, 335
+  xy: 728, 271
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 951, 335
+  xy: 728, 261
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 951, 335
+  xy: 728, 261
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 313, 5
+  xy: 333, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 313, 5
+  xy: 333, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 323, 15
+  xy: 343, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 333, 25
+  xy: 333, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 393, 5
+  xy: 517, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 701, 161
+  xy: 775, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1161,7 +1189,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 785, 302
+  xy: 545, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1175,14 +1203,14 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 672, 159
+  xy: 747, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 682, 159
+  xy: 751, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1308,154 +1336,154 @@ shadow-rounded-2
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 323, 5
+  xy: 343, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 333, 15
+  xy: 353, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 343, 25
+  xy: 343, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 363, 5
+  xy: 383, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 373, 15
+  xy: 393, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 383, 25
+  xy: 383, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 373, 5
+  xy: 393, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 383, 15
+  xy: 393, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 393, 25
+  xy: 403, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 383, 5
+  xy: 403, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 393, 15
+  xy: 403, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 403, 25
+  xy: 517, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 403, 15
+  xy: 517, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 403, 5
+  xy: 517, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 517, 131
+  xy: 967, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 517, 121
+  xy: 977, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 517, 111
+  xy: 967, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 517, 101
+  xy: 977, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router
   rotate: false
-  xy: 547, 111
+  xy: 582, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 557, 121
+  xy: 592, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 547, 101
+  xy: 602, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 557, 111
+  xy: 612, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1483,70 +1511,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 662, 148
+  xy: 741, 201
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 660, 138
+  xy: 741, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 657, 128
+  xy: 737, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 672, 149
+  xy: 873, 305
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 682, 149
+  xy: 883, 305
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 667, 128
+  xy: 871, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 667, 118
+  xy: 881, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 667, 108
+  xy: 893, 307
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 667, 98
+  xy: 523, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 670, 138
+  xy: 523, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1651,7 +1679,7 @@ nuclear-reactor-lights
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 677, 98
+  xy: 543, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1826,14 +1854,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 537, 121
+  xy: 637, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 617, 178
+  xy: 652, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1875,21 +1903,21 @@ poweralloysmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 680, 139
+  xy: 533, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 677, 128
+  xy: 523, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 731, 201
+  xy: 553, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1903,21 +1931,21 @@ core-open
   index: -1
 sortedunloader
   rotate: false
-  xy: 751, 161
+  xy: 593, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 921, 335
+  xy: 728, 291
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 931, 335
+  xy: 728, 281
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1994,7 +2022,7 @@ mass-driver-turret
   index: -1
 duo
   rotate: false
-  xy: 775, 302
+  xy: 557, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2197,7 +2225,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 677, 118
+  xy: 522, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2218,7 +2246,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 731, 161
+  xy: 535, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2386,7 +2414,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 731, 191
+  xy: 553, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2400,7 +2428,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 613, 88
+  xy: 622, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2412,6 +2440,34 @@ transfer-end
   orig: 18, 18
   offset: 0, 0
   index: -1
+blackstone-cliff-edge
+  rotate: false
+  xy: 921, 335
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+blackstone-cliff-edge-1
+  rotate: false
+  xy: 931, 335
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+blackstone-cliff-edge-2
+  rotate: false
+  xy: 941, 335
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+blackstone-cliff-side
+  rotate: false
+  xy: 951, 335
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 block-icon-arc
   rotate: false
   xy: 151, 107
@@ -2435,49 +2491,49 @@ block-icon-blast-drill
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 728, 291
+  xy: 728, 251
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 728, 291
+  xy: 728, 251
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 728, 281
+  xy: 726, 241
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 728, 281
+  xy: 726, 241
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-drill
   rotate: false
-  xy: 728, 271
+  xy: 726, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-wall
   rotate: false
-  xy: 728, 261
+  xy: 726, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-wall
   rotate: false
-  xy: 728, 261
+  xy: 726, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2512,35 +2568,35 @@ centrifuge
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 728, 251
+  xy: 726, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 728, 251
+  xy: 726, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 726, 241
+  xy: 863, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 726, 231
+  xy: 861, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 726, 231
+  xy: 861, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2596,42 +2652,42 @@ dart-ship-factory
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 726, 221
+  xy: 289, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 726, 221
+  xy: 289, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 726, 211
+  xy: 289, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 726, 211
+  xy: 289, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 726, 211
+  xy: 289, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 726, 211
+  xy: 289, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2680,14 +2736,14 @@ delta-mech-factory
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 863, 309
+  xy: 289, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 863, 309
+  xy: 289, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2708,14 +2764,14 @@ distributor
   index: -1
 block-icon-door
   rotate: false
-  xy: 861, 299
+  xy: 299, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 861, 299
+  xy: 299, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2743,14 +2799,14 @@ block-icon-drone-factory
   index: -1
 block-icon-drop-point
   rotate: false
-  xy: 289, 53
+  xy: 309, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 drop-point
   rotate: false
-  xy: 289, 53
+  xy: 309, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2785,14 +2841,14 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 289, 43
+  xy: 299, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 289, 43
+  xy: 299, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2806,70 +2862,70 @@ block-icon-hail
   index: -1
 block-icon-ice
   rotate: false
-  xy: 289, 33
+  xy: 319, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 289, 33
+  xy: 319, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 299, 55
+  xy: 299, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 299, 55
+  xy: 299, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 309, 55
+  xy: 309, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 309, 55
+  xy: 309, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 299, 45
+  xy: 329, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 299, 45
+  xy: 329, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 319, 55
+  xy: 309, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 319, 55
+  xy: 309, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2890,14 +2946,14 @@ javelin-ship-factory
   index: -1
 block-icon-junction
   rotate: false
-  xy: 299, 35
+  xy: 319, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 299, 35
+  xy: 319, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2918,35 +2974,35 @@ block-icon-laser-drill
   index: -1
 block-icon-lava
   rotate: false
-  xy: 309, 45
+  xy: 339, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 309, 45
+  xy: 339, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 329, 55
+  xy: 319, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 329, 55
+  xy: 319, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 309, 35
+  xy: 329, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2960,14 +3016,14 @@ block-icon-liquid-tank
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 319, 45
+  xy: 349, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 319, 45
+  xy: 349, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2995,14 +3051,14 @@ core-top
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 339, 55
+  xy: 329, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 339, 55
+  xy: 329, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3016,28 +3072,28 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 319, 35
+  xy: 339, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 319, 35
+  xy: 339, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 329, 45
+  xy: 359, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 329, 45
+  xy: 359, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3058,14 +3114,14 @@ nuclear-reactor
   index: -1
 block-icon-oil
   rotate: false
-  xy: 349, 55
+  xy: 339, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 349, 55
+  xy: 339, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3079,42 +3135,42 @@ block-icon-oil-extractor
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 329, 35
+  xy: 349, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 329, 35
+  xy: 349, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 339, 45
+  xy: 369, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 339, 45
+  xy: 369, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 359, 55
+  xy: 349, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 359, 55
+  xy: 349, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3149,14 +3205,14 @@ plastanium-compressor
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 339, 35
+  xy: 359, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 339, 35
+  xy: 359, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3177,42 +3233,42 @@ power-node-large
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 349, 45
+  xy: 379, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 349, 45
+  xy: 379, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 369, 55
+  xy: 359, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 369, 55
+  xy: 359, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 349, 35
+  xy: 369, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 359, 45
+  xy: 389, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3261,28 +3317,28 @@ reconstructor
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 379, 55
+  xy: 369, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 379, 55
+  xy: 369, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-resupply-point
   rotate: false
-  xy: 359, 35
+  xy: 379, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 359, 35
+  xy: 379, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3296,14 +3352,14 @@ block-icon-ripple
   index: -1
 block-icon-rock
   rotate: false
-  xy: 369, 45
+  xy: 379, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 369, 45
+  xy: 379, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3324,14 +3380,14 @@ rotary-pump
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 389, 55
+  xy: 389, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 389, 55
+  xy: 389, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3345,14 +3401,14 @@ block-icon-salvo
   index: -1
 block-icon-sand
   rotate: false
-  xy: 369, 35
+  xy: 389, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 369, 35
+  xy: 389, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3366,28 +3422,28 @@ block-icon-scorch
   index: -1
 block-icon-separator
   rotate: false
-  xy: 379, 45
+  xy: 399, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 379, 45
+  xy: 399, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 379, 35
+  xy: 399, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 379, 35
+  xy: 399, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3408,42 +3464,42 @@ silicon-smelter
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 389, 45
+  xy: 399, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 389, 45
+  xy: 399, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 389, 35
+  xy: 293, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 389, 35
+  xy: 293, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 399, 55
+  xy: 293, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 399, 55
+  xy: 293, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3464,42 +3520,42 @@ solar-panel-large
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 399, 45
+  xy: 293, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 399, 45
+  xy: 293, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 399, 35
+  xy: 303, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 399, 35
+  xy: 303, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 293, 23
+  xy: 303, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 293, 23
+  xy: 303, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3513,28 +3569,28 @@ block-icon-spectre
   index: -1
 block-icon-splitter
   rotate: false
-  xy: 293, 13
+  xy: 313, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 293, 13
+  xy: 313, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-stone
   rotate: false
-  xy: 293, 3
+  xy: 303, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 293, 3
+  xy: 303, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3576,14 +3632,14 @@ thermal-pump
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 303, 25
+  xy: 313, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 303, 25
+  xy: 313, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3604,42 +3660,42 @@ thorium-wall-large
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 303, 15
+  xy: 323, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 303, 15
+  xy: 323, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor
   rotate: false
-  xy: 303, 15
+  xy: 323, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-drill
   rotate: false
-  xy: 313, 25
+  xy: 313, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall
   rotate: false
-  xy: 303, 5
+  xy: 323, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-wall
   rotate: false
-  xy: 303, 5
+  xy: 323, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3674,14 +3730,14 @@ turbine-generator
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 313, 15
+  xy: 333, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 313, 15
+  xy: 333, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3716,14 +3772,14 @@ warp-gate
   index: -1
 block-icon-water
   rotate: false
-  xy: 323, 25
+  xy: 323, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 323, 25
+  xy: 323, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3742,30 +3798,114 @@ block-icon-wave
   orig: 18, 18
   offset: 0, 0
   index: -1
+deepwater-cliff-edge
+  rotate: false
+  xy: 785, 302
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+deepwater-cliff-edge-1
+  rotate: false
+  xy: 795, 302
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+deepwater-cliff-edge-2
+  rotate: false
+  xy: 507, 181
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+deepwater-cliff-side
+  rotate: false
+  xy: 505, 171
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirt-cliff-edge
+  rotate: false
+  xy: 515, 171
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirt-cliff-edge-1
+  rotate: false
+  xy: 537, 181
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirt-cliff-edge-2
+  rotate: false
+  xy: 525, 171
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+dirt-cliff-side
+  rotate: false
+  xy: 547, 181
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+lava-cliff-edge
+  rotate: false
+  xy: 597, 178
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+lava-cliff-edge-1
+  rotate: false
+  xy: 607, 178
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+lava-cliff-edge-2
+  rotate: false
+  xy: 617, 178
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+lava-cliff-side
+  rotate: false
+  xy: 627, 178
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 537, 111
+  xy: 615, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 547, 121
+  xy: 625, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 557, 131
+  xy: 635, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 537, 101
+  xy: 572, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3819,531 +3959,615 @@ mech-icon-tau-mech
   orig: 12, 12
   offset: 0, 0
   index: -1
-ore-coal-grass1
-  rotate: false
-  xy: 627, 178
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-grass2
-  rotate: false
-  xy: 637, 178
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-grass3
-  rotate: false
-  xy: 575, 168
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-ice1
-  rotate: false
-  xy: 585, 168
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-ice2
-  rotate: false
-  xy: 595, 168
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-ice3
-  rotate: false
-  xy: 605, 168
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-sand1
-  rotate: false
-  xy: 615, 168
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-sand2
-  rotate: false
-  xy: 625, 168
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-sand3
-  rotate: false
-  xy: 635, 168
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-snow1
-  rotate: false
-  xy: 572, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-snow2
-  rotate: false
-  xy: 582, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-snow3
-  rotate: false
-  xy: 592, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-stone1
-  rotate: false
-  xy: 602, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-stone2
-  rotate: false
-  xy: 612, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-coal-stone3
-  rotate: false
-  xy: 622, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-lead-grass1
-  rotate: false
-  xy: 632, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-lead-grass2
-  rotate: false
-  xy: 572, 148
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-lead-grass3
-  rotate: false
-  xy: 582, 148
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-lead-ice1
-  rotate: false
-  xy: 592, 148
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-lead-ice2
+metalfloor-cliff-edge
   rotate: false
   xy: 602, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-ice3
+metalfloor-cliff-edge-1
   rotate: false
   xy: 612, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-sand1
+metalfloor-cliff-edge-2
   rotate: false
   xy: 622, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-sand2
+metalfloor-cliff-side
   rotate: false
   xy: 632, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-sand3
+oil-cliff-edge
   rotate: false
   xy: 645, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-snow1
+oil-cliff-edge-1
   rotate: false
   xy: 655, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-snow2
+oil-cliff-edge-2
   rotate: false
   xy: 642, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-snow3
+oil-cliff-side
   rotate: false
   xy: 642, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-stone1
-  rotate: false
-  xy: 652, 158
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-lead-stone2
+ore-coal-grass1
   rotate: false
   xy: 652, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-lead-stone3
+ore-coal-grass2
   rotate: false
   xy: 570, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-grass1
+ore-coal-grass3
   rotate: false
   xy: 580, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-grass2
+ore-coal-ice1
   rotate: false
   xy: 590, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-grass3
+ore-coal-ice2
   rotate: false
   xy: 600, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-ice1
+ore-coal-ice3
   rotate: false
   xy: 610, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-ice2
+ore-coal-sand1
   rotate: false
   xy: 620, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-ice3
+ore-coal-sand2
   rotate: false
   xy: 630, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-sand1
+ore-coal-sand3
   rotate: false
   xy: 640, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-sand2
+ore-coal-snow1
   rotate: false
   xy: 650, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-sand3
+ore-coal-snow2
   rotate: false
   xy: 567, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-snow1
+ore-coal-snow3
   rotate: false
   xy: 567, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-snow2
+ore-coal-stone1
   rotate: false
   xy: 577, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-snow3
+ore-coal-stone2
   rotate: false
   xy: 567, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-stone1
+ore-coal-stone3
   rotate: false
   xy: 577, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-stone2
+ore-lead-grass1
   rotate: false
   xy: 587, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-thorium-stone3
+ore-lead-grass2
   rotate: false
   xy: 577, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-grass1
+ore-lead-grass3
   rotate: false
   xy: 587, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-grass2
+ore-lead-ice1
   rotate: false
   xy: 597, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-grass3
+ore-lead-ice2
   rotate: false
   xy: 587, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-ice1
+ore-lead-ice3
   rotate: false
   xy: 597, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-ice2
+ore-lead-sand1
   rotate: false
   xy: 607, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-ice3
+ore-lead-sand2
   rotate: false
   xy: 597, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-sand1
+ore-lead-sand3
   rotate: false
   xy: 607, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-sand2
+ore-lead-snow1
   rotate: false
   xy: 617, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-sand3
+ore-lead-snow2
   rotate: false
   xy: 607, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-snow1
+ore-lead-snow3
   rotate: false
   xy: 617, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-snow2
+ore-lead-stone1
   rotate: false
   xy: 627, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-snow3
+ore-lead-stone2
   rotate: false
   xy: 617, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-stone1
+ore-lead-stone3
   rotate: false
   xy: 627, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-stone2
+ore-thorium-grass1
   rotate: false
   xy: 637, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-titanium-stone3
+ore-thorium-grass2
   rotate: false
   xy: 627, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-grass1
+ore-thorium-grass3
   rotate: false
   xy: 637, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-grass2
+ore-thorium-ice1
   rotate: false
   xy: 647, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-grass3
+ore-thorium-ice2
   rotate: false
   xy: 637, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-ice1
+ore-thorium-ice3
   rotate: false
   xy: 647, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-ice2
+ore-thorium-sand1
   rotate: false
   xy: 647, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-ice3
+ore-thorium-sand2
   rotate: false
   xy: 567, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-sand1
+ore-thorium-sand3
   rotate: false
   xy: 577, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-sand2
+ore-thorium-snow1
   rotate: false
   xy: 587, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-sand3
+ore-thorium-snow2
   rotate: false
   xy: 597, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-snow1
+ore-thorium-snow3
   rotate: false
   xy: 607, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-snow2
+ore-thorium-stone1
   rotate: false
   xy: 617, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-snow3
+ore-thorium-stone2
   rotate: false
   xy: 627, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-stone1
+ore-thorium-stone3
   rotate: false
   xy: 637, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-stone2
+ore-titanium-grass1
   rotate: false
   xy: 647, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-ore-tungsten-stone3
+ore-titanium-grass2
   rotate: false
   xy: 662, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+ore-titanium-grass3
+  rotate: false
+  xy: 662, 148
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-ice1
+  rotate: false
+  xy: 660, 138
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-ice2
+  rotate: false
+  xy: 657, 128
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-ice3
+  rotate: false
+  xy: 657, 118
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-sand1
+  rotate: false
+  xy: 657, 108
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-sand2
+  rotate: false
+  xy: 657, 98
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-sand3
+  rotate: false
+  xy: 672, 159
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-snow1
+  rotate: false
+  xy: 682, 159
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-snow2
+  rotate: false
+  xy: 672, 149
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-snow3
+  rotate: false
+  xy: 682, 149
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-stone1
+  rotate: false
+  xy: 667, 128
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-stone2
+  rotate: false
+  xy: 667, 118
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-titanium-stone3
+  rotate: false
+  xy: 667, 108
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-grass1
+  rotate: false
+  xy: 667, 98
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-grass2
+  rotate: false
+  xy: 670, 138
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-grass3
+  rotate: false
+  xy: 680, 139
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-ice1
+  rotate: false
+  xy: 677, 128
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-ice2
+  rotate: false
+  xy: 677, 118
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-ice3
+  rotate: false
+  xy: 677, 108
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-sand1
+  rotate: false
+  xy: 677, 98
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-sand2
+  rotate: false
+  xy: 889, 317
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-sand3
+  rotate: false
+  xy: 512, 61
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-snow1
+  rotate: false
+  xy: 736, 241
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-snow2
+  rotate: false
+  xy: 736, 231
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-snow3
+  rotate: false
+  xy: 736, 221
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-stone1
+  rotate: false
+  xy: 736, 211
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-stone2
+  rotate: false
+  xy: 731, 201
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-tungsten-stone3
+  rotate: false
+  xy: 731, 191
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+space-cliff-edge
+  rotate: false
+  xy: 593, 78
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+space-cliff-edge-1
+  rotate: false
+  xy: 603, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+space-cliff-edge-2
+  rotate: false
+  xy: 603, 78
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+space-cliff-side
+  rotate: false
+  xy: 613, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 unit-icon-scout
   rotate: false
   xy: 893, 341
@@ -4374,112 +4598,112 @@ vtol
   index: -1
 item-biomatter
   rotate: false
-  xy: 542, 161
+  xy: 547, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 552, 161
+  xy: 562, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-carbide
   rotate: false
-  xy: 562, 161
+  xy: 560, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 522, 151
+  xy: 527, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 520, 141
+  xy: 537, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 532, 151
+  xy: 547, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 530, 141
+  xy: 557, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 527, 131
+  xy: 537, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 542, 151
+  xy: 547, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 540, 141
+  xy: 557, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 527, 121
+  xy: 547, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 537, 131
+  xy: 557, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 552, 151
+  xy: 557, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 550, 141
+  xy: 577, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tungsten
   rotate: false
-  xy: 527, 111
+  xy: 587, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 527, 101
+  xy: 605, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5139,7 +5363,7 @@ icon-item
   index: -1
 icon-items-none
   rotate: false
-  xy: 522, 161
+  xy: 527, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5244,7 +5468,7 @@ icon-none
   index: -1
 icon-nullitem
   rotate: false
-  xy: 532, 161
+  xy: 537, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 001b271fd3..56885d5b69 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/packer/src/io/anuke/mindustry/Generators.java b/packer/src/io/anuke/mindustry/Generators.java
index bb1c2c72d7..062f7bc387 100644
--- a/packer/src/io/anuke/mindustry/Generators.java
+++ b/packer/src/io/anuke/mindustry/Generators.java
@@ -8,8 +8,10 @@ import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.type.Mech;
 import io.anuke.mindustry.type.Upgrade;
 import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.OreBlock;
 import io.anuke.mindustry.world.blocks.defense.turrets.Turret;
+import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.graphics.Hue;
 
 public class Generators {
@@ -146,6 +148,33 @@ public class Generators {
             }
         });
 
+        context.generate("block-edges", () -> {
+            for(Block block : Block.all()){
+                if(!(block instanceof Floor)) continue;
+                Floor floor = (Floor)block;
+                if(floor.getIcon().length > 0 && !Draw.hasRegion(floor.name + "-cliff-side")){
+                    Image floori = context.get(floor.getIcon()[0]);
+                    Color color = floori.getColor(0, 0).mul(1.3f, 1.3f, 1.3f, 1f);
+
+                    String[] names = {"cliff-edge-2", "cliff-edge", "cliff-edge-1", "cliff-side"};
+                    for(String str : names){
+                        Image image = context.get("generic-" + str);
+
+                        for(int x = 0; x < image.width(); x++){
+                            for(int y = 0; y < image.height(); y++){
+                                Color other = image.getColor(x, y);
+                                if(other.a > 0){
+                                    image.draw(x, y, color);
+                                }
+                            }
+                        }
+
+                        image.save(floor.name + "-" + str);
+                    }
+                }
+            }
+        });
+
         context.generate("ore-icons", () -> {
             for(Block block : Block.all()){
                 if(!(block instanceof OreBlock)) continue;