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

Conflicts: core/src/mindustry/ui/dialogs/PlanetDialog.java
2021-08-18 15:04:30 -04:00
parent 2200a44653 512b65a592
commit f3cacb9e99
86 changed files with 942 additions and 740 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,4 +11,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 http.socketTimeout=80000
 http.connectionTimeout=80000
-archash=fbbdf8776142ba1980855c954dcfbf00e96cbeb7
+archash=96dbecb52d98b54550bda3d6bb33c69d24884c08