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

142 Commits

Author SHA1 Message Date
LA_DI_DA
dc51c4c56d Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 
# Conflicts:
#	config/template.json
#	module/campaign/run.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/dashboard.yaml
#	module/config/argument/gui.yaml
#	module/config/argument/menu.json
#	module/config/argument/override.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/config/config_manual.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/research_farming/farming.py
 2024-08-17 22:33:23 +08:00
LA_DI_DA
356c7f097b Add: research farming for opsi hazard1 2024-07-17 22:36:01 +08:00
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +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
72acfd999b fix(AutoRestart): lack of gui setting of InstanceRestart 2024-05-20 22:38:08 +08:00
mulaikurisu
ed5a8f4584 Merge branch 'smallkai' into dev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/device/device.py
 2024-04-12 00:16:19 +08:00
LA_DI_DA
3dba1cf7f9 Add: ship filter for GemsFarming 2024-03-04 22:35:19 +08:00
LA_DI_DA
7f3fcf3d5f Add: check alas instance if outdated 2024-02-25 00:08:43 +08:00
LA_DI_DA
bb39cc05ae Add: sync config 2024-02-07 16:26:43 +08:00
LA_DI_DA
bc6ca1b38d Add: keep oil for event 2024-02-06 23:19:37 +08:00
LA-DI-DA
891cdc9794 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-12-23 11:09:52 +08:00
LA-DI-DA
c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 
# Conflicts:
#	module/device/device.py
 2023-12-23 11:07:19 +08:00
Zuosizhu
ac2b891229 Merge branch 'LmeSzinc:master' into 20230309 2023-12-23 09:15:12 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
LA-DI-DA
2e08b76ff1 Add: one click login 2023-12-22 21:06:25 +08:00
LA-DI-DA
1673a9d61d Add: switch account 2023-12-20 22:26:36 +08:00
LA-DI-DA
1e41b28aa3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-24 17:04:42 +08:00
LA-DI-DA
8ecebef114 Add: higher priority option for OpsiHazard1Leveling 2023-11-11 12:31:58 +08:00
LA-DI-DA
17e1f4c2f1 Add: exit when under maintenance 2023-10-26 17:22:52 +08:00
LA-DI-DA
a577cab199 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-22 12:11:30 +08:00
LA-DI-DA
dc69ce0d79 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-22 12:07:37 +08:00
Zuosizhu
12e8a83005 Opt: Allow to set opsifleet in opsistronghold 2023-10-20 09:06:27 +08:00
LA-DI-DA
1a66d96f92 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 11:23:13 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
de2c563000 Add: research farming(half-finished) 2023-10-05 14:42:06 +08:00
LA-DI-DA
f08f05089c Add: select event for event auto farming 2023-10-03 21:30:32 +08:00
LA-DI-DA
02a1cfe3fa Add: event auto farming 2023-10-03 12:37:51 +08:00
LA-DI-DA
ae25417a88 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-30 19:46:14 +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
75a3fc9e25 Merge branch 'zuosizhu-alas/20230309' into dev 
# Conflicts:
#	module/config/argument/task.yaml
#	module/device/device.py
 2023-09-23 22:41:37 +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
LA-DI-DA
9f449acfb8 Add: more Main 2023-09-22 21:06:52 +08:00
LA-DI-DA
e510aa4536 Add: more Event 2023-09-22 21:03:54 +08:00
LA-DI-DA
0ae82e61ef Add: account's owner login detection 2023-09-22 12:24:08 +08:00
LA-DI-DA
036c4a8850 Add: remark 2023-09-21 13:42:41 +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
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
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
d6abebc108 Add something special 2023-07-21 21:14:10 +08:00
LA-DI-DA
d392dadf51 Add something special 2023-07-20 22:37:00 +08:00
yypsybs
28cae91564 Opt: minigame 
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
 2023-07-11 18:00:03 +08:00
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +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