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

Conflicts: core/src/mindustry/mod/ClassMap.java
2021-07-04 09:52:57 -04:00
parent 0d280ea77f 178cb12f85
commit ebf0c71db6
34 changed files with 168 additions and 135 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=1142cfc35b6671c6a2c5566632ff044a46527b82
+archash=ca296ad37aeca186fcef3290bb8a6e9143bdd245