Skip to content

Commit 3bb5da6

Browse files
Merge remote-tracking branch 'upstream/main' into javafx
2 parents cc224a4 + 5cf142d commit 3bb5da6

652 files changed

Lines changed: 56535 additions & 14454 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cnb/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: QQ 群
4+
url: https://docs.hmcl.net/groups.html
5+
about: Hello Minecraft! Launcher 的官方 QQ 交流群。
6+
- name: Discord 服务器
7+
url: https://discord.gg/jVvC7HfM6U
8+
about: Hello Minecraft! Launcher 的官方 Discord 服务器。

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,7 @@ ij_jsp_keep_indents_on_empty_lines = false
10711071
ij_jspx_keep_indents_on_empty_lines = false
10721072

10731073
[{*.markdown,*.md}]
1074+
max_line_length = 200
10741075
ij_markdown_force_one_space_after_blockquote_symbol = true
10751076
ij_markdown_force_one_space_after_header_symbol = true
10761077
ij_markdown_force_one_space_after_list_bullet = true

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ body:
99
value: |
1010
提交前请确认:
1111
12-
* 该问题确实是 **HMCL 的错误**,而**不是 Minecraft 非正常退出**如果你的 Minecraft 非正常退出,请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
13-
* 你的启动器版本是**最新的预览版本**,可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新预览版本。
12+
* 该问题确实是 **HMCL 的错误**,而**不是 Minecraft 非正常退出**如果你的 Minecraft 非正常退出,请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
13+
* 你的启动器版本是**最新的预览版本**。你可以从 [GitHub Actions](https://github.com/HMCL-dev/HMCL/actions/workflows/gradle.yml?query=branch%3Amain+event%3Apush) 或 [nightly.link](https://nightly.link/HMCL-dev/HMCL/workflows/gradle/main) 下载最新预览版本。
1414
1515
如果你的问题并不属于上述两类,你可以选取另一种 Issue 类型,或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
1616
1717
Before submitting, please confirm:
1818
1919
* The issue is indeed **a bug of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
20-
* Your launcher is the **latest nightly build**. You can click [here](https://zkitefly.github.io/HMCL-Snapshot-Update/en) to download the latest nightly build.
20+
* Your launcher is the **latest nightly build**. You can download the latest nightly build from [GitHub Actions](https://github.com/HMCL-dev/HMCL/actions/workflows/gradle.yml?query=branch%3Amain+event%3Apush) or [nightly.link](https://nightly.link/HMCL-dev/HMCL/workflows/gradle/main).
2121
2222
If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
2323
- type: textarea
@@ -38,7 +38,7 @@ body:
3838
attributes:
3939
label: 启动器崩溃报告 / 启动器日志文件 | Launcher Crash Report / Launcher Log File
4040
description: |
41-
如果你的启动器崩溃了,请将崩溃报告填入或将文件拖入下方。
41+
如果你的启动器崩溃了,请将崩溃报告填入 (或将文件拖入) 下方。
4242
如果你的启动器没有崩溃,请在遇到问题后**不要退出启动器**,在启动器的 “设置 → 通用 → 调试” 一栏中点击 “导出启动器日志”,并将导出的日志拖到下方的输入栏中。
4343
**请注意:启动器崩溃报告或日志文件是诊断问题的重要依据,请务必上传!**
4444

.github/workflows/check-codes.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,9 @@ jobs:
2121
distribution: 'zulu'
2222
java-version: '17'
2323
java-package: 'jdk+fx'
24+
- name: Setup Gradle
25+
uses: gradle/actions/setup-gradle@v5
26+
with:
27+
cache-cleanup: never
2428
- name: Check Codes
25-
run: ./gradlew checkstyle checkTranslations --no-daemon --parallel
29+
run: ./gradlew checkstyle checkTranslations --no-daemon --parallel --stacktrace

.github/workflows/check-update.yml

Lines changed: 0 additions & 141 deletions
This file was deleted.

.github/workflows/gitee.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/gradle.yml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,35 @@ jobs:
1919
distribution: 'zulu'
2020
java-version: '17'
2121
java-package: 'jdk+fx'
22+
- name: Setup Gradle
23+
uses: gradle/actions/setup-gradle@v5
24+
with:
25+
cache-cleanup: never
2226
- name: Build with Gradle
23-
run: ./gradlew build --no-daemon
27+
run: ./gradlew build --no-daemon --parallel
2428
env:
2529
MICROSOFT_AUTH_ID: ${{ secrets.MICROSOFT_AUTH_ID }}
26-
MICROSOFT_AUTH_SECRET: ${{ secrets.MICROSOFT_AUTH_SECRET }}
2730
CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
2831
- name: Get short SHA
2932
run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
30-
- name: Upload Artifacts
33+
- name: Upload JAR
34+
uses: actions/upload-artifact@v4
35+
with:
36+
name: HMCL-${{ env.SHORT_SHA }}-jar
37+
path: |
38+
HMCL/build/libs/HMCL-*.jar
39+
HMCL/build/libs/HMCL-*.jar.sha256
40+
- name: Upload EXE
41+
uses: actions/upload-artifact@v4
42+
with:
43+
name: HMCL-${{ env.SHORT_SHA }}-exe
44+
path: |
45+
HMCL/build/libs/HMCL-*.exe
46+
HMCL/build/libs/HMCL-*.exe.sha256
47+
- name: Upload SH
3148
uses: actions/upload-artifact@v4
3249
with:
33-
name: HMCL-${{ env.SHORT_SHA }}
34-
path: HMCL/build/libs
50+
name: HMCL-${{ env.SHORT_SHA }}-sh
51+
path: |
52+
HMCL/build/libs/HMCL-*.sh
53+
HMCL/build/libs/HMCL-*.sh.sha256

.github/workflows/mirror.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Mirror Repository
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
7+
concurrency:
8+
group: mirror-repository
9+
cancel-in-progress: true
10+
11+
jobs:
12+
mirror:
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
include:
17+
- name: Gitee
18+
repo: gitee.com/huanghongxun/HMCL
19+
user: 'hmcl-sync'
20+
token: 'GITEE_SYNC_TOKEN'
21+
- name: CNB
22+
repo: cnb.cool/HMCL-dev/HMCL
23+
user: 'cnb'
24+
token: 'CNB_SYNC_TOKEN'
25+
name: Mirror to ${{ matrix.name }}
26+
if: ${{ github.repository == 'HMCL-dev/HMCL' }}
27+
runs-on: ubuntu-latest
28+
steps:
29+
- name: Mirror GitHub to ${{ matrix.name }}
30+
run: |
31+
git clone --mirror "https://github.com/${{ github.repository }}.git" -- repo
32+
cd repo
33+
git push -f --prune "https://${{ matrix.user }}:${{ secrets[matrix.token] }}@${{ matrix.repo }}.git" "refs/heads/*:refs/heads/*" "refs/tags/*:refs/tags/*"

0 commit comments

Comments
 (0)