LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 11:09:29 +08:00
Code Activity
7,093 Commits 12 Branches 0 Tags
b308b65cde4b11c5ba0b375cbbde505fc4971dbf
Commit Graph

1266 Commits

Author SHA1 Message Date
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +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
xzjjasper
9d5aee0c24 Upd: [TW] Event: Pledge of the Radiant Court (#2626) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-27 22:39:03 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
LmeSzinc
223b36b853 Add: Event entrance of Confluence of Nothingness (event_20230526_cn) 2023-05-26 17:33:14 +08:00
LmeSzinc
e420f4ed04 Upd: Magic map swipe multipliers 2023-05-26 03:01:09 +08:00
Zuosizhu
72e5e200ed Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-26 00:26:23 +08:00
LmeSzinc
6487e460fa Fix: Re-fit OpSi globe swipes 2023-05-25 22:32:45 +08:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
somegituser
5a717e44ad add war_archives: Northern Overture & Aurora Noctis, (#2576) 
新增作战档案录入：北境序曲&永夜幻光
 2023-05-13 19:51:59 +08:00
LmeSzinc
128d9d27d8 Fix: read_file() may return an empty list 2023-05-12 22:03:00 +08:00
LmeSzinc
bb4f341b58 Fix: Add missing InvalidPrefixTemplate key 2023-05-07 21:17:04 +08:00
hgjazhgj
b18be2ae2b Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00
Zuosizhu
af50441528 Merge branch 'LmeSzinc:master' into 20230309 2023-05-03 21:24:06 +08:00
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +08:00
xzjjasper
3b6ce54740 Upd: [TW] Vacation Lane (#2533) 2023-04-28 19:41:37 +08:00
guoh064
8746a0ada3 Opt: Only Delay 12 hours for Hazard1leveling (#2530) 2023-04-28 01:10:53 +08:00
Zuosizhu
d2e395dc3a Fix: All 2023 to 2020 in datetime 2023-04-28 01:06:46 +08:00
Zuosizhu
1666c3e421 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-04-28 01:01:55 +08:00
LmeSzinc
391be3ce51 Gui: Move down CoalitionSp in event daily tasks 2023-04-28 00:52:38 +08:00
LmeSzinc
81f0135b8a Gui: Rename Develop page to Home page 2023-04-28 00:52:38 +08:00
LmeSzinc
0e7b9fe8c8 Add: Event Entrance of Vacation Lane Rerun (event_20230427_cn) 2023-04-27 22:19:30 +08:00
Zuosizhu
18b824d3ba Merge branch 'LmeSzinc:master' into 20230309 2023-04-27 15:24:49 +08:00
Zuosizhu
f15f0befb3 Add: Event entrance of Vacation Lane Rerun(event 20201126 cn) 2023-04-27 15:23:13 +08:00
Horizon101011
3b0cffa420 Upd: ServerChecker support for new servers (#2523) 2023-04-27 12:25:58 +08:00
Zuosizhu
ee1ba9777e Merge branch 'LmeSzinc:master' into 20230309 2023-04-25 00:05:26 +08:00
LmeSzinc
c751e450f4 Fix: Disable SHOP_EXTRACT_TEMPLATE 2023-04-22 00:26:06 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme' 
# Conflicts:
#	alas.py
 2023-04-20 01:25:28 +08:00
LmeSzinc
7ff3e98f5f Merge pull request #2508 from LmeSzinc/dev 
Bug fix
 2023-04-19 22:39:08 +08:00
LmeSzinc
69b01a871c Dev: CodeGenerator for nested expressions 2023-04-15 22:20:57 +08:00
LmeSzinc
d1b1b0ac7d Opt: No map clear percentage waiting in SOS maps 2023-04-15 22:16:40 +08:00
Zuosizhu
d1dc2daa91 Merge branch 'LmeSzinc:master' into 20230309 2023-04-14 00:14:29 +08:00
xzjjasper
9a64583c88 Upd: [TW] Microlayer Medley Rerun (#2487) 2023-04-13 21:34:52 +08:00
Zuosizhu
99c218d903 Add: Event entrance of The Flame-Touched Dagger Rerun(event 20211111 cn) (#2480) 2023-04-13 18:44:51 +08:00
Zuosizhu
d33b8d386f Add: Event entrance of The Flame-Touched Dagger Rerun(event 20211111 cn) 2023-04-13 14:26:01 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +08:00
LmeSzinc
37f932688e Opt: Move down task Coalition since the event is over 2023-04-11 22:21:08 +08:00
LmeSzinc
262f0e25ce Opt: ExerciseStrategy translations 2023-04-11 22:18:01 +08:00
LmeSzinc
f72ab22af8 Merge pull request #2423 from guoh064/dev 
Opt: Clear exercise attempts after final recovery (#2184)
 2023-04-11 21:51:12 +08:00
guoh064
d4724fbb99 Fix: Change Default ExersiceStrategy to aggressive 2023-04-10 08:22:25 +08:00
guoh064
814aa9a41c Opt: Refactor ExercisePreserve settings 2023-04-09 12:52:35 +08:00
Zuosizhu
77df52da34 Fix: use config.server instead of choose another time in GG Handler 2023-04-08 17:15:31 +08:00
guoh064
5d85535ba0 Opt: Config for exercise preserve 2023-04-05 11:31:50 +08:00
Zuosizhu
32c09b1e0a Merge branch 'master_lme' 2023-04-03 09:32:47 +08:00