More branch merging

2021-10-14 20:58:03 -04:00
parent ad1c75d050
commit 6b59c1cd83
108 changed files with 1018 additions and 380 deletions
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -169,7 +169,7 @@ public class Build{
            return false;
        }

-        if(!type.canPlaceOn(tile, team)){
+        if(!type.canPlaceOn(tile, team, rotation)){
            return false;
        }