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:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
This commit is contained in:
Anuken
2021-06-17 10:44:51 -04:00
parent c623e66694 15affaad9b
commit afe963ca5d
21 changed files with 871 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false
#needed for android compilation
android.useAndroidX=true
archash=07ced971f4c8b8b5a61aa3a84b29c90aa497cb48
archash=df2786dd8de1ebc1b70c453d6dcac62c2ecf9e18