Anuken eed91eaaa0 # Conflicts: ...

#	core/src/mindustry/mod/ClassMap.java

2021-06-15 19:29:12 -04:00

..

res

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

src/mindustry/android

# Conflicts:

2021-06-15 19:29:12 -04:00

srcgp/mindustry/android

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

AndroidManifest.xml

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

build.gradle

# Conflicts:

2021-06-15 19:29:12 -04:00

ic_launcher-web.png

New icon

2019-08-12 13:29:02 -04:00

proguard-rules.pro

Possible dexing error fix

2021-06-04 08:36:27 -04:00