More branch merging

2021-10-14 20:58:03 -04:00
parent ad1c75d050
commit 6b59c1cd83
108 changed files with 1018 additions and 380 deletions
--- a/core/src/mindustry/graphics/g3d/PlanetGrid.java
+++ b/core/src/mindustry/graphics/g3d/PlanetGrid.java
@@ -221,6 +221,8 @@ public class PlanetGrid{
    }

    public static class Ptile{
+        public static final Ptile empty = new Ptile(0, 0);
+
        public int id;
        public int edgeCount;