Merge branch 'master' of https://github.com/Anuken/Mindustry into mech-rework

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png

core/assets/bundles/bundle.properties

@@ -16,6 +16,7 @@ screenshot.invalid = Map too large, potentially not enough memory for screenshot
 gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
+copied = Copied.
 
 load.sound = Sounds
 load.map = Maps
@@ -24,6 +25,22 @@ load.content = Content
 load.system = System
 load.mod = Mods
 
+schematic = Schematic
+schematic.add = Save Schematic...
+schematics = Schematics
+schematic.import = Import Schematic...
+schematic.exportfile = Export File
+schematic.importfile = Import File
+schematic.browseworkshop = Browse Workshop
+schematic.copy = Copy to Clipboard
+schematic.copy.import = Import from Clipboard
+schematic.shareworkshop = Share on Workshop
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
+schematic.saved = Schematic saved.
+schematic.delete.confirm = This schematic will be utterly eradicated.
+schematic.rename = Rename Schematic
+schematic.info = {0}x{1}, {2} blocks
+
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
 stat.built = Buildings Built:[accent] {0}
@@ -83,6 +100,8 @@ mod.import.github = Import Github Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
+mod.preview.missing = Before publishing this mod in the workshop, you must add an image preview.\nPlace an image named[accent] preview.png[] into the mod's folder and try again.
+mod.folder.missing = Only mods in folder form can be published on the workshop.\nTo convert any mod into a folder, simply unzip its file into a folder and delete the old zip, then restart your game or reload your mods.
 
 about.button = About
 name = Name:
@@ -218,6 +237,7 @@ loading = [accent]Loading...
 reloading = [accent]Reloading Mods...
 saving = [accent]Saving...
 cancelbuilding = [accent][[{0}][] to clear plan
+selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
 resumebuilding = [scarlet][[{0}][] to resume building
 wave = [accent]Wave {0}
@@ -238,16 +258,17 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
-map.publish.error = Error publishing map: {0}
-map.update = Update Map
-map.load.error = Error fetching workshop details: {0}
-map.missing = This map has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked from the map.
+workshop.update = Update Item
+workshop.error = Error fetching workshop details: {0}
 map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
 map.menu = Select what you would like to do with this map.
-map.changelog = Changelog (optional):
+changelog = Changelog (optional):
 eula = Steam EULA
-map.publish = Map published.
-map.publishing = [accent]Publishing map...
+missing = This item has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked.
+publishing = [accent]Publishing...
+publish.confirm = Are you sure you want to publish this?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your items will not show up!
+publish.error = Error publishing item: {0}
+
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -627,6 +648,10 @@ keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
+keybind.schematic_select.name = Select Region
+keybind.schematic_menu.name = Schematic Menu
+keybind.schematic_flip_x.name = Flip Schematic X
+keybind.schematic_flip_y.name = Flip Schematic Y
 keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement

core/assets/sprites/sprites.atlas

@@ -1348,6 +1348,13 @@ spore-press-top
   orig: 64, 64
   offset: 0, 0
   index: -1
+unloader-center
+  rotate: false
+  xy: 1735, 855
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 arc-heat
   rotate: false
   xy: 609, 1262
@@ -1770,14 +1777,14 @@ scale_marker
   index: -1
 scorch1
   rotate: false
-  xy: 1735, 787
+  xy: 1735, 753
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 1765, 787
+  xy: 1765, 753
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -4332,7 +4339,7 @@ item-copper-small
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 1735, 769
+  xy: 1017, 691
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4367,7 +4374,7 @@ item-graphite-small
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 1017, 691
+  xy: 1533, 777
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4402,7 +4409,7 @@ item-lead-small
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 1533, 777
+  xy: 1769, 879
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4752,7 +4759,7 @@ item-thorium-small
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 1753, 769
+  xy: 1035, 683
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4787,7 +4794,7 @@ item-titanium-small
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 1035, 683
+  xy: 1769, 861
   size: 16, 16
   orig: 16, 16
   offset: 0, 0