LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 17:39:29 +08:00
Code Activity
7,388 Commits 12 Branches 0 Tags
f93b3b3db5c94a3ee40afc59cd3ee419eef215b0
Commit Graph

1359 Commits

Author SHA1 Message Date
LA-DI-DA
f93b3b3db5 Update setting help of ScreenshotInterval and CombatScreenshotInterval 2023-07-20 00:07:06 +08:00
LA-DI-DA
84b2dde422 Merge branch 'wait' into smallkai 
# Conflicts:
#	README.md
#	alas.py
#	assets/cn/gg_handler/BUTTON_GG_ENTER_POS.png
#	assets/cn/gg_handler/BUTTON_GG_TAB_SEARCH_POS.png
#	assets/gui/css/alas.css
#	config/template.json
#	module/campaign/assets.py
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/task.yaml
#	module/config/config_updater.py
#	module/config/i18n/ja-JP.json
#	module/log_res/log_res.py
 2023-07-17 18:45:43 +08:00
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
LA-DI-DA
d984ec5a2c Merge branch 'lme-alas/master' into wait 2023-07-15 10:21:26 +08:00
Ian Lee
91e4100dc4 Upd: [TW] Event:Operation Convergence (#2871) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence
 2023-07-13 23:02:49 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
LA-DI-DA
511334ed84 Merge branch 'lme-alas/master' into wait 2023-07-02 17:28:05 +08:00
LmeSzinc
a6a845a36a Fix: Delay OpsiArchive at AP limit (#2785) 2023-07-02 15:59:02 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
LA-DI-DA
2cd8d3a27e Merge branch 'lme-alas/master' into wait 2023-06-30 17:57:25 +08:00
LmeSzinc
6641d2f891 Fix: Provide simple uncensored instead 2023-06-30 15:37:09 +08:00
LA-DI-DA
c77a769842 Merge branch 'lme-alas/master' into wait 2023-06-29 20:35:12 +08:00
LmeSzinc
e96cd15bc9 Add: Event entrance of Reflections of the Oasis (raid_20230629) 2023-06-29 12:38:01 +08:00
Ian Lee
6f258a83b5 Upd: [TW] Event: Rondo at Rainbow's End (#2810) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End
 2023-06-29 12:31:43 +08:00
Ian Nakiri
6d495e47a3 Upd: [TW] Event: Counterattack Within the Fjord Rerun (#2801) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾
 2023-06-24 22:42:57 +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
LA-DI-DA
d22699abce Merge branch 'zuosizhu-alas/master' into wait 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/config_updater.py
 2023-06-22 19:53:57 +08:00
Zuosizhu
9ecf8e9cfb Merge branch 'master_lme' into master_Dashboard 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/config_updater.py
 2023-06-22 01:09:21 +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
LA-DI-DA
e64d46c049 Merge branch 'lme-alas/master' into wait 2023-06-21 23:42:02 +08:00
梦念逍遥
e0be9888f2 Add: Event entrance of The Mirror Involution Rerun(event 20210527 cn) (#2790) 
* Add: Event entrance of The Mirror Involution Rerun(event 20210527 cn)
 2023-06-21 22:49:53 +08:00
LA-DI-DA
2846c3cf42 Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/config_updater.py
 2023-06-20 22:42:40 +08:00
LmeSzinc
d67f4419d8 Doc: Add help text of the default serial of MuMu 12 2023-06-18 22:06:07 +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
Zuosizhu
358dee21bc Merge branch 'LmeSzinc:master' into master 2023-06-14 12:46:43 +08:00
LA-DI-DA
bbcd8c898d Merge branch 'lme-alas/master' into wait 2023-06-11 22:45:14 +08:00
LmeSzinc
44b0cad4bd Merge pull request #2556 from hgjazhgj/fpy 
Add: Submodule AlasFpyBridge (experimental)
 2023-06-11 19:25:41 +08:00
Zuosizhu
4d31624588 Merge branch 'LmeSzinc:master' into master 2023-06-10 02:53:30 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
bfc020621e Del: Remove task SOS 2023-06-08 23:25:37 +08:00
Fisher Tipsy
ab0c8d0b85 Add: Allow auto attack dossier (#2579) 2023-06-08 22:28:44 +08:00
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
Zuosizhu
e9472e67e2 Merge branch 'LmeSzinc:master' into master 2023-06-08 21:42:49 +08:00
LA-DI-DA
ce4a2cfd31 Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	config/deploy.template-cn.yaml
 2023-06-08 17:08:58 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
Zuosizhu
ed4d51851c Merge branch 'LmeSzinc:master' into 20230309 2023-06-04 20:03:28 +08:00
Zuosizhu
4f405dddf0 Merge branch 'LmeSzinc:master' into master 2023-06-04 20:03:14 +08:00
LmeSzinc
93b9bbc498 Upd: [CN] Git mirrors 2023-06-04 17:19:45 +08:00
LA-DI-DA
fe77ef61bb Merge branch 'zuosizhu-alas/master' into wait 2023-06-04 15:37:37 +08:00
LA-DI-DA
b7a11837e1 Merge branch 'lme-alas/master' into wait 2023-06-04 00:05:54 +08:00
hgjazhgj
a06837d99a Merge branch 'dev' into fpy 2023-06-03 22:22:42 +08:00
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
Zuosizhu
b9ebfcb989 Merge branch 'LmeSzinc:master' into master 2023-06-02 03:55:40 +08:00
LmeSzinc
1841dafb8f Add: [CN] channel server 'com.bilibili.blhx.lenovo' (#2642) 2023-05-30 23:44:00 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
Zuosizhu
2636e80bb2 Merge branch 'LmeSzinc:master' into master 2023-05-30 12:30:46 +08:00
Chill Magic
49377d51eb Add 'com.bilibili.blhx.bilibiliMove' (#2649) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-29 20:22:05 +08:00
LA-DI-DA
2f63c37a9c Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	README.md
 2023-05-28 00:00:38 +08:00
Zuosizhu
bd04ff6708 Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-27 23:48:02 +08:00