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

This commit is contained in:
Anuken
2021-10-15 14:24:48 -04:00
10 changed files with 29 additions and 17 deletions

View File

@@ -25,6 +25,7 @@ public class PayloadBlock extends Block{
update = true;
sync = true;
group = BlockGroup.payloads;
envEnabled |= Env.space;
}

View File

@@ -1,7 +1,7 @@
package mindustry.world.meta;
public enum BlockGroup{
none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true);
none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true), payloads(true);
/** if true, any block in this category replaces any other block in this category. */
public final boolean anyReplace;