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

# Conflicts:
#	gradle.properties
This commit is contained in:
Anuken
2026-08-10 12:15:15 -04:00
70 changed files with 479 additions and 310 deletions
@@ -7,4 +7,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: gradle/wrapper-validation-action@v2
- uses: gradle/actions/wrapper-validation@v3