LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 07:39:31 +08:00
Code Activity
8,166 Commits 12 Branches 0 Tags
5aa1d8313500595b3fc7601216dec90acb25bd21
Commit Graph

5721 Commits

Author SHA1 Message Date
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
7f3fcf3d5f Add: check alas instance if outdated 2024-02-25 00:08:43 +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
6e1baa0965 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-02-18 17:43:53 +08:00
Zuosizhu
f7a193a8c0 Merge branch 'LmeSzinc:master' into 20230309 2024-02-18 16:36:23 +08:00
RilyLC
adaf2a6160 Upd:[TW]war_archives assets (#3490) 2024-02-18 01:37:15 +08:00
LA_DI_DA
142cc1696d Add: one click clear all task 2024-02-15 19:23:34 +08:00
LA_DI_DA
1a467113f9 Fix: reset general shop consume coins setting when setting is still bool 2024-02-15 18:16:28 +08:00
LA_DI_DA
ce634e5006 Fix: check stop barrier if equals to campaign name 2024-02-11 09:54:37 +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
65f3426ae6 Add: stop barrier 2024-02-08 15:00:32 +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
Zuosizhu
f8ce1d0395 Merge branch 'LmeSzinc:master' into 20230309 2024-02-07 01:42:58 +08:00
RilyLC
7968771265 Upd:[TW]Event assets (#3479) 2024-02-07 00:00:41 +08:00
LA_DI_DA
bc6ca1b38d Add: keep oil for event 2024-02-06 23:19:37 +08:00
LA_DI_DA
bfbe66ec4e Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	README.md
#	module/config/argument/args.json
 2024-02-06 21:51:57 +08:00
LA_DI_DA
259442c13b Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-06 21:48:59 +08:00
RilyLC
511f719240 Upd:[TW]Event:Winter Pathfinder (#3478) 2024-02-06 21:35:22 +08:00
Zuosizhu
73c29c9afd Merge branch 'LmeSzinc:master' into 20230309 2024-02-06 21:00:56 +08:00
LmeSzinc
19ee45b8f2 Merge pull request #3477 from LmeSzinc/dev 
Bug fix
 2024-02-06 20:42:21 +08:00
LmeSzinc
ae855a8a74 Fix: Handle missing / in dorm food ocr 2024-02-06 20:39:23 +08:00
LmeSzinc
1750f31199 Fix: Handle missing / in tactical skill ocr 2024-02-06 20:29:10 +08:00
LmeSzinc
a8a5f5b888 Upd: [EN][JP] Sync DORMMENU assets 2024-02-06 19:22:22 +08:00
yypsybs
8156a60b0c Upd: Dorm menu assets CN 2024-02-06 19:18:57 +08:00
yypsybs
40825c0a42 Upd: Dorm menu assets CN 2024-02-06 18:56:46 +08:00
weeswelai
b3521111f9 Upd: Update pt OCR recognition of Raid_20240130 2024-02-05 10:41:53 +08:00
LA_DI_DA
7973dc950d Upd: help of RestartEverytime in gg manager 2024-02-03 23:05:09 +08:00
LA_DI_DA
712c5be5dd Upd: args.json 2024-02-02 00:17:43 +08:00
LA_DI_DA
ec3d3848fa Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2024-02-02 00:12:39 +08:00
LA_DI_DA
f76fb04804 Fix: lack of event name 2024-02-02 00:07:42 +08:00
LA_DI_DA
f80870505b Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2024-02-01 16:07:58 +08:00
LA_DI_DA
bef5d22d1a Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-01 15:52:19 +08:00
Zuosizhu
edccf21374 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 22:10:18 +08:00
guoh064
e148c9f2ae Upd: Shipyard argument (PR4 and DR3) 2024-01-31 22:06:56 +08:00
weeswelai
01dadb5456 Upd: Update raid_20240130 assets for CN sever. 2024-01-31 22:06:43 +08:00
mulaikurisu
0067321df9 Merge remote-tracking branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:40:47 +08:00
mulaikurisu
fc673c311a Upd: args.json 2024-01-31 18:38:02 +08:00
mulaikurisu
4983b42794 Fix: RAIDS and COALITIONS lock to the latest 2024-01-31 18:35:19 +08:00
mulaikurisu
4f60d70f9b Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:27:04 +08:00
Zuosizhu
62712d1864 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 13:10:56 +08:00
LmeSzinc
c651c250ec Merge branch 'dev' 
# Conflicts:
#	campaign/Readme.md
 2024-01-31 12:17:49 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +08:00
Zuosizhu
1e70cabadf Merge branch 'master_lme' 
# Conflicts:
#	deploy/alas.py
 2024-01-31 09:13:04 +08:00