Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes #6

Open
wants to merge 2,264 commits into
base: javafx
Choose a base branch
from
Open

Merge upstream changes #6

wants to merge 2,264 commits into from

Conversation

kenvix
Copy link
Member

@kenvix kenvix commented Feb 11, 2019

No description provided.

Glavo and others added 26 commits October 13, 2024 20:54
* Update InstallersPage.java

* 优化代码

* Update InstallersPage.java

* Update InstallersPage.java

* fix: checkstyle

* 给 LibraryAnalyzer.LibraryType.fromPatchId 稍微优化一下,把她里面的实现改为一个预先生成的 map,

相信你知道怎么把这个函数改成一个 lookupMap.get(patchId) 的形式

* Update InstallersPage.java

* Update InstallersPage.java

* Fix

* update

---------

Co-authored-by: Glavo <[email protected]>
* 更改为文本更新后触发

* 添加防抖
* 优化关于页面

* update
* Fix some error message wrap

* Fix checkstyle
* Fix some link

* Revise
* Change the download source and thread setting titles to the appropriate i18n key

* update

---------

Co-authored-by: Glavo <[email protected]>
* Revise [skip ci]

Squash previous commits.

* Revise [skip ci]

Unify badge style.

* Revise [skip ci]

Change the badge style of QQ group

* Revise [skip ci]

- Add Chinese variants (Traditional, Taiwan)
- Compilation requirements for Java bump to 11+
- Various revisions

* Revise [skip ci]

Fix a link

* Revise [skip ci]

Revert a change

* Revise [skip ci]

* Revise [skip ci]

* Revise [skip ci]
* Update CallerFinder

* Revert "Fix #2687 (#2688)"

This reverts commit 207b4d0.

* update

---------

Co-authored-by: Glavo <[email protected]>
* Revise zh_CN part 1

* Update

Co-authored-by: Burning_TNT <[email protected]>

---------

Co-authored-by: Burning_TNT <[email protected]>
* Fix mod update channel i18n

* Update

Co-authored-by: Burning_TNT <[email protected]>

* update

---------

Co-authored-by: Burning_TNT <[email protected]>
Co-authored-by: Glavo <[email protected]>
* Revise zh_CN part 2

* Update

* Oops...
* Revise zh_CN part 3

* Update
3gf8jv4dv and others added 30 commits March 2, 2025 23:56
…c) (#3684)

Fully revision, except for the `curse` and `game.crash.reason` parts.

- Re-translate something from English
- Fix some inconsistent terminology
- Change some terminology to make sure to keep up with the game and wiki
- Add some missing translations
- Revise some incorrect/outdated translations
* 在世界管理界面显示世界图标

* update

* update
- Add translations
- Some proper nouns (mod name) keep the original name
- Some proper nouns (game content) follow the game and wiki
* chore(locale): revise english

`settings.launcher.launcher_log.reveal`
Considering that HMCL is a cross-platform launcher and not all systems
use the term `Explorer`, this should be changed to a more generic term.

`update.channel.dev.hint` and `update.channel.nightly.hint`
Revise text style.

Misc
Resolve rendering issues on some text editors.

* Update I18N.properties

---------

Co-authored-by: Glavo <[email protected]>
Oops... Didn't notice this before.

The issue first appeared in #2468
* Update YggdrasilService.java

* Update YggdrasilService.java
- Adjust lblErrorMessage for invalid username to avoid ui truncation
- Improve the wording of warnings
* chore(locale): improve russian translation (game crash part)

- Re-translate something from English
- Fix and unify the style of text left by different contributors
- Fix some inconsistent/incorrect terminology
- Add missing translations

* Update I18N_ru.properties

---------

Co-authored-by: Glavo <[email protected]>
Several i18n keys were added during the 3.6.12 semester.
This patch adds those translations.
- Add translation of the `game.crash` part.
- Improve further the translation of the remaining parts.
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
…ate (#3709)

- `game.version` indicates the currently used game instance
in the game crash window, not the game version.

- Change the i18n key previously used in ModListPageSkin to
`mods.game.version`, to be consistent with the world section.
Shows a scroll bar when needed to prevent user misinterpretation
when there is too much information.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants