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

# Conflicts: # gradle.properties
2026-10-02 03:00:29 +03:00 · 2026-07-02 10:15:54 -04:00
parent 002541aa27 12509e6225
commit 4a2e76c415
40 changed files with 269 additions and 157 deletions
@@ -8,6 +8,7 @@
    <uses-permission android:name="android.permission.INTERNET"/>

    <application
+            android:enableOnBackInvokedCallback="false"
            android:resizeableActivity="true"
            android:allowBackup="true"
            android:icon="@mipmap/ic_launcher"