Merge branch 'master' of https://github.com/Anuken/Mindustry into v9

# Conflicts:
#	core/src/mindustry/logic/LExecutor.java
#	core/src/mindustry/world/blocks/logic/LogicDisplay.java
#	core/src/mindustry/world/meta/StatValues.java
#	gradle.properties
This commit is contained in:
Anuken
2026-08-29 09:53:28 -04:00
80 changed files with 792 additions and 88 deletions
+1 -1
View File
@@ -26,7 +26,7 @@
android:screenOrientation="user"
android:exported="true"
android:launchMode="singleTask"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
android:configChanges="uiMode|keyboard|keyboardHidden|orientation|screenSize|screenLayout">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>