Merge branch 'master' of https://github.com/Anuken/Mindustry into array-textures

# Conflicts:
#	gradle.properties

core/src/mindustry/editor/MapEditorDialog.java

@@ -788,7 +788,11 @@ public class MapEditorDialog extends Dialog implements Disposable{
     }
 
     private void tryExit(){
-        ui.showConfirm("@confirm", "@editor.unsaved", this::hide);
+        ui.showConfirm("@confirm", "@editor.unsaved", () -> {
+            //clears data patches
+            logic.reset();
+            hide();
+        });
     }
 
     private void addBlockSelection(Table cont){

core/src/mindustry/mod/ClassMap.java

@@ -5,7 +5,7 @@ import arc.struct.*;
 @SuppressWarnings("deprecation")
 public class ClassMap{
     public static final ObjectMap<String, Class<?>> classes = new ObjectMap<>();
-
+    
     static{
         classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class);
         classes.put("BoostAI", mindustry.ai.types.BoostAI.class);