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

core/src/mindustry/world/blocks/production/Drill.java

@@ -169,7 +169,7 @@ public class Drill extends Block{
         return new TextureRegion[]{region, rotatorRegion, topRegion};
     }
 
-    void countOre(Tile tile){
+    protected void countOre(Tile tile){
         returnItem = null;
         returnCount = 0;
 

core/src/mindustry/world/meta/StatUnit.java

@@ -20,8 +20,8 @@ public enum StatUnit{
     degrees,
     seconds,
     minutes,
-    perSecond,
-    perMinute,
+    perSecond(false),
+    perMinute(false),
     perShot(false),
     timesSpeed(false),
     percent(false),

core/src/mindustry/world/meta/StatValues.java

@@ -342,7 +342,7 @@ public class StatValues{
                     }
 
                     if(type.status != StatusEffects.none){
-                        sep(bt, (type.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName);
+                        sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName);
                     }
 
                     if(type.fragBullet != null){