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

Conflicts: gradle.properties
2021-10-05 12:08:58 -04:00
parent 8c685eaedb 77736f227f
commit 56fe1bfa68
12 changed files with 73 additions and 34 deletions
--- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
@@ -327,7 +327,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
            }
        }

-        boolean naval = (float)waters / total >= 0.26f;
+        boolean naval = (float)waters / total >= 0.15f;

        //create water pathway if the map is flooded
        if(naval){