diff --git a/core/assets-raw/sprites/blocks/distribution/conveyor.png b/core/assets-raw/sprites/blocks/distribution/conveyor.png
deleted file mode 100644
index 284b091968..0000000000
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyor.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png
new file mode 100644
index 0000000000..e19afcd6d8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png
new file mode 100644
index 0000000000..d88e1658e2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png
new file mode 100644
index 0000000000..f5de8677b9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png
new file mode 100644
index 0000000000..c947fb2a0f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png
new file mode 100644
index 0000000000..58df8fd1aa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png
new file mode 100644
index 0000000000..e9388dcdf8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png
new file mode 100644
index 0000000000..bb07a8db95
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png
new file mode 100644
index 0000000000..c41710079d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png
new file mode 100644
index 0000000000..12b665cec1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png
new file mode 100644
index 0000000000..8201f2c3b7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png
new file mode 100644
index 0000000000..13f1269028
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png
new file mode 100644
index 0000000000..f529d8f8cc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png
new file mode 100644
index 0000000000..81067402cb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png
new file mode 100644
index 0000000000..6917615d13
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png
new file mode 100644
index 0000000000..d05a8df6a7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png
new file mode 100644
index 0000000000..564c6a5569
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png
new file mode 100644
index 0000000000..9e2aa24d12
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png
new file mode 100644
index 0000000000..5fb6c76bbb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png
new file mode 100644
index 0000000000..a8dfe74683
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png
new file mode 100644
index 0000000000..d7f446763c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png
new file mode 100644
index 0000000000..d25210902a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png
new file mode 100644
index 0000000000..681ad7174d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png
new file mode 100644
index 0000000000..7333800c7d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png
new file mode 100644
index 0000000000..406e7c8a7d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png
new file mode 100644
index 0000000000..5f368a57a9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png
new file mode 100644
index 0000000000..37bba91707
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png
new file mode 100644
index 0000000000..4174dcb536
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png
new file mode 100644
index 0000000000..2ab4ec1027
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png
new file mode 100644
index 0000000000..b46aeabb4a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png
new file mode 100644
index 0000000000..56ecf051cb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png
new file mode 100644
index 0000000000..73b65851fa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png
new file mode 100644
index 0000000000..9043b1851d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png
new file mode 100644
index 0000000000..8295721e88
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png
new file mode 100644
index 0000000000..11693aa549
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png
new file mode 100644
index 0000000000..b51534e4ef
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png
new file mode 100644
index 0000000000..a38e0a6eef
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png
new file mode 100644
index 0000000000..c869eaa6e8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png
new file mode 100644
index 0000000000..b734616c96
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png
new file mode 100644
index 0000000000..704d46efa7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png
new file mode 100644
index 0000000000..7d82a2037e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 896314aa41..9f238722c2 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -32,23 +32,289 @@ bridge-conveyor-end
   orig: 8, 8
   offset: 0, 0
   index: -1
