LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 15:49:29 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

126 Commits

Author SHA1 Message Date
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
Zuosizhu
0b2f9ed81c Merge branch 'dev' 
# Conflicts:
#	campaign/campaign_main/campaign_15_1.py
#	campaign/campaign_main/campaign_15_2.py
#	campaign/campaign_main/campaign_15_3.py
#	campaign/campaign_main/campaign_15_4.py
 2024-04-19 02:17:51 +08:00
Air111
a7f9518661 Opt: sort latest events in config update (#3653) 2024-04-18 12:21:55 +08:00
xhqss
765eeed754 Merge branch '20230309' into smallkai 2024-04-11 22:12:34 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.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/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +08:00
LmeSzinc
2a74c338a3 Opt: Limit screenshot and control combinations when using nemu_ipc 2024-04-08 04:32:33 +08:00
LA_DI_DA
0dcfc6c95a Revert "Update config_updater.py and template" 
This reverts commit 4019f6735a.
 2024-03-16 13:19:52 +08:00
LA_DI_DA
c5456814a5 Fix: force event daily, raids and coalitions to latest event 2024-03-01 20:32:58 +08:00
mulaikurisu
4983b42794 Fix: RAIDS and COALITIONS lock to the latest 2024-01-31 18:35:19 +08:00
LA-DI-DA
c921b04fe0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2024-01-02 23:06:15 +08:00
Zuosizhu
9934be19fe Merge branch 'master_lme' 
# Conflicts:
#	module/config/config.py
#	submodule/AlasFpyBridge/module/config/config.py
 2023-12-29 14:46:10 +08:00
LmeSzinc
046e20d45f Del: Remove config redirections because they were a long time ago 2023-12-28 02:45:39 +08:00
LA-DI-DA
03f56ac4f0 Merge branch 'zuosizhu-alas/master' 2023-11-10 16:54:55 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
eda63d72f8 Refactor: Config update callback 2023-11-03 03:34:23 +08:00
LA-DI-DA
7ea587b1cf Adj: disable to lock to latest event 2023-10-29 12:09:36 +08:00
LA-DI-DA
5a8182256e Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/override.yaml
 2023-10-29 12:03:28 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
75a58f5640 Opt: [ALAS] Turn type lock to type state 2023-10-28 22:03:47 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
4f110c047b Opt: Sort events in args.json and i18n 2023-10-14 22:58:57 +08:00
LA-DI-DA
09f4a227bb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-23 22:30:37 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LmeSzinc
73bc7b44a2 Add: Auto-update deploy.yaml.tpl 2023-09-09 20:03:50 +08:00
LA_DI_DA
8368cce3fb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
 2023-09-03 19:13:52 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	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/webui/app.py
 2023-09-02 17:47:24 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
Zuosizhu
f55daeaf45 Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes. 2023-08-27 22:14:28 +08:00
LmeSzinc
f86e37b16b Add: [ALAS][TW] Standardize zh-TW translation 2023-08-27 17:45:21 +08:00
LA-DI-DA
4019f6735a Update config_updater.py and template 2023-07-21 21:58:57 +08:00
LmeSzinc
46cc21fe6b Merge branch 'master' into feature 
# Conflicts:
#	module/daemon/uncensored.py
 2023-07-02 17:03:36 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
霞飛
d73ec47031 feat: headless environment support (#2782) 
* chore(linux): config template for Linux

* feat: Linux configuration template updater

* feat: headless requirements updater

* chore: Sorted by dictionary order

* chore: Remove useless dependencies.

* chore: remove cache operation.
 2023-06-24 19:09:24 +08:00
Zuosizhu
7cea084ecb Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
 2023-06-22 01:06:48 +08:00
LmeSzinc
093a6efba0 Merge branch 'dev' into feature 
# Conflicts:
#	module/config/argument/task.yaml
 2023-06-17 22:19:05 +08:00
LmeSzinc
0c37354ed5 Opt: List tasks instead of collapsing them in submodules 2023-06-17 22:11:19 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
LmeSzinc
44b0cad4bd Merge pull request #2556 from hgjazhgj/fpy 
Add: Submodule AlasFpyBridge (experimental)
 2023-06-11 19:25:41 +08:00
Zuosizhu
ed4d51851c Merge branch 'LmeSzinc:master' into 20230309 2023-06-04 20:03:28 +08:00
LmeSzinc
93b9bbc498 Upd: [CN] Git mirrors 2023-06-04 17:19:45 +08:00
hgjazhgj
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +08:00
Zuosizhu
f780dbf5cf Merge branch 'LmeSzinc:master' into 20230309 2023-03-29 23:41:16 +08:00
LmeSzinc
8269a64646 Merge branch 'master' into feature 2023-03-28 19:28:59 +08:00
LmeSzinc
aeec13cd85 Upd: Set default language in CN deploy templates 2023-03-28 16:55:52 +08:00
Zuosizhu
8606f2af24 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/retire/assets.py
#	module/retire/scanner.py
 2023-03-28 16:50:00 +08:00
LmeSzinc
3ca2695464 Upd: [CN] Coding repo mirror 2023-03-28 16:30:50 +08:00
LmeSzinc
9acade6432 Merge branch 'master' into feature 2023-03-25 00:40:27 +08:00