1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 05:59:28 +08:00
Commit Graph

6050 Commits

Author SHA1 Message Date
梦念逍遥
b3a373c7fc Merge pull request #8 from MengNianxiaoyao/dev
Dev
2023-01-19 12:14:37 +08:00
梦念逍遥
f44de2453d Merge branch 'master' into dev 2023-01-19 12:14:29 +08:00
梦念逍遥
b9fe91e567 Merge pull request #6 from Zuosizhu/master
[pull] dev from Zuosizhu:master
2023-01-19 12:10:23 +08:00
Zuosizhu
764d1a2f91 Update README.md
增加了图片
2023-01-19 11:11:14 +08:00
Zuosizhu
8f2a992c57 Update README.md
整体重置了README
2023-01-19 11:09:48 +08:00
Zuosizhu
ec39f73954 Merge pull request #10 from Zuosizhu/dev
Add: New Dashboard
2023-01-19 10:17:28 +08:00
Zuosizhu
836212431c Merge pull request #9 from Zuosizhu/dev2
Add: Usable GG Handler
2023-01-19 10:16:21 +08:00
Zuosizhu
cbbd081450 Fix: Tiny format fix 2023-01-19 10:09:21 +08:00
Zuosizhu
b53fcf773c Merge branch 'LmeSzinc:master' into master 2023-01-19 09:57:42 +08:00
Zuosizhu
5728fcd9df Merge pull request #8 from Zuosizhu/dev3
Fix: Lots of Bugs in GG Handler
2023-01-19 09:57:00 +08:00
Zuosizhu
0144a88de2 Merge branch 'dev' into dev3 2023-01-19 09:56:44 +08:00
Zuosizhu
928f8f7660 Fix: Lots of bugs 2023-01-19 09:37:57 +08:00
pull[bot]
5fb289138f Merge pull request #7 from LmeSzinc/master
[pull] master from LmeSzinc:master
2023-01-18 22:46:54 +00:00
LmeSzinc
9305de5f20 Upd: [EN] BATTLE_PREPARATION adding "Sortie" 2023-01-19 03:02:31 +08:00
Zuosizhu
e4e1e6fb8b Merge https://github.com/Zuosizhu/AzurLaneAutoScript into dev 2023-01-19 02:41:43 +08:00
Zuosizhu
48c6cd9687 Merge branch 'LmeSzinc:master' into master 2023-01-19 02:41:29 +08:00
Zuosizhu
0195a08b06 Fix: Not enabling multipier after restart 2023-01-19 02:37:35 +08:00
LmeSzinc
c7df5345d3 Fix: Missing offset on BATTLE_PREPARATION 2023-01-19 02:37:33 +08:00
LmeSzinc
d6d6d70570 Upd: [EN] Temp fix on BATTLE_PREPARATION due to poor i18n 2023-01-19 02:23:46 +08:00
Zuosizhu
038690601a Merge https://github.com/Zuosizhu/AzurLaneAutoScript into dev 2023-01-19 02:21:05 +08:00
Zuosizhu
1e47d1f04e Merge branch 'LmeSzinc:master' into master 2023-01-19 02:13:48 +08:00
Zuosizhu
e1b0c8f284 Merge pull request #6 from MengNianxiaoyao/dev
修改仪表盘样式为表格
2023-01-19 02:11:29 +08:00
Zuosizhu
73ef86ee70 Merge branch 'dev' into dev 2023-01-19 02:10:58 +08:00
Zuosizhu
7386fd48e2 Merge https://github.com/Zuosizhu/AzurLaneAutoScript into dev 2023-01-19 02:06:00 +08:00
Zuosizhu
2b4fa69617 Merge pull request #7 from Zuosizhu/dev2
Add: Totally Useful GG Handler
2023-01-19 02:03:45 +08:00
Zuosizhu
3b4d661f99 Merge branch 'dev' into dev2 2023-01-19 02:03:36 +08:00
Zuosizhu
69519f96bd Add: Totally useful GG Handler 2023-01-19 01:45:56 +08:00
LmeSzinc
312bddfa30 Merge pull request #2146 from LmeSzinc/bug_fix
Bug fix
2023-01-19 00:41:25 +08:00
LmeSzinc
0f4a9ca485 Upd: [EN] KUYBYSHEY raid assets 2023-01-19 00:37:55 +08:00
LmeSzinc
75e5da996f Upd: [JP] RAID_CHECK 2023-01-19 00:23:58 +08:00
LmeSzinc
4e75f0eff1 Merge pull request #2144 from LmeSzinc/bug_fix
Bug fix
2023-01-18 23:20:34 +08:00
LmeSzinc
b13d2cd6f3 Upd: [JP] KUYBYSHEY raid assets 2023-01-18 23:17:57 +08:00
LmeSzinc
186e3305ad Upd: [JP] BATTLE_PREPARATION
cause JP has a bad localization, they dont know the difference between 击 and 擊
2023-01-18 23:17:49 +08:00
LmeSzinc
5f760b779b Upd: [TW] QUEUE_CHECK (#2141) 2023-01-18 22:23:30 +08:00
LmeSzinc
91d234c89a Merge pull request #2143 from xzjjasper/master
Upd: [TW] Mystery Investigation
2023-01-18 22:17:13 +08:00
xzjjasper
8f886badbd Upd: [TW] Mystery Investigation 2023-01-18 22:02:16 +08:00
MengNianxiaoyao
5f008237bc 修正语言文本 2023-01-18 20:01:49 +08:00
梦念逍遥
14e2aae57b Delete pull.yml 2023-01-18 19:55:54 +08:00
梦念逍遥
101e3a464b Delete gitee-mirror.yml 2023-01-18 19:55:39 +08:00
MengNianxiaoyao
514e76ae7e 添加仪表盘到总览 2023-01-18 19:52:05 +08:00
梦念逍遥
8306190bb9 Merge branch 'LmeSzinc:master' into master 2023-01-18 19:36:34 +08:00
LmeSzinc
676284cabd Merge pull request #2140 from LmeSzinc/bug_fix
Add joint operation Winter Pathfinder (raid_20230118)
2023-01-18 18:38:44 +08:00
LmeSzinc
5482dc660d Add: Event Winter Pathfinder (raid_20230118) 2023-01-18 18:30:59 +08:00
LmeSzinc
b14364f36f Add: Event entrance of Winter Pathfinder (raid_20230118) 2023-01-18 17:56:46 +08:00
LmeSzinc
a0fe83699a Upd: Tips for pure black screenshots from MuMu X 2023-01-18 17:32:42 +08:00
LmeSzinc
b81a7849a2 Add: [MAA] Weekly stage fight scheduling (#2125) 2023-01-18 17:23:13 +08:00
Zuosizhu
97faf8adc7 Merge pull request #5 from MengNianxiaoyao/dev
添加仪表盘,修正中文文本
2023-01-18 17:10:28 +08:00
Zuosizhu
2a28f87816 Merge branch 'LmeSzinc:master' into master 2023-01-18 17:10:03 +08:00
MengNianxiaoyao
11994c8dc0 Merge branch 'dev' of https://github.com/MengNianxiaoyao/AzurLaneAutoScript into dev 2023-01-18 14:06:11 +08:00
MengNianxiaoyao
3c9dadd8ff Add Aashboard in Alas Overview 2023-01-18 14:00:04 +08:00