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

 Conflicts:

	core/assets/icons/icons.properties

	core/assets/logicids.dat

	core/src/mindustry/ui/dialogs/PlanetDialog.java

	core/src/mindustry/world/blocks/distribution/ItemBridge.java

	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java

	core/src/mindustry/world/blocks/storage/StorageBlock.java

	gradle.properties

core/src/mindustry/graphics/FloorRenderer.java

@@ -281,10 +281,13 @@ public class FloorRenderer{
         for(int tilex = cx * chunksize; tilex < (cx + 1) * chunksize && tilex < world.width(); tilex++){
             for(int tiley = cy * chunksize; tiley < (cy + 1) * chunksize && tiley < world.height(); tiley++){
                 Tile tile = world.rawTile(tilex, tiley);
+                boolean wall = tile.block().cacheLayer != CacheLayer.normal;
 
-                if(tile.block().cacheLayer != CacheLayer.normal){
+                if(wall){
                     used.add(tile.block().cacheLayer);
-                }else{
+                }
+
+                if(!wall || world.isAccessible(tilex, tiley)){
                     used.add(tile.floor().cacheLayer);
                 }
             }

core/src/mindustry/graphics/MenuRenderer.java

@@ -29,7 +29,7 @@ public class MenuRenderer implements Disposable{
     private float time = 0f;
     private float flyerRot = 45f;
     private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15);
-    private UnitType flyerType = content.units().select(u -> u.hitSize <= 20f && u.flying && u.region.found()).random();
+    private UnitType flyerType = content.units().select(u -> u.hitSize <= 20f && u.flying && u.onTitleScreen && u.region.found()).random();
 
     public MenuRenderer(){
         Time.mark();

core/src/mindustry/graphics/MinimapRenderer.java

@@ -33,13 +33,14 @@ public class MinimapRenderer{
             updateAll();
         });
 
-        //make sure to call on the graphics thread
         Events.on(TileChangeEvent.class, event -> {
             //TODO don't update when the minimap is off?
             if(!ui.editor.isShown()){
                 update(event.tile);
             }
         });
+
+        Events.on(BuildTeamChangeEvent.class, event -> update(event.build.tile));
     }
 
     public Pixmap getPixmap(){

core/src/mindustry/graphics/g3d/PlanetRenderer.java

@@ -217,8 +217,11 @@ public class PlanetRenderer implements Disposable{
     }
 
     public void drawArc(Planet planet, Vec3 a, Vec3 b, Color from, Color to, float length, float timeScale, int pointCount){
+        //increase curve height when on opposite side of planet, so it doesn't tunnel through
+        float dot = 1f - (Tmp.v32.set(a).nor().dot(Tmp.v33.set(b).nor()) + 1f)/2f;
+
         Vec3 avg = Tmp.v31.set(b).add(a).scl(0.5f);
-        avg.setLength(planet.radius*(1f+length));
+        avg.setLength(planet.radius*(1f+length) + dot * 1.35f);
 
         points.clear();
         points.addAll(Tmp.v33.set(b).setLength(outlineRad), Tmp.v31, Tmp.v34.set(a).setLength(outlineRad));