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

View File

@@ -13,7 +13,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>MinimumOSVersion</key>
<string>12.0.0</string>
<string>13.0.0</string>
<key>CFBundleName</key>
<string>${app.name}</string>
<key>CFBundlePackageType</key>