+conveyor-0-1
+  rotate: false
+  xy: 517, 101
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-0-2
+  rotate: false
+  xy: 512, 62
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-0-3
+  rotate: false
+  xy: 967, 356
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-1-0
+  rotate: false
+  xy: 977, 356
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-1-1
+  rotate: false
+  xy: 967, 346
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-1-2
+  rotate: false
+  xy: 977, 346
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-1-3
+  rotate: false
+  xy: 987, 355
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-2-0
+  rotate: false
+  xy: 997, 355
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-2-1
+  rotate: false
+  xy: 987, 345
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-2-2
+  rotate: false
+  xy: 997, 345
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-2-3
+  rotate: false
+  xy: 1007, 349
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-3-0
+  rotate: false
+  xy: 1007, 339
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-3-1
+  rotate: false
+  xy: 409, 48
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-3-2
+  rotate: false
+  xy: 409, 38
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-3-3
+  rotate: false
+  xy: 961, 336
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-4-0
+  rotate: false
+  xy: 971, 336
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-4-1
+  rotate: false
+  xy: 413, 28
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-4-2
+  rotate: false
+  xy: 413, 18
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+conveyor-4-3
+  rotate: false
+  xy: 413, 8
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-1
+  rotate: false
+  xy: 533, 81
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-2
+  rotate: false
+  xy: 543, 81
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-3
+  rotate: false
+  xy: 553, 81
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-0
+  rotate: false
+  xy: 522, 71
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-1
+  rotate: false
+  xy: 532, 71
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-2
+  rotate: false
+  xy: 542, 71
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-3
+  rotate: false
+  xy: 552, 71
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-0
+  rotate: false
+  xy: 522, 61
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-1
+  rotate: false
+  xy: 532, 61
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-2
+  rotate: false
+  xy: 542, 61
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-3
+  rotate: false
+  xy: 552, 61
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-0
+  rotate: false
+  xy: 563, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-1
+  rotate: false
+  xy: 573, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-2
+  rotate: false
+  xy: 583, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-3
+  rotate: false
+  xy: 593, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-4-0
+  rotate: false
+  xy: 603, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-4-1
+  rotate: false
+  xy: 613, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-4-2
+  rotate: false
+  xy: 623, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+titanium-conveyor-4-3
+  rotate: false
+  xy: 633, 88
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 627, 118
+  xy: 660, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 637, 128
+  xy: 657, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 627, 108
+  xy: 657, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -188,21 +454,21 @@ plasma-drill-top
   index: -1
 tungsten-drill
   rotate: false
-  xy: 741, 161
+  xy: 563, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-rotator
   rotate: false
-  xy: 747, 181
+  xy: 573, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-top
   rotate: false
-  xy: 747, 171
+  xy: 583, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -314,14 +580,14 @@ coal3
   index: -1
 dirt2
   rotate: false
-  xy: 512, 62
+  xy: 991, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 967, 356
+  xy: 701, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -335,42 +601,42 @@ dirtedge
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 987, 345
+  xy: 795, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 997, 345
+  xy: 507, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 1007, 349
+  xy: 505, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 1007, 339
+  xy: 517, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 987, 355
+  xy: 775, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 997, 355
+  xy: 785, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -384,42 +650,42 @@ grassedge
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 961, 336
+  xy: 537, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 971, 336
+  xy: 525, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 413, 28
+  xy: 547, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 413, 18
+  xy: 535, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 409, 48
+  xy: 527, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 409, 38
+  xy: 515, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -433,35 +699,35 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 413, 8
+  xy: 557, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 981, 335
+  xy: 545, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 981, 335
+  xy: 545, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 991, 335
+  xy: 567, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 991, 335
+  xy: 567, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -475,56 +741,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 567, 181
+  xy: 527, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 555, 171
+  xy: 537, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 565, 171
+  xy: 547, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 527, 131
+  xy: 547, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 542, 151
+  xy: 557, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 540, 141
+  xy: 557, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 527, 121
+  xy: 577, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 537, 131
+  xy: 587, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -545,49 +811,49 @@ oiledge
   index: -1
 rock2
   rotate: false
-  xy: 637, 98
+  xy: 677, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 660, 138
+  xy: 889, 317
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 657, 128
+  xy: 736, 241
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 657, 118
+  xy: 736, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 657, 108
+  xy: 736, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 662, 158
+  xy: 677, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 662, 148
+  xy: 677, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -601,49 +867,49 @@ sandedge
   index: -1
 shrubshadow
   rotate: false
-  xy: 682, 159
+  xy: 731, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 667, 128
+  xy: 737, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 667, 118
+  xy: 737, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 667, 108
+  xy: 741, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 667, 98
+  xy: 747, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 672, 149
+  xy: 741, 201
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 682, 149
+  xy: 741, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -664,42 +930,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 677, 118
+  xy: 883, 305
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 677, 108
+  xy: 871, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 677, 98
+  xy: 881, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 889, 317
+  xy: 893, 307
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 680, 139
+  xy: 751, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 677, 128
+  xy: 873, 305
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -713,91 +979,91 @@ stoneedge
   index: -1
 thorium1
   rotate: false
