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

修改日志分析器 #2495

Merged
merged 32 commits into from
Feb 5, 2024
Merged

修改日志分析器 #2495

merged 32 commits into from
Feb 5, 2024

Conversation

zkitefly
Copy link
Member

No description provided.

@zkitefly zkitefly marked this pull request as ready for review August 31, 2023 02:05
minecraft-exported-crash-info-2023-08-31T20-24-28.zip!/minecraft.log: https://mclo.gs/0gmBukK
@zkitefly
Copy link
Member Author

zkitefly commented Aug 31, 2023

image

image

![image](https://github.com/huanghongxun/HMCL/assets/64117916/23c91366-015a-4b61-8e95-8c488e82a33d)

![image](https://cp.zkitefly.eu.org/https://github.com/huanghongxun/HMCL/assets/64117916/23c91366-015a-4b61-8e95-8c488e82a33d)

@zkitefly
Copy link
Member Author

![](https://img.kookapp.cn/assets/2023-03/bGbLMNRnws1020j1.png)

@huanghongxun
Copy link
Collaborator

图片还是上传到 hmcl-docs 里面吧

@huanghongxun
Copy link
Collaborator

冲突了

burningtnt and others added 2 commits January 8, 2024 11:28
# Conflicts:
#	HMCL/src/main/resources/assets/lang/I18N_es.properties
#	HMCL/src/main/resources/assets/lang/I18N_zh.properties
#	HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
@zkitefly
Copy link
Member Author

zkitefly commented Jan 8, 2024

冲突了

解决了

记得在合并前检查 hmcl-docs!

顺便,更新服务又炸了:https://github.com/huanghongxun/HMCL/issues/2619

@burningtnt
Copy link
Member

#2049

@burningtnt
Copy link
Member

@zkitefly 冲突了

@burningtnt
Copy link
Member

冲突了

@Glavo Glavo merged commit ffeabbf into HMCL-dev:javafx Feb 5, 2024
3 checks passed
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.

4 participants