Merge remote-tracking branch 'origin/master'

core/src/mindustry/game/Rules.java

@@ -50,7 +50,7 @@ public class Rules{
     public boolean unitAmmo = false;
     /** Whether cores add to unit limit */
     public boolean unitCapVariable = true;
-    /** How fast unit pads build units. */
+    /** How fast unit factories build units. */
     public float unitBuildSpeedMultiplier = 1f;
     /** How much damage any other units deal. */
     public float unitDamageMultiplier = 1f;

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/type/UnitType.java

@@ -42,6 +42,8 @@ public class UnitType extends UnlockableContent{
 
     /** If true, the unit is always at elevation 1. */
     public boolean flying;
+    /** If `flying` and this is true, the unit can appear on the title screen */
+    public boolean onTitleScreen = true;
     /** Creates a new instance of this unit class. */
     public Prov<? extends Unit> constructor;
     /** The default AI controller to assign on creation. */

gradle.properties

@@ -10,5 +10,5 @@ kotlin.stdlib.default.dependency=false
 android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 http.socketTimeout=80000
-http.connectionTimeout=80000archash=40c21b302ccc1e74f4c2a37f937c88acaec99254
+http.connectionTimeout=80000
 archash=40c21b302ccc1e74f4c2a37f937c88acaec99254