Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

core/src/mindustry/graphics/Pixelator.java

@@ -5,6 +5,7 @@ import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
+import arc.math.*;
 import arc.util.*;
 
 import static arc.Core.*;
@@ -35,6 +36,8 @@ public class Pixelator implements Disposable{
             w = (int)(Core.camera.width * renderer.landScale() / renderer.getScale());
             h = (int)(Core.camera.height * renderer.landScale() / renderer.getScale());
         }
+        w = Mathf.clamp(w, 2, graphics.getWidth());
+        h = Mathf.clamp(h, 2, graphics.getHeight());
 
         buffer.resize(w, h);
 

core/src/mindustry/graphics/g3d/PlanetGrid.java

@@ -210,7 +210,7 @@ public class PlanetGrid{
 
     static int tileCount(int size){
         return 10 * Mathf.pow(3, size) + 2;
-    }///
+    }
 
     static int cornerCount(int size){
         return 20 * Mathf.pow(3, size);