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
@@ -598,7 +598,7 @@ public class Generators{
        });
    }

-    /** Generates a scorch pixmap based on parameters. Thread safe, unless multiple scorch generators are running in parallel. */
+    /** Generates a scorch pixmap based on parameters. Thread safe. */
    public static class ScorchGenerator{
        public int size = 80, seed = 0, color = Color.whiteRgba;
        public double scale = 18, pow = 2, octaves = 4, pers = 0.4, add = 2, nscl = 4.5f;