forked from HMCL-dev/HMCL
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/official/main' into featur…
…e2717/official-optifine-download-channel # Conflicts: # HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineBMCLVersionList.java
- Loading branch information
Showing
310 changed files
with
23,707 additions
and
11,345 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,11 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: KOOK 频道 | KOOK Channel | ||
| url: https://kook.top/Kx7n3t | ||
| about: Hello Minecraft! Launcher 的官方 KOOK 频道。| The official KOOK channel of Hello Minecraft! Laucher. | ||
| - name: QQ 群 | QQ Groups | ||
| url: https://docs.hmcl.net/groups.html | ||
| about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ groups of Hello Minecraft! Laucher. | ||
| - name: Discord 频道 | Discord Channel | ||
| url: https://discord.gg/jVvC7HfM6U | ||
| about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher. | ||
| - name: 赞助通道 | Sponsorship channel | ||
| url: https://afdian.net/@huanghongxun | ||
| about: 前往爱发电赞助 HMCL，赞助后可以申请加入官方 QQ 群反馈问题。| Sponsor Hello Minecraft! Launcher on afdian.net and you can apply to join the official QQ group. | ||
| - name: 其他反馈 | Others | ||
| url: https://github.com/HMCL-dev/HMCL/discussions/new/choose | ||
| about: 通过 Discussions 反馈其他问题。| Report other problems in Discussions. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Build HMCLauncher | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - 'HMCLauncher/**' | ||
| - '.github/workflows/build-launcher.yml' | ||
| pull_request: | ||
| paths: | ||
| - 'HMCLauncher/**' | ||
| - '.github/workflows/build-launcher.yml' | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: windows-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Add msbuild to PATH | ||
| uses: microsoft/setup-msbuild@v2 | ||
| with: | ||
| msbuild-architecture: x86 | ||
| - name: Build HMCLauncher | ||
| run: msbuild /p:Configuration=Release /t:Rebuild /verbosity:detailed .\HMCLauncher\ | ||
| - name: Copy HMCLauncher to assets | ||
| run: Copy-Item .\HMCLauncher\Release\HMCLauncher.exe -Destination .\HMCL\src\main\resources\assets\HMCLauncher.exe | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'zulu' | ||
| java-version: '11' | ||
| java-package: 'jdk+fx' | ||
| - name: Build with Gradle | ||
| run: .\gradlew makeExecutables --no-daemon | ||
| env: | ||
| MICROSOFT_AUTH_ID: ${{ secrets.MICROSOFT_AUTH_ID }} | ||
| MICROSOFT_AUTH_SECRET: ${{ secrets.MICROSOFT_AUTH_SECRET }} | ||
| CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} | ||
| - name: Get short SHA | ||
| run: echo "SHORT_SHA=$("${{ github.sha }}".SubString(0, 7))" >> $env:GITHUB_ENV | ||
| - name: Copy HMCLauncher to libs | ||
| run: Copy-Item .\HMCLauncher\Release\HMCLauncher.exe -Destination .\HMCL\build\libs\HMCLauncher.exe | ||
| - name: Upload Artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: HMCLauncher-${{ env.SHORT_SHA }} | ||
| path: HMCL/build/libs/*.exe |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,25 @@ | ||
| name: Check Style | ||
|
|
||
| on: [push, pull_request] | ||
| on: | ||
| push: | ||
| paths: | ||
| - '**.java' | ||
| pull_request: | ||
| paths: | ||
| - '**.java' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v3 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'zulu' | ||
| java-version: '11' | ||
| java-package: 'jdk+fx' | ||
| - name: Check style main | ||
| run: ./gradlew checkstyleMain | ||
| run: ./gradlew checkstyleMain --no-daemon | ||
| - name: Check style test | ||
| run: ./gradlew checkstyleTest | ||
| run: ./gradlew checkstyleTest --no-daemon |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,23 @@ | ||
| name: Check Translations | ||
|
|
||
| on: [push, pull_request] | ||
| on: | ||
| push: | ||
| paths: | ||
| - '**.properties' | ||
| pull_request: | ||
| paths: | ||
| - '**.properties' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v3 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'zulu' | ||
| java-version: '11' | ||
| java-package: 'jdk+fx' | ||
| - name: Check style test | ||
| run: ./gradlew checkTranslations | ||
| run: ./gradlew checkTranslations --no-daemon |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,35 @@ | ||
| name: Java CI | ||
|
|
||
| on: [push, pull_request] | ||
| on: | ||
| push: | ||
| pull_request: | ||
| paths-ignore: | ||
| - '**.md' | ||
| - 'HMCLauncher/**' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v3 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'zulu' | ||
| java-version: '11' | ||
| java-package: 'jdk+fx' | ||
| - name: Build with Gradle | ||
| run: ./gradlew build | ||
| run: ./gradlew build --no-daemon | ||
| env: | ||
| MICROSOFT_AUTH_ID: ${{ secrets.MICROSOFT_AUTH_ID }} | ||
| MICROSOFT_AUTH_SECRET: ${{ secrets.MICROSOFT_AUTH_SECRET }} | ||
| CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} | ||
| - name: Get short SHA | ||
| run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV | ||
| - name: Upload Artifacts | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: HMCL-${{ env.SHORT_SHA }} | ||
| path: HMCL/build/libs |
Oops, something went wrong.