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/maps/Maps.java
+++ b/core/src/mindustry/maps/Maps.java
@@ -501,4 +501,4 @@ public class Maps{
            return provider.next(previous);
        }
    }
-}
+}
--- a/core/src/mindustry/maps/filters/TerrainFilter.java
+++ b/core/src/mindustry/maps/filters/TerrainFilter.java
@@ -41,4 +41,4 @@ public class TerrainFilter extends GenerateFilter{
            in.block = Blocks.air;
        }
    }
-}
+}