-  xy: 736, 241
+  xy: 498, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 736, 231
+  xy: 523, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 736, 221
+  xy: 533, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 736, 211
+  xy: 543, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 731, 201
+  xy: 553, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 731, 191
+  xy: 523, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten1
   rotate: false
-  xy: 741, 191
+  xy: 653, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten2
   rotate: false
-  xy: 737, 181
+  xy: 663, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten3
   rotate: false
-  xy: 737, 171
+  xy: 673, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 751, 161
+  xy: 593, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 873, 305
+  xy: 603, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 883, 305
+  xy: 613, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 871, 295
+  xy: 623, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -867,7 +1133,7 @@ conduit-liquid
   index: -1
 cross-1
   rotate: false
-  xy: 517, 101
+  xy: 981, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -895,7 +1161,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 977, 346
+  xy: 731, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -909,14 +1175,14 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 637, 118
+  xy: 657, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 647, 128
+  xy: 657, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1161,28 +1427,28 @@ conduit-top-6
   index: -1
 liquid-router
   rotate: false
-  xy: 522, 151
+  xy: 557, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 520, 141
+  xy: 537, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 532, 151
+  xy: 547, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 530, 141
+  xy: 557, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1210,70 +1476,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 617, 118
+  xy: 647, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 627, 128
+  xy: 662, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 617, 108
+  xy: 662, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 637, 108
+  xy: 672, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 647, 118
+  xy: 682, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 647, 108
+  xy: 672, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 567, 98
+  xy: 682, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 577, 98
+  xy: 667, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 587, 98
+  xy: 667, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 597, 98
+  xy: 667, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1378,7 +1644,7 @@ nuclear-reactor-lights
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 647, 98
+  xy: 677, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1553,14 +1819,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 545, 171
+  xy: 550, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 552, 151
+  xy: 597, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1602,21 +1868,21 @@ poweralloysmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 607, 98
+  xy: 667, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 617, 98
+  xy: 670, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 657, 98
+  xy: 736, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1630,7 +1896,7 @@ core-open
   index: -1
 sortedunloader
   rotate: false
-  xy: 670, 138
+  xy: 747, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1721,7 +1987,7 @@ mass-driver-turret
   index: -1
 duo
   rotate: false
-  xy: 967, 346
+  xy: 721, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1924,7 +2190,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 627, 98
+  xy: 680, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1945,7 +2211,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 977, 356
+  xy: 711, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2113,7 +2379,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 672, 159
+  xy: 731, 201
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2127,7 +2393,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 741, 201
+  xy: 643, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2265,7 +2531,7 @@ block-icon-conveyor
   orig: 8, 8
   offset: 0, 0
   index: -1
-conveyor
+conveyor-0-0
   rotate: false
   xy: 726, 241
   size: 8, 8
@@ -3336,6 +3602,13 @@ block-icon-titanium-conveyor
   orig: 8, 8
   offset: 0, 0
   index: -1
+titanium-conveyor-0-0
+  rotate: false
+  xy: 303, 25
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 titanium-conveyor
   rotate: false
   xy: 303, 25
