Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 03:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into v9

Browse Source 
# Conflicts:
#	core/assets/bundles/bundle_ca.properties
#	core/assets/scripts/global.js
#	core/src/mindustry/mod/DataImagePacker.java
#	gradle.properties
#	tools/src/mindustry/tools/SchemaGenerator.java
This commit is contained in:
Anuken
2026-08-14 12:20:03 -04:00
parent c5d67a56fd e8bf80a1d2
commit e26205a4f7
59 changed files with 900 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/push.yml
+2 -2
View File
@@ -33,7 +33,7 @@ jobs:
- name: Update bundles
if: ${{ github.repository == 'Anuken/Mindustry' }}
run: |
./gradlew updateBundles
./gradlew -DcompileMethodParams updateBundles
if [ -n "$(git status --porcelain)" ]; then
git config --global user.name "Github Actions"
@@ -45,7 +45,7 @@ jobs:
- name: Update scripts, class mappings and map names
if: ${{ github.repository == 'Anuken/Mindustry' }}
run: |
./gradlew updateScripts fixMaps
./gradlew -DcompileMethodParams updateScripts fixMaps
if [ -n "$(git status --porcelain)" ]; then
git config --global user.name "Github Actions"