LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-23 04:09:29 +08:00
Code Activity
6,704 Commits 12 Branches 0 Tags
358dee21bca55c0ec4e1c84d16ab910eb6fd1f32
Commit Graph

1185 Commits

Author SHA1 Message Date
Zuosizhu
358dee21bc Merge branch 'LmeSzinc:master' into master 2023-06-14 12:46:43 +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
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
e9472e67e2 Merge branch 'LmeSzinc:master' into master 2023-06-08 21:42:49 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +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
hgjazhgj
a06837d99a Merge branch 'dev' into fpy 2023-06-03 22:22:42 +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
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
Zuosizhu
014f66b0eb Merge branch 'LmeSzinc:master' into master 2023-05-27 23:47:18 +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
51824d7a48 Merge branch 'LmeSzinc:master' into master 2023-05-27 20:30:12 +08:00
hgjazhgj
742e34c8d0 Merge branch 'dev' into fpy 2023-05-27 19:12:05 +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
6be765e31c Merge branch 'LmeSzinc:master' into master 2023-05-26 00:26:55 +08:00
LmeSzinc
6487e460fa Fix: Re-fit OpSi globe swipes 2023-05-25 22:32:45 +08:00
Zuosizhu
72047f9802 Merge branch 'LmeSzinc:master' into master 2023-05-16 22:08:43 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
Zuosizhu
435366c7f6 Merge branch 'master_lme' into master_Dashboard 
# Conflicts:
#	module/campaign/run.py
 2023-05-15 17:23:13 +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
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +08:00
hgjazhgj
b18be2ae2b Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00
Zuosizhu
3590356135 Merge branch 'LmeSzinc:master' into master 2023-05-03 21:23:51 +08:00
Zuosizhu
6ba40f3e94 Merge branch 'LmeSzinc:master' into master 2023-04-28 20:50:37 +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
f8dc5471a7 Merge branch 'LmeSzinc:master' into master 2023-04-28 01:04:17 +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
cb8be9b7b7 Merge branch 'LmeSzinc:master' into master 2023-04-27 15:24:02 +08:00
Horizon101011
3b0cffa420 Upd: ServerChecker support for new servers (#2523) 2023-04-27 12:25:58 +08:00
Zuosizhu
abf06ad6a1 Merge branch 'LmeSzinc:master' into master 2023-04-25 00:04:50 +08:00
LmeSzinc
c751e450f4 Fix: Disable SHOP_EXTRACT_TEMPLATE 2023-04-22 00:26:06 +08:00
Zuosizhu
af610bda6b Merge branch 'LmeSzinc:master' into master 2023-04-20 01:03:26 +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
bb5f4ef34d Fix: Lost args 2023-04-14 10:35:43 +08:00
Zuosizhu
d33e70bef9 Merge branch 'master_lme' into master_Dashboard 
# Conflicts:
#	module/config/argument/args.json
 2023-04-14 00:15:42 +08:00
xzjjasper
9a64583c88 Upd: [TW] Microlayer Medley Rerun (#2487) 2023-04-13 21:34:52 +08:00