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

 Conflicts:

	gradle.properties

core/src/mindustry/entities/comp/PlayerComp.java

@@ -51,13 +51,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return unit.canBuild();
     }
 
-    public @Nullable
-    CoreBuild closestCore(){
+    public @Nullable CoreBuild closestCore(){
         return state.teams.closestCore(x, y, team);
     }
 
-    public @Nullable
-    CoreBuild core(){
+    public @Nullable CoreBuild core(){
         return team.core();
     }