Merge branches 'master' and 'new-map-format' of https://github.com/Anuken/Mindustry

core/assets/bundles/bundle.properties

@@ -197,8 +197,8 @@ editor.description = Description:
 editor.name = Name:
 editor.teams = Teams
 editor.elevation = Elevation
-editor.errorimageload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Error saving file:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
 editor.generate = Generate
 editor.resize = Resize
 editor.loadmap = Load Map
@@ -560,7 +560,6 @@ block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
 block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
 block.stained-rocks-red.name = Stained Rocks Red
 block.stained-stone-red.name = Stained Stone Red
 block.stained-rocks-yellow.name = Stained Rocks Yellow