Merged with master

2020-02-09 12:27:44 -05:00
parent d2ab316072 baab36bfc5
commit a2706a80b1
84 changed files with 488 additions and 413 deletions
--- a/core/src/mindustry/io/MapIO.java
+++ b/core/src/mindustry/io/MapIO.java
@@ -175,4 +175,4 @@ public class MapIO{
    interface TileProvider{
        Tile get(int x, int y);
    }
-}
+}