fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,641 Commits 61 Branches 1,838 Tags
b4da616c8b93dd2a2ae2ea07076f0eb738cffab7
Commit Graph

2641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_ChingC
b4da616c8b Merge commit '3ff908f0d4407ee08d80bbb19ea844fe8fe8fe6c' into dev 2022-07-26 21:25:28 +08:00
_ChingC
26139bf776 fix: 修复一些i18n问题 2022-07-26 21:23:48 +08:00
MistEO
3ff908f0d4 fix: fix build error on Linux 2022-07-26 21:11:08 +08:00
_ChingC
5b3edb2b20 fix: 修复格式化字符串错误 2022-07-26 20:25:05 +08:00
ChingC
b63aac5765 Merge commit 'cb91ad4f7e1685b90401a847cff2258007de4fb9' into dev 2022-07-26 16:34:34 +08:00
ChingC
03ed2193ab feat: SettingView part translation completed 2022-07-26 16:34:22 +08:00
ABA2396
cb91ad4f7e feat: AutoRecruitSettings translation completed 2022-07-26 16:24:13 +08:00
ABA2396
41e12d9075 feat: AboutUserControl translation completed 2022-07-26 15:33:47 +08:00
ChingC
f615f66c11 Merge commit '47103efa246f69bf1acbd6fc212a2202e7ba2c1c' into dev 2022-07-26 15:03:58 +08:00
ChingC
3bf92330d6 feat: Complete the SettingView module enUS translation 2022-07-26 15:03:08 +08:00
ABA2396
47103efa24 feat: TrayIcon translation completed 2022-07-26 14:54:56 +08:00
ABA2396
2395ded07a Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 14:44:29 +08:00
ABA2396
12e691bfa9 feat: AsstProxy translation completed 2022-07-26 14:44:16 +08:00
ChingC
52b2ffdd40 feat: Complete the SettingView module translation 2022-07-26 14:38:30 +08:00
MistEO
289c2ff2e9 style: add some space 2022-07-26 10:38:34 +08:00
MistEO
855336ecb6 Merge pull request #1328 from AkarinVS/patch/stuck-at-reward-claiming 
YoStarEN: fix stuck at reward claiming screen
 2022-07-26 09:39:04 +08:00
Arkarin
ecae7833a2 fix stuck at reward claiming screen 2022-07-26 09:41:59 +09:00
ABA2396
1e01fe5ee8 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 00:12:01 +08:00
ABA2396
275463bec5 feat: Complete the CopilotView module translation 2022-07-26 00:11:45 +08:00
ABA2396
94cfcf9cc9 feat: Complete the RecruitView module translation 2022-07-25 22:51:35 +08:00
MistEO
86ded093bc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 22:47:05 +08:00
MistEO
d74faf0692 feat: support switching language in tray menu 2022-07-25 22:47:02 +08:00
ABA2396
07aa6372e6 feat: Hover prompts translation 2022-07-25 22:41:58 +08:00
Helloworld
874c27e0c5 docs: 填上UI对应内容 2022-07-25 22:27:06 +08:00
MistEO
84991f14bd fix: 处理 i18n 的一些特殊 case 2022-07-25 22:19:04 +08:00
MistEO
f66a69d727 feat: 根据用户系统语言设置默认语言，重构小部分代码 2022-07-25 22:11:26 +08:00
MistEO
1237a7caa7 feat: set default language to zh-cn 2022-07-25 21:52:52 +08:00
MistEO
51cb30cfd8 fix: 修复默认关卡不正确的问题 2022-07-25 21:40:32 +08:00
MistEO
bb07197823 feat: 默认关卡改为当前关卡/上次关卡自动识别 2022-07-25 21:38:36 +08:00
ABA2396
6d1a45846a style: rename 2022-07-25 20:11:46 +08:00
ABA2396
6c72b07426 feat: Complete the translation of TaskQueue module except for dropped items 2022-07-25 19:56:54 +08:00
ABA2396
642b6b4deb style: stage renaming 2022-07-25 18:23:30 +08:00
ABA2396
d184491478 feat: stage translation 2022-07-25 18:02:40 +08:00
ABA2396
fbcb3e1b60 feat: Copilot module translation 2022-07-25 17:12:56 +08:00
ABA2396
aa6677df07 feat: RecruitViewModel Module translation 2022-07-25 16:41:31 +08:00
ABA2396
04dccc8ba9 feat: FightSettingsUserContral module translation 2022-07-25 16:00:13 +08:00
ABA2396
71a968d193 feat: TaskQueue module translation 2022-07-25 15:05:02 +08:00
zzyyyl
6ca5cf1a31 chore: 优化识别贡献者名字的正则表达式 2022-07-25 11:01:36 +08:00
yuanyan3060
656bf52c1e feat: 增加rust绑定和http服务器实现捏 (#1321) 
* 增加maa-core的rust绑定

* Update Readme.md

* update Readme
 2022-07-25 10:30:22 +08:00
MistEO
8f8b05ec32 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 00:48:41 +08:00
MistEO
f3543e8521 fix: 修复界面 l10n 的一点小问题 2022-07-25 00:48:33 +08:00
MistEO
148a54ab48 Merge pull request #1320 from zzyyyl/chore/addlink 
chore: 使 CHANGELOG 里的贡献者名字自动带上链接
 2022-07-25 00:41:43 +08:00
MistEO
8218e7fb4d revert: 回滚错误提交的文件 2022-07-25 00:41:20 +08:00
MistEO
c6b32629f4 fix: 修复 core get接口错误 2022-07-25 00:39:54 +08:00
MistEO
0c366d282c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 00:28:27 +08:00
MistEO
89ff550c89 fix: 修复掉落识别错误，重写部分基线识别算法 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1318
 2022-07-25 00:28:14 +08:00
_ChingC
c9bfa8beb1 feat: 添加多语言本地化 
- TODO: 需要翻译
 2022-07-25 00:03:57 +08:00
zzyyyl
a3990f35bb chore: 给自动带上贡献者链接加个小异常处理 2022-07-24 23:27:26 +08:00
zzyyyl
f31947d049 chore: 给自动带上贡献者链接修个小 bug 2022-07-24 23:15:37 +08:00
zzyyyl
19886d983e chore: 使 CHANGELOG 里的贡献者名字自动带上链接 2022-07-24 23:04:10 +08:00