LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 20:29:31 +08:00
Code Activity
9,097 Commits 12 Branches 0 Tags
ab99aca4c1b6efcedc76f97a6db041b54249df9b
Commit Graph

287 Commits

Author SHA1 Message Date
xhqss
ab99aca4c1 Merge branch 'master' into master_morealas 
# Conflicts:
#	module/webui/app.py
 2024-11-23 00:11:04 +08:00
xhqss
f33cfab853 Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-11-21 23:45:00 +08:00
SarContDeli
bd680eb3a8 Add: fake module PIL for webui (#4374) 
* Add: fake module PIL for webui

* Fix: Load runtime before module PIL

* Upd: Error message of MAA loading failure

* Upd: Adjust timing of import fake module
 2024-11-19 12:37:59 +08:00
LA_DI_DA
f3a2ee56e9 Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:13:31 +08:00
LA_DI_DA
1bdaa5aa47 fix: merge mistake, lack of function in app.py 2024-09-13 23:07:29 +08:00
xhqss
48ba0f043e Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-09-13 20:17:43 +08:00
LmeSzinc
a66760b743 Opt: Patch aiofiles to reduce thread pool size 2024-09-11 22:47:58 +08:00
LA_DI_DA
66d0734ea0 Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2024-07-06 19:23:57 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/os/fleet.py
 2024-06-22 20:31:35 +08:00
LmeSzinc
f810db8bea Fix: Skip first screenshot in tools 
since you cannot run benchmark before benckmarked
 2024-06-21 01:42:45 +08:00
LmeSzinc
5f56a2bdb7 Chore: [ALAS] Move func methods to the Alas class 2024-05-30 13:34:24 +08:00
LA_DI_DA
f8964c88d9 Merge branch 'refs/heads/0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	.gitignore
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/handler/login.py
 2024-05-23 13:07:57 +08:00
LA_DI_DA
6c702d49ef fix(InstanceRestart): record instance which has restarted too many times 2024-05-20 22:39:25 +08:00
LA_DI_DA
1be62c9c8f Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-04-27 16:01:37 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
LA_DI_DA
02587d5f16 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2024-04-27 15:45:38 +08:00
Zuosizhu
055720dd52 Merge branch 'master_lme' 
# Conflicts:
#	deploy/config.py
 2024-04-26 03:18:16 +08:00
LmeSzinc
cfe187ea57 Fix: [ALAS] Deploy config wasn't redirected after Updater.delay() 2024-04-23 00:13:54 +08:00
LA_DI_DA
541737d81d Add: restart instance 2024-04-10 11:31:23 +08:00
LA_DI_DA
5aa1d83135 Fix: auto update and hot-load sync setting 2024-02-25 00:10:13 +08:00
LA_DI_DA
f35266554f Fix: force convert syncee name content to str 2024-02-25 00:09:30 +08:00
LA_DI_DA
bb4cc3917c Fix: save syncer's config 2024-02-21 13:35:10 +08:00
LA_DI_DA
990459273a Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2024-02-20 01:08:21 +08:00
LA_DI_DA
c30ed73736 Add: confirm for clear all task 2024-02-19 17:38:06 +08:00
LA_DI_DA
722a96208a Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/gui.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2024-02-18 17:49:13 +08:00
LA_DI_DA
142cc1696d Add: one click clear all task 2024-02-15 19:23:34 +08:00
LA_DI_DA
97276f12dc Add: check if modified when sync config 2024-02-08 15:16:35 +08:00
LA_DI_DA
4a51ea95ad Fix: save sync config setting 2024-02-08 15:13:41 +08:00
LA_DI_DA
2fec2e9a4a Adj: position of one-click stop 2024-02-07 16:27:48 +08:00
LA_DI_DA
bb39cc05ae Add: sync config 2024-02-07 16:26:43 +08:00
LA_DI_DA
143f90a762 Add: one click to stop all running alas instances 2024-02-07 14:46:00 +08:00
LA-DI-DA
cf14ddd1f3 Opt: dispatch account switch from AlasGUI 2023-12-24 18:44:47 +08:00
LA-DI-DA
01ebb24aa0 Fix: type of AccountGroup.start_time 2023-12-24 14:16:16 +08:00
LA-DI-DA
fad620fe32 Adj: switch account thread 2023-12-24 13:56:05 +08:00
LA-DI-DA
2ce7041bdd Fix: style of switch account 2023-12-24 13:52:27 +08:00
LA-DI-DA
e674005ef5 Fix: switch account config watcher 2023-12-24 13:09:51 +08:00
LA-DI-DA
e10569d805 Fix: sync settings of account switch 2023-12-23 16:24:25 +08:00
LA-DI-DA
891cdc9794 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-12-23 11:09:52 +08:00
LA-DI-DA
2e08b76ff1 Add: one click login 2023-12-22 21:06:25 +08:00
LA-DI-DA
d7b597f09e Add: status switch for switch 2023-12-22 20:40:42 +08:00
LA-DI-DA
175e295ba9 Opt: account switch 2023-12-22 15:46:09 +08:00
LA-DI-DA
76c856c250 Add: support of is_loop 2023-12-21 19:48:00 +08:00
LA-DI-DA
c1b9023e76 Add: support of time_limit == 0 2023-12-21 19:31:42 +08:00
LA-DI-DA
812dda048f Rft: account switch 2023-12-21 13:38:34 +08:00
LA-DI-DA
c272cdc0c3 Add: config saved notify 2023-12-21 12:48:52 +08:00
LA-DI-DA
0014580e45 Add: ./config/account.yaml file check 2023-12-21 12:48:25 +08:00
LA-DI-DA
fd94a7c0f7 Fix: bind checkbox and self.enable_switch config 2023-12-21 12:47:37 +08:00
LA-DI-DA
1673a9d61d Add: switch account 2023-12-20 22:26:36 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme' 
# Conflicts:
#	module/device/device.py
 2023-12-16 00:39:48 +08:00
LmeSzinc
a37438bd02 Fix: [ALAS] Checkbox cannot be dynamically updated 2023-12-07 22:35:36 +08:00