Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	gradle.properties
This commit is contained in:
Anuken
2021-10-01 19:01:52 -04:00
parent b2cd4e8ec0 3e2da3595f
commit 8c685eaedb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=adf7fb48c540f4f44aa76fcc6c5b2c9643732de0 archash=159f05aff28e1f4edf6214f225aef2d63c4c37a6

2
servers_v6.json
View File

@@ -93,7 +93,7 @@
}, },
{ {
"name": "Hungarian", "name": "Hungarian",
"address": ["magyarmindustry.tk", "148.251.175.124:25601"] "address": ["survival.humindustry.tk", "148.251.175.124:25601"]
}, },
{ {
"name": "Xpdustry", "name": "Xpdustry",