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,273 commits into
base: javafx
Choose a base branch
from
Open

Merge upstream changes #6

wants to merge 2,273 commits into from

Conversation

kenvix
Copy link
Member

@kenvix kenvix commented Feb 11, 2019

No description provided.

3gf8jv4dv and others added 26 commits October 15, 2024 01:24
* 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
* Revise zh_TW part 1

* Update

* Update

* Update
* update

* update

* update
* 支持下载 OpenJ9

* update
* Updated English version of readme.md

修改了英文版的readme.md,并未增加或删除内容,只是让一些句子更加自然了一些

* Update README.md

Co-authored-by: 3gf8jv4dv <[email protected]>

---------

Co-authored-by: 3gf8jv4dv <[email protected]>
* update

* update

* update
3gf8jv4dv and others added 30 commits March 5, 2025 16:02
- 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.
* 优化 ScrollUtils

* update
* 在日志中记录 Code Page

* update

* update
* Add --enable-native-access for javafx.graphics

* fix checkstyle

* update
* 消除 JEP 498 引入的弃用警告

* Fix checkstyle
* 更新主页公告

* update

* update
* 修复取消导出整合包时弹出报错对话框的问题

* Update
* 修复无法解析部分 Java 版本号的问题

* update

* update
* Add MacOS Style Icon

* MacOS Style Alt Icon

* Scaled Mac Style Icon

* Delete unused icons

* Rename icon

* update

* Optimize icon file

---------

Co-authored-by: Glavo <[email protected]>
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.

10 participants