fix: Conflict incoming changes from 15-dev

This commit is contained in:
Pun Butrach
2026-01-10 20:49:12 +07:00
parent 14e352c827
commit 2e76c99dad
1726 changed files with 146971 additions and 95028 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
with:
submodules: true
- uses: actions/setup-java@v5
+4 -4
View File
@@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
with:
submodules: true
- uses: actions/setup-java@v5
@@ -63,7 +63,7 @@ jobs:
check-style:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
with:
submodules: true
- uses: actions/setup-java@v5
@@ -78,7 +78,7 @@ jobs:
if: github.repository_owner == 'LawnchairLauncher'
needs: build-debug-apk
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
with:
submodules: true
fetch-depth: 0
@@ -125,7 +125,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
- uses: actions/download-artifact@v6
with:
name: Debug APK
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Sync Translations
uses: crowdin/github-action@v2
+1 -1
View File
@@ -18,7 +18,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Download translations
uses: crowdin/github-action@v2
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Upload Strings
uses: crowdin/github-action@v2
+3 -3
View File
@@ -27,7 +27,7 @@ jobs:
id-token: write
attestations: write
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
with:
submodules: true
- uses: actions/setup-java@v5
@@ -66,7 +66,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
- name: Download artifact
uses: actions/download-artifact@v6
with:
@@ -86,7 +86,7 @@ jobs:
runs-on: ubuntu-latest
needs: build-release-apk
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
- name: Download artifact
uses: actions/download-artifact@v6
with: