LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 01:19:28 +08:00
Code Activity
7,843 Commits 12 Branches 0 Tags
9c0d07ae66bdfd7bb59f7ad47ca62a74b80fd2dc
Commit Graph

344 Commits

Author SHA1 Message Date
LA-DI-DA
0f600f7b52 Add: timeout setting of changing ship's type and attribute 2023-10-19 16:20:30 +08:00
LA-DI-DA
bcd8dbc1ce Revert "Add: user setting of scrolling dock and scrolling fleet" 
This reverts commit 3f3da4ff85.
 2023-10-19 13:42:06 +08:00
LA-DI-DA
8322140284 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/gg_handler/gg_handler.py
 2023-10-15 22:08:23 +08:00
LA-DI-DA
3f3da4ff85 Add: user setting of scrolling dock and scrolling fleet 2023-10-13 11:46:10 +08:00
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
e3db31de2e Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-09-30 16:50:09 +08:00
LA-DI-DA
b077bf9719 Add: change ship type for GemsFarming when set C or D map 2023-09-30 16:50:01 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +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
4e6f51ed7c Sync: [SRC] Emulator settings 2023-09-10 15:04:32 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +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
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-01 17:58:39 +08:00
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +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
LA_DI_DA
174ea3530b Add: more option for auto restart when alas get a error 2023-08-27 14:53:24 +08:00
LA-DI-DA
5711665c38 Del: useless small game 2023-08-18 20:34:54 +08:00
LA-DI-DA
303c0629ae Add buy game coin 2023-07-24 00:17:44 +08:00
LA-DI-DA
f9fd4b41e4 Rewrite small game and shit 2023-07-23 16:06:49 +08:00
LA-DI-DA
b032b8e52b Add shabi small game 2023-07-23 01:39:32 +08:00
LA-DI-DA
46f85afe26 Add something special 2023-07-21 21:48:43 +08:00
LA-DI-DA
d6abebc108 Add something special 2023-07-21 21:14:10 +08:00
LA-DI-DA
877660eb1b Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-07-21 18:58:28 +08:00
Tipsy Fisher
6fca29e79c Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-21 00:07:41 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LA-DI-DA
d392dadf51 Add something special 2023-07-20 22:37:00 +08:00
SarContDeli
048268b406 Add: Consume spilled Coins 2023-07-18 23:20:50 +08:00
LmeSzinc
88ce9fab44 Merge branch 'master' into feature 2023-07-16 17:47:14 +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
Tipsy Fisher
a962b13343 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +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
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
LmeSzinc
294f72023b Merge branch 'master' into feature 2023-06-01 22:26: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
Chill Magic
49377d51eb Add 'com.bilibili.blhx.bilibiliMove' (#2649) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-29 20:22:05 +08:00
Zuosizhu
bd04ff6708 Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-27 23:48:02 +08:00
LmeSzinc
8ceb15dafc Add: [CN] Channel server com.bilibili.blhx.dl 2023-05-27 22:46:30 +08:00
LmeSzinc
ea9b198205 Merge branch 'master' into feature 2023-04-28 01:15:50 +08:00
Zuosizhu
d2e395dc3a Fix: All 2023 to 2020 in datetime 2023-04-28 01:06:46 +08:00