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

Conflicts: gradle.properties
2021-10-01 19:01:52 -04:00
parent b2cd4e8ec0 3e2da3595f
commit 8c685eaedb
2 changed files with 2 additions and 2 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=adf7fb48c540f4f44aa76fcc6c5b2c9643732de0
+archash=159f05aff28e1f4edf6214f225aef2d63c4c37a6