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

2674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
dfc1fdf75f Merge pull request #1338 from cloakWatcher/dev 
英文翻译
 2022-07-27 14:30:20 +08:00
cloakWatcher
8207b337fa Merge branch 'dev' of https://github.com/cloakWatcher/MaaAssistantArknights into dev 2022-07-27 00:09:08 -06:00
cloakWatcher
8197cde605 添加英文翻译参考 2022-07-27 00:08:27 -06:00
ABA2396
f431303fec style: style了个我也看不懂的东西 2022-07-27 13:58:43 +08:00
ABA2396
4468432c3e fix: xml错误 2022-07-27 13:54:56 +08:00
ABA2396
202bd77b81 fix: 字段名错误 2022-07-27 13:48:02 +08:00
ABA2396
4c67f710ee Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 13:31:52 +08:00
ABA2396
e65308e23e feat: 韩语翻译（完全机翻） 2022-07-27 13:31:36 +08:00
MistEO
a5ee4cc447 docs: fix translation 2022-07-27 13:11:47 +08:00
MistEO
539dda5a7d Merge branch 'feature/doc-i18n' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 13:09:58 +08:00
MistEO
aef7160c54 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:26:12 +08:00
MistEO
a6f4bf4d1d style: Add KR and JP language supports, but not complete. And fix some translation 2022-07-27 11:25:54 +08:00
ABA2396
1d5451d3a6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:21:09 +08:00
ABA2396
d497f69fee style: 修改一些描述 2022-07-27 11:21:02 +08:00
MistEO
47a2288c12 style: fix a translation 2022-07-27 11:14:16 +08:00
ABA2396
31661912d1 feat: 更改一些英文翻译 2022-07-27 11:13:47 +08:00
MistEO
f13c7b3f41 style: add space 2022-07-27 11:11:56 +08:00
MistEO
5f6da1991f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:07:02 +08:00
MistEO
290a1ddd9e style: add some space 2022-07-27 11:06:39 +08:00
ABA2396
826e4e9eb1 fix: 修复一个拼写错误 2022-07-27 11:01:08 +08:00
MistEO
d43a2f74cf Merge branch 'master' into dev 2022-07-26 22:26:19 +08:00
MistEO
42862f7218 Merge pull request #1334 from MaaAssistantArknights/release/v4.1.2 
chore: 更新复刻活动 `多索雷斯假日` 关卡资源
v4.1.2 		2022-07-26 22:25:46 +08:00
MistEO
f3a6ddf844 docs: 更新CHANGELOG 2022-07-26 22:25:11 +08:00
MistEO
fcde190373 fix: 再次修复掉落识别错误 2022-07-26 22:21:10 +08:00
MistEO
098726d145 fix: 简单修复一些击杀数识别错误的问题 2022-07-26 22:20:17 +08:00
Alex Zhang
de32d7e2da fix: fixed linux build errors 2022-07-26 21:39:30 +08:00
MistEO
239303b74c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 21:30:32 +08:00
MistEO
a1e9525206 fix: fix build error on linux again 2022-07-26 21:30:24 +08:00
_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
MistEO
782f47f366 fix: 调整掉落识别模板匹配阈值为 0.61 2022-07-26 19:51:52 +08:00
ABA2396
598565902b feat: 增加「多索雷斯假日」复刻活动关卡导航 2022-07-26 16:53:25 +08:00
MistEO
55684e987f chore: 更新复刻活动 多索雷斯假日 关卡资源 2022-07-26 16:36:23 +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