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

Conflicts: gradle.properties
2021-07-08 09:29:36 -04:00
parent 64ab8328b8 6f2033a455
commit a0c5ed3761
47 changed files with 178 additions and 211 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=33c4976f8084fbb6fc26cfdcca2dda3442711d17
+archash=b4dc34071be92f154034d9d9621e015f5c49030c