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

Conflicts: gradle.properties
2021-07-09 19:48:35 -04:00
parent baabf49fba effe2312e0
commit 5ceb8e2b48
167 changed files with 17 additions and 1083 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=b4dc34071be92f154034d9d9621e015f5c49030c
+archash=5fbbceca5509f38ce49b24ef7001da3c73efa1e5