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

Conflicts: core/src/mindustry/world/blocks/environment/Floor.java core/src/mindustry/world/blocks/payloads/Payload.java gradle.properties
2021-07-15 09:13:35 -04:00
parent 8644844b7d 61d81046ae
commit 103f24d41d
61 changed files with 571 additions and 262 deletions
@@ -147,7 +147,7 @@ public class StatValues{
                            }
                        }
                    }else{
-                        c.add("@none.found");
+                        c.add("@none.inmap");
                    }
                }else{
                    c.add("@stat.showinmap");