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

Conflicts: core/src/mindustry/content/Blocks.java
2021-09-04 12:26:07 -04:00
parent c6873a72f6 3f49807348
commit dddb282ce3
28 changed files with 80 additions and 22 deletions
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -755,8 +755,8 @@ public class Blocks implements ContentList{
            rotate = false;
            solid = true;
            outputsLiquid = true;
-            drawer = new DrawMixer();
            envEnabled = Env.any;
+            drawer = new DrawMixer(true);

            consumes.power(1f);
            consumes.item(Items.titanium);