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

2021-09-13 20:52:41 -04:00
parent 00eca00f11 d36a00a6fe
commit ba0892fdcb
82 changed files with 1517 additions and 1114 deletions
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -158,7 +158,9 @@ public class Generators{
                        }
                    });

-                    Fi.get("../blocks/environment/cliffmask" + (val & 0xff) + ".png").writePng(result);
+                    Fi fi = Fi.get("../blocks/environment/cliffmask" + (val & 0xff) + ".png");
+                    fi.writePng(result);
+                    fi.copyTo(Fi.get("../editor").child("editor-" + fi.name()));
                });
            }