@@ -3464,28 +3737,28 @@ block-icon-wave
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 532, 161
+  xy: 560, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 542, 161
+  xy: 527, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 552, 161
+  xy: 537, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 562, 161
+  xy: 547, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3541,525 +3814,525 @@ mech-icon-tau-mech
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 550, 141
+  xy: 607, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 527, 111
+  xy: 617, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 537, 121
+  xy: 627, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 547, 131
+  xy: 637, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 562, 151
+  xy: 575, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 560, 141
+  xy: 585, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 527, 101
+  xy: 595, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 537, 111
+  xy: 605, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 547, 121
+  xy: 615, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 557, 131
+  xy: 625, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 537, 101
+  xy: 635, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 547, 111
+  xy: 572, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 557, 121
+  xy: 582, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 547, 101
+  xy: 592, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 557, 111
+  xy: 602, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 557, 101
+  xy: 612, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 577, 178
+  xy: 622, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 587, 178
+  xy: 632, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 597, 178
+  xy: 572, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 607, 178
+  xy: 582, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 617, 178
+  xy: 592, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 627, 178
+  xy: 602, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 637, 178
+  xy: 612, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 575, 168
+  xy: 622, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 585, 168
+  xy: 632, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 595, 168
+  xy: 645, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 605, 168
+  xy: 655, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 615, 168
+  xy: 642, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 625, 168
+  xy: 642, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 635, 168
+  xy: 652, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 572, 158
+  xy: 652, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 582, 158
+  xy: 570, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 592, 158
+  xy: 580, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 602, 158
+  xy: 590, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 612, 158
+  xy: 600, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 622, 158
+  xy: 610, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 632, 158
+  xy: 620, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 572, 148
+  xy: 630, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 582, 148
+  xy: 640, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 592, 148
+  xy: 650, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 602, 148
+  xy: 567, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 612, 148
+  xy: 567, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 622, 148
+  xy: 577, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 632, 148
+  xy: 567, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 645, 168
+  xy: 577, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 655, 168
+  xy: 587, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 642, 158
+  xy: 577, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 642, 148
+  xy: 587, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 652, 158
+  xy: 597, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 652, 148
+  xy: 587, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 570, 138
+  xy: 597, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 580, 138
+  xy: 607, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 590, 138
+  xy: 597, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 600, 138
+  xy: 607, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 610, 138
+  xy: 617, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 620, 138
+  xy: 607, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 630, 138
+  xy: 617, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 640, 138
+  xy: 627, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 650, 138
+  xy: 617, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 567, 128
+  xy: 627, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass1
   rotate: false
-  xy: 567, 118
+  xy: 637, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass2
   rotate: false
-  xy: 577, 128
+  xy: 627, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass3
   rotate: false
-  xy: 567, 108
+  xy: 637, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice1
   rotate: false
-  xy: 577, 118
+  xy: 647, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice2
   rotate: false
-  xy: 587, 128
+  xy: 637, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice3
   rotate: false
-  xy: 577, 108
+  xy: 647, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand1
   rotate: false
-  xy: 587, 118
+  xy: 647, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand2
   rotate: false
-  xy: 597, 128
+  xy: 567, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand3
   rotate: false
-  xy: 587, 108
+  xy: 577, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow1
   rotate: false
-  xy: 597, 118
+  xy: 587, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow2
   rotate: false
-  xy: 607, 128
+  xy: 597, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow3
   rotate: false
-  xy: 597, 108
+  xy: 607, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone1
   rotate: false
-  xy: 607, 118
+  xy: 617, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone2
   rotate: false
-  xy: 617, 128
+  xy: 627, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone3
   rotate: false
-  xy: 607, 108
+  xy: 637, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4094,112 +4367,112 @@ vtol
   index: -1
 item-biomatter
   rotate: false
-  xy: 721, 161
+  xy: 522, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 731, 161
+  xy: 532, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-carbide
   rotate: false
-  xy: 775, 302
+  xy: 542, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 785, 302
+  xy: 552, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 795, 302
+  xy: 562, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 507, 181
+  xy: 522, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 505, 171
+  xy: 520, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 517, 181
+  xy: 532, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 527, 181
+  xy: 530, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 515, 171
+  xy: 527, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 537, 181
+  xy: 542, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 525, 171
+  xy: 540, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 547, 181
+  xy: 527, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 535, 171
+  xy: 537, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tungsten
   rotate: false
-  xy: 557, 181
+  xy: 552, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 522, 161
+  xy: 562, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4859,7 +5132,7 @@ icon-item
   index: -1
 icon-items-none
   rotate: false
-  xy: 701, 161
+  xy: 555, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4964,7 +5237,7 @@ icon-none
   index: -1
 icon-nullitem
   rotate: false
-  xy: 711, 161
+  xy: 565, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 5f57f60a0a..c4576b9315 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index 43b40260dd..12222b9688 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -57,7 +57,6 @@ public class UI extends SceneModule{
     public BansDialog bans;
     public AdminsDialog admins;
     public TraceDialog traces;
-    public RollbackDialog rollback;
     public ChangelogDialog changelog;
     public LocalPlayerDialog localplayers;
     public UnlocksDialog unlocks;
@@ -164,7 +163,6 @@ public class UI extends SceneModule{
         bans = new BansDialog();
         admins = new AdminsDialog();
         traces = new TraceDialog();
-        rollback = new RollbackDialog();
         maps = new MapsDialog();
         localplayers = new LocalPlayerDialog();
         unlocks = new UnlocksDialog();
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index cf69d83df1..c5896f38f3 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -665,9 +665,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         team = (team == Team.blue ? Team.red : Team.blue);
     }
 
-    /**
-     * Resets all values of the player.
-     */
+    /** Resets all values of the player.*/
     public void reset(){
         status.clear();
         team = Team.blue;
diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java
index d4695604dc..64cda916fd 100644
--- a/core/src/io/anuke/mindustry/entities/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/TileEntity.java
@@ -38,9 +38,7 @@ import static io.anuke.mindustry.Vars.world;
 public class TileEntity extends BaseEntity implements TargetTrait{
     public static final float timeToSleep = 60f * 4; //4 seconds to fall asleep
     private static final ObjectSet<Tile> tmpTiles = new ObjectSet<>();
-    /**
-     * This value is only used for debugging.
-     */
+    /**This value is only used for debugging.*/
     public static int sleepingEntities = 0;
     public Tile tile;
     public Timer timer;
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index a156939e1a..b511ef1ba6 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -305,6 +305,10 @@ public class DesktopInput extends InputHandler{
     public void updateController(){
         boolean mousemove = Gdx.input.getDeltaX() > 1 || Gdx.input.getDeltaY() > 1;
 
+        if(state.is(State.menu)){
+            droppingItem = false;
+        }
+
         if(KeyBinds.getSection(section).device.type == DeviceType.controller && (!mousemove || player.playerIndex > 0)){
             if(player.playerIndex > 0){
                 controlling = true;
diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java
index b3f094a889..1974e52593 100644
--- a/core/src/io/anuke/mindustry/input/InputHandler.java
+++ b/core/src/io/anuke/mindustry/input/InputHandler.java
@@ -33,18 +33,12 @@ import io.anuke.ucore.util.Translator;
 import static io.anuke.mindustry.Vars.*;
 
 public abstract class InputHandler extends InputAdapter{
-    /**
-     * Used for dropping items.
-     */
+    /**Used for dropping items.*/
     final static float playerSelectRange = mobile ? 17f : 11f;
-    /**
-     * Maximum line length.
-     */
+    /**Maximum line length.*/
     final static int maxLength = 100;
     final static Translator stackTrns = new Translator();
-    /**
-     * Distance on the back from where items originate.
-     */
+    /**Distance on the back from where items originate.*/
     final static float backTrns = 3f;
 
     public final Player player;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/RollbackDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/RollbackDialog.java
deleted file mode 100644
index 2a991e30dd..0000000000
--- a/core/src/io/anuke/mindustry/ui/dialogs/RollbackDialog.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.anuke.mindustry.ui.dialogs;
-
-import io.anuke.ucore.scene.ui.TextField;
-import io.anuke.ucore.util.Strings;
-
-import static io.anuke.mindustry.Vars.gwt;
-
-public class RollbackDialog extends FloatingDialog{
-
-    public RollbackDialog(){
-        super("$text.server.rollback");
-
-        setup();
-        shown(this::setup);
-    }
-
-    private void setup(){
-        content().clear();
-        buttons().clear();
-
-        if(gwt) return;
-
-        content().row();
-        content().add("$text.server.rollback.numberfield");
-
-        TextField field = content().addField("", t -> {
-        }).size(200f, 48f).get();
-        field.setTextFieldFilter((f, c) -> field.getText().length() < 4);
-
-        content().row();
-        buttons().defaults().size(200f, 50f).left().pad(2f);
-        buttons().addButton("$text.cancel", this::hide);
-
-        buttons().addButton("$text.ok", () -> {
-            //NetEvents.handleRollbackRequest(Integer.valueOf(field.getText()));
-            hide();
-        }).disabled(b -> field.getText().isEmpty() || !Strings.canParsePostiveInt(field.getText()));
-    }
-}
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
index 9c65b103f3..9a7b42de8b 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
@@ -1,4 +1,8 @@
 package io.anuke.mindustry.ui.dialogs;
 
-public class SectorsDialog{
+public class SectorsDialog extends FloatingDialog{
+
+    public SectorsDialog(){
+        super("");
+    }
 }
diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java
index 4ea601b896..57fa14fc27 100644
--- a/core/src/io/anuke/mindustry/world/Tile.java
+++ b/core/src/io/anuke/mindustry/world/Tile.java
@@ -402,6 +402,15 @@ public class Tile implements PosTrait, TargetTrait{
                 if(block.hasLiquids) entity.liquids = new LiquidModule();
                 if(block.hasPower) entity.power = new PowerModule();
                 entity.updateProximity();
+            }else{
+                //since the entity won't update proximity for us, update proximity for all nearby tiles manually
+                for(GridPoint2 p : Geometry.d4){
+                    Tile tile = world.tile(x + p.x, y + p.y);
+                    if(tile != null){
+                        tile = tile.target();
+                        tile.block().onProximityUpdate(tile);
+                    }
+                }
             }
 
             updateOcclusion();
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
index 08f908b2ea..687ee7f422 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
@@ -36,20 +36,21 @@ public class Conduit extends LiquidBlock{
         }
     }
 
+    @Override
     public void onProximityUpdate(Tile tile){
         ConduitEntity entity = tile.entity();
         entity.blendbits = 0;
 
         if(blends(tile, 2) && blends(tile, 1) && blends(tile, 3)){
             entity.blendbits = 3;
+        }else             if(blends(tile, 1) && blends(tile, 3)){
+            entity.blendbits = 6;
         }else if(blends(tile, 1) && blends(tile, 2)){
             entity.blendbits = 2;
         }else if(blends(tile, 3) && blends(tile, 2)){
             entity.blendbits = 4;
         }else if(blends(tile, 0)){
-            if(blends(tile, 1) && blends(tile, 3)){
-                entity.blendbits = 6;
-            }else if(blends(tile, 1)){
+            if(blends(tile, 1)){
                 entity.blendbits = 5;
             }else if(blends(tile, 3)){
                 entity.blendbits = 1;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
index d62e936095..510b07e205 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.GridPoint2;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.LongArray;
 import io.anuke.mindustry.entities.TileEntity;
@@ -33,8 +32,7 @@ public class Conveyor extends Block{
     private static ItemPos pos2 = new ItemPos();
     private final Translator tr1 = new Translator();
     private final Translator tr2 = new Translator();
-    private final TextureRegion region1 = new TextureRegion();
-    private final TextureRegion region2 = new TextureRegion();
+    private final TextureRegion[][] regions = new TextureRegion[7][4];
 
     protected float speed = 0f;
     protected float carryCapacity = 8f;
@@ -47,7 +45,7 @@ public class Conveyor extends Block{
         group = BlockGroup.transportation;
         hasItems = true;
         autoSleep = true;
-        itemCapacity = Math.round(tilesize / itemSpace);
+        itemCapacity = 4;
     }
 
     private static int compareItems(Long a, Long b){
@@ -57,8 +55,7 @@ public class Conveyor extends Block{
     }
 
     @Override
-    public void setBars(){
-    }
+    public void setBars(){}
 
     @Override
     public void setStats(){
@@ -66,35 +63,71 @@ public class Conveyor extends Block{
         stats.add(BlockStat.itemSpeed, speed * 60, StatUnit.pixelsSecond);
     }
 
+    @Override
+    public void load(){
+        super.load();
+
+        for(int i = 0; i < regions.length; i++){
+            for(int j = 0; j < 4; j++){
+                regions[i][j] = Draw.region(name + "-" + i + "-" + j);
+            }
+        }
+    }
+
     @Override
     public void draw(Tile tile){
         ConveyorEntity entity = tile.entity();
         byte rotation = tile.getRotation();
 
-        GridPoint2 point = Geometry.d4[rotation];
+        int frame = entity.clogHeat <= 0.5f ? (int) ((Timers.time() / 4f) % 4) : 0;
+        Draw.rect(regions[entity.blendbits][frame], tile.drawx(), tile.drawy(), tilesize * entity.blendsclx, tilesize * entity.blendscly, rotation*90);
+    }
 
-        int offset = entity.clogHeat <= 0.5f ? (int) ((Timers.time() / 4f) % 8) : 0;
-        TextureRegion region = Draw.region(name);
+    @Override
+    public void onProximityUpdate(Tile tile){
+        ConveyorEntity entity = tile.entity();
+        entity.blendbits = 0;
+        entity.blendsclx = entity.blendscly = 1;
 
-        region1.setRegion(region, 0, 0, region.getRegionWidth() - offset, region.getRegionHeight());
-        region2.setRegion(region, region.getRegionWidth() - offset, 0, offset, region.getRegionHeight());
-
-        float x = tile.drawx(), y = tile.drawy();
-
-        if(offset % 2 == 1){
-            if(point.x < 0) x += 0.75f;
-            if(point.y < 0)
-                y += 0.5f;
-            else if(point.y > 0)
-                y -= 0.5f;
+        if(blends(tile, 2) && blends(tile, 1) && blends(tile, 3)){
+            entity.blendbits = 3;
+        }else if(blends(tile, 1) && blends(tile, 3)){
+            entity.blendbits = 4;
+        }else if(blends(tile, 1) && blends(tile, 2)){
+            entity.blendbits = 2;
+        }else if(blends(tile, 3) && blends(tile, 2)){
+            entity.blendbits = 2;
+            entity.blendscly = -1;
+        }else if(blends(tile, 0)){
+            if(blends(tile, 1)){
+                entity.blendbits = 1;
+                entity.blendscly = -1;
+            }else if(blends(tile, 3)){
+                entity.blendbits = 1;
+            }
+        }else if(blends(tile, 1)){
+            entity.blendbits = 1;
+            entity.blendscly = -1;
+        }else if(blends(tile, 3)){
+            entity.blendbits = 1;
         }
+    }
 
-        Draw.rect(region1,
-                x + (point.x * (tilesize / 2f - region1.getRegionWidth() / 2f)),
-                y + (point.y * (tilesize / 2f - region1.getRegionWidth() / 2f)), rotation * 90);
-        Draw.rect(region2,
-                x - (point.x * (tilesize / 2f - region2.getRegionWidth() / 2f)),
-                y - (point.y * (tilesize / 2f - region2.getRegionWidth() / 2f)), rotation * 90);
+    private boolean blends(Tile tile, int direction){
+        Tile other = tile.getNearby(Mathf.mod(tile.getRotation() - direction, 4));
+        if(other != null) other = other.target();
+
+        if(other == null || !(other.block().hasItems) /*|| !(other.block().outputsLiquid)*/) return false;
+        return (tile.getNearby(tile.getRotation()) == other)
+        || (!other.block().rotate || other.getNearby(other.getRotation()) == tile);
+    }
+
+    @Override
+    public TextureRegion[] getIcon(){
+        if(icon == null){
+            icon = new TextureRegion[]{Draw.region(name + "-0-0")};
+        }
+        return super.getIcon();
     }
 
     @Override
@@ -331,6 +364,8 @@ public class Conveyor extends Block{
         float minitem = 1;
         float carrying;
         float minCarry = 2f;
+        int blendbits;
+        int blendsclx, blendscly;
 
         float clogHeat = 0f;
 
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 73f2ad89e4..8ac080d746 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -131,6 +131,7 @@ public class ServerControl extends Module{
 
         handler.register("version", "Displays server version info.", arg -> {
             info("&lmVersion: &lyMindustry {0} {1} / {2}", Version.code, Version.type, Version.buildName);
+            info("&lmJava Version: &ly{0}", System.getProperty("java.version"));
         });
 
         handler.register("exit", "Exit the server application.", arg -> {