Merge branch 'master' of https://github.com/Anuken/Mindustry into array-textures

# Conflicts:
#	core/src/mindustry/mod/DataImagePacker.java
#	gradle.properties
This commit is contained in:
Anuken
2026-06-21 09:53:08 -04:00
65 changed files with 249 additions and 146 deletions
+7
View File
@@ -31,6 +31,13 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="mindustry"/>
</intent-filter>
</activity>
</application>