Merge upstream changes #6
Open
Conversation
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
* update * update
* fix: add locale to avoid wrong yggdrasil server name * update --------- Co-authored-by: Glavo <[email protected]>
* 清理残余 MCBBS 相关内容 * update
* update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update
* 将 24w14potato 添加至 versions.txt * Update test
* 修复 i18n 问题 * update * update
* fix: microsoft login #2979 * fix: typo
* add NEOFORGE_FOREST_OPTIFINE * fix
* Update AboutPage.java * update --------- Co-authored-by: Glavo <[email protected]>
* add macos_failed_to_find_service_port_for_display 日志来自 HMCL KOOK * updata i18n * Update I18N_zh.properties
* 修复导入部分整合包失败的问题 * update * update
* 更新 versions.txt * update
This commit also fixes Lang.getTimer() returns a non-daemon Timer, preventing Java from exiting after closing the launcher.
* Fix cursor is not hand when hovering on ModItem * Fix clicking on the ModItem in ModVersion dialog would open a new dialog again * Fix ESC doesn't work in ModVersion dialog
* Bump Mesa to 24.3.2 * update
* update getAssetIndex() * update --------- Co-authored-by: Glavo <[email protected]>
* 检查安装时的非ASCII字符名称 * i18n * 添加导出模组列表信息功能 * Revert "添加导出模组列表信息功能" This reverts commit 6505d1c. * Update HMCL/src/main/resources/assets/lang/I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update HMCL/src/main/resources/assets/lang/I18N_zh.properties Co-authored-by: 3gf8jv4dv <[email protected]> --------- Co-authored-by: 3gf8jv4dv <[email protected]>
* Update I18N.properties English Translations 更新了英文语言翻译文件，修复了一些语法错误并且让一些句子更加通顺 * Update I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update HMCL/src/main/resources/assets/lang/I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update I18N.properties * Update HMCL/src/main/resources/assets/lang/I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> * Update HMCL/src/main/resources/assets/lang/I18N.properties Co-authored-by: 3gf8jv4dv <[email protected]> --------- Co-authored-by: 3gf8jv4dv <[email protected]>
unify text style
* Revise README [skip ci] * Apply suggestions from yushijinhun Co-authored-by: yushijinhun <[email protected]> --------- Co-authored-by: yushijinhun <[email protected]>
* Revise Spanish & English Overhaul for Spanish. I cannot guarantee it is 100% correct, but I promise to proofread it. During the overhaul some more mistakes in the English language were discovered, so let's fix it. All translations have been revised except for the `game.crash.reason` series. * Apply suggestions from yushijinhun Co-authored-by: yushijinhun <[email protected]> --------- Co-authored-by: yushijinhun <[email protected]>
* Update ISSUE_TEMPLATE [skip ci] * Apply suggestions from yushijinhun Co-authored-by: yushijinhun <[email protected]> --------- Co-authored-by: yushijinhun <[email protected]>
* 模组列表页中按下 Esc 时取消选中 目前在模组列表页中选中模组后，按下 Esc 是不会有任何反应的，因为 [ListView](https://github.com/openjdk/jfx/blob/5b074c4c2b4f539301813322a6589cec28121553/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java#L108) 会处理这个事件，认为是取消编辑，而不论是否处于编辑模式中。 这个 PR 添加了 `FXUtils.ignoreEvent()` 函数，用于忽略掉对特定事件的处理。然后，我们就可以让 ListView 不处理 Esc 按下事件，然后在模组页添加 Esc 处理逻辑（必须让 ListView 忽略掉这个事件，不然就会被它优先处理）。 理论上所有用了 ListView / JFXListView 的地方都会有这个问题，即当焦点在 ListView 中时，按下 Esc 不会触发正常的事件处理（如返回上一页、关闭对话框）。比如在游戏下载页面中，对某个版本按下右键后，焦点就会转移到其上，此时再按 Esc 就毫无反应。 * 修复 Esc 在版本下载页/模组下载页/数据包页不工作
* Update HMCLauncher.sh * update * update --------- Co-authored-by: Glavo <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.