xhqss
|
4137ff807c
|
Merge branch 'master_lme' into dev
# Conflicts:
# module/config/argument/args.json
# module/map/assets.py
# module/shop/shop_reward.py
# module/ui/assets.py
|
2025-10-24 11:10:21 +08:00 |
|
LmeSzinc
|
767f13ae62
|
Add: Chapter T
|
2025-10-24 00:52:46 +08:00 |
|
xhqss
|
90c881fda0
|
Merge branch 'master_lme' into dev
# Conflicts:
# module/coalition/coalition.py
# module/config/argument/args.json
# module/ui/assets.py
|
2025-10-17 00:30:43 +08:00 |
|
sui_feng
|
d89094b396
|
Add: war_archives_20231026_cn (#5221)
|
2025-10-16 19:46:24 +08:00 |
|
0O0o0oOoO00
|
f65933e89a
|
Merge branch 'Lme/master' into dev
# Conflicts:
# README.md
# module/config/argument/args.json
|
2025-09-13 23:04:47 +08:00 |
|
LmeSzinc
|
6ed5709db4
|
Fix: Fallback MapAchievement since event doesn't have thread indicator
|
2025-09-13 03:14:40 +08:00 |
|
0O0o0oOoO00
|
f96b13fea2
|
Merge branch 'Lme/master' into dev
# Conflicts:
# assets/cn/campaign/EVENT_20221124_ENTRANCE.png
# campaign/event_20221124_cn/campaign_base.py
# module/campaign/assets.py
# module/config/argument/override.yaml
# module/config/config_updater.py
# module/retire/assets.py
# module/shop/shop_reward.py
|
2025-08-16 14:24:45 +08:00 |
|
LmeSzinc
|
9fe7a79213
|
Add: Chapter T
|
2025-08-15 23:25:53 +08:00 |
|
Zuosizhu
|
b8d12c405f
|
Merge branch 'master_lme' into brocore_dev
# Conflicts:
# config/template.json
# module/awaken/awaken.py
# module/config/argument/args.json
# module/config/argument/argument.yaml
# module/config/argument/menu.json
# 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
|
2025-07-25 11:46:23 +08:00 |
|
LmeSzinc
|
becf0ec1d9
|
Fix: Able to do stage loop TS
|
2025-07-25 01:09:15 +08:00 |
|
LmeSzinc
|
b13e92694b
|
Add: Chapter TS
|
2025-07-25 00:17:30 +08:00 |
|
LmeSzinc
|
6188bd069c
|
Add: Chapter SP
|
2025-07-24 23:41:15 +08:00 |
|
LmeSzinc
|
021cc4e26d
|
Add: Chapter T
|
2025-07-24 23:35:47 +08:00 |
|
0O0o0oOoO00
|
1053aa427e
|
fix: merge mistake of stop barrier
|
2025-05-21 14:07:57 +08:00 |
|
ZuoSiZhu
|
dee0c1484f
|
Merge branch 'master_lme' into dev
# Conflicts:
# campaign/Readme.md
# module/base/utils.py
# module/coalition/assets.py
# 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/handler/login.py
# module/retire/dock.py
# module/retire/enhancement.py
# module/shop/shop_reward.py
|
2025-05-21 04:17:08 +08:00 |
|
0O0o0oOoO00
|
13eb3a079f
|
fix: lack of KeepOil setting
|
2025-05-19 11:37:17 +08:00 |
|
0O0o0oOoO00
|
03a59cca17
|
Merge branch 'dev' into feature/more
|
2025-05-11 15:29:08 +08:00 |
|
0O0o0oOoO00
|
50e1521de1
|
fix: chapter name convertion for event_20250424_cn
|
2025-04-25 14:34:42 +08:00 |
|
LmeSzinc
|
c1eb1e47cc
|
Add: Chapter T
|
2025-04-24 23:43:28 +08:00 |
|
LA-DI-DA
|
62c33f27e0
|
Merge the remaining functions in MoreAlas
|
2025-04-24 23:30:50 +08:00 |
|
ZuoSiZhu
|
58a217d98f
|
Merge branch 'master_lme' into dev
# Conflicts:
# module/webui/app.py
# module/webui/config.py
|
2025-03-28 00:23:16 +08:00 |
|
ZuoSiZhu
|
39c18d8103
|
Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
# deploy/AidLux/0.92/requirements.txt
# module/campaign/campaign_event.py
# module/os/map.py
# module/os_ash/ash.py
# module/webui/config.py
|
2025-02-28 11:01:23 +08:00 |
|
LmeSzinc
|
fc90b8e72b
|
Fix: Disable raid tasks if another event is ongoing
|
2025-02-13 12:50:29 +08:00 |
|
xhqss
|
e7f93d8efe
|
Merge branch 'master_lme'
# Conflicts:
# module/equipment/equipment.py
|
2024-12-20 23:51:48 +08:00 |
|
LmeSzinc
|
bfdf6e4179
|
Fix: Redirect stage names like "B-1" to be foolproof
|
2024-12-11 11:46:23 +08:00 |
|
xhqss
|
d8d70b2607
|
Merge branch 'master_lme'
|
2024-11-23 00:08:44 +08:00 |
|
LmeSzinc
|
64b3122127
|
Add: Chapter T
|
2024-11-22 21:25:41 +08:00 |
|
LA_DI_DA
|
07d61ec68b
|
Merge branch 'refs/heads/LmeSzinc/master' into dev
|
2024-10-25 23:28:19 +08:00 |
|
LmeSzinc
|
847dcd847b
|
Add: Chapter T
|
2024-10-25 19:37:55 +08:00 |
|
LA_DI_DA
|
a2e6986dcd
|
Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
# module/campaign/campaign_status.py
# module/exercise/combat.py
# module/retire/dock.py
# module/retire/enhancement.py
|
2024-10-25 12:01:29 +08:00 |
|
weeswelai
|
cb2ca4375d
|
Upd: In some events, ensure_auto_search_exit enters a dead loop (#4227)
|
2024-09-23 19:14:12 +08:00 |
|
LA_DI_DA
|
02fec1598d
|
Merge branch 'refs/heads/LmeSzinc/master' into dev
|
2024-08-31 11:05:57 +08:00 |
|
LmeSzinc
|
87cb525b58
|
Add: Chapter T
|
2024-08-30 22:49:07 +08:00 |
|
Zuosizhu
|
1d85336ba4
|
Merge remote-tracking branch 'refs/remotes/Lme/master' into dev
# Conflicts:
# module/device/method/adb.py
# module/device/screenshot.py
|
2024-07-26 08:04:44 +08:00 |
|
LmeSzinc
|
e2d1d2ff8a
|
Upd: Handle yet another mode switch in event_20240725_cn
|
2024-07-26 00:23:57 +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
|
7b81250ec9
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# campaign/Readme.md
# module/config/argument/args.json
|
2024-04-27 15:56:34 +08:00 |
|
Zuosizhu
|
8fd3c7eedd
|
Merge branch 'master_lme_to_merge'
# Conflicts:
# assets/cn/equipment/FLEET_DETAIL_CHECK.png
# assets/en/equipment/FLEET_DETAIL_CHECK.png
# assets/jp/equipment/FLEET_DETAIL_CHECK.png
# assets/tw/equipment/FLEET_DETAIL_CHECK.png
# deploy/docker/requirements.txt
# deploy/git.py
# module/campaign/gems_farming.py
# module/equipment/assets.py
# module/equipment/equipment_change.py
# requirements-in.txt
# requirements.txt
|
2024-04-27 13:00:39 +08:00 |
|
LmeSzinc
|
bfb9bd0d61
|
Fix: Convert stage names in event_20240425_cn
|
2024-04-26 04:07:31 +08:00 |
|
Zuosizhu
|
4486c8cff6
|
Merge branch 'LmeSzinc:master' into 20230309
|
2024-04-15 23:25:52 +08:00 |
|
LmeSzinc
|
42af2e479f
|
Chore: [ALAS] Abstract has_cached_image
|
2024-04-13 02:28:11 +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
|
356496af2c
|
Merge branch 'LmeSzinc:master' into 20230309
|
2024-01-24 00:47:13 +08:00 |
|
somegituser
|
d29f93c1c1
|
add: wararchive Dreamwaker's Butterfly & Mirror Involution
新增作战档案: 蝶海梦花&镜位螺旋
|
2024-01-23 14:05:05 +08:00 |
|
LA-DI-DA
|
824b353f3d
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# module/config/argument/args.json
|
2023-11-24 17:00:55 +08:00 |
|
Zuosizhu
|
395090785f
|
Merge branch 'LmeSzinc:master' into 20230309
|
2023-11-24 07:58:05 +08:00 |
|
LmeSzinc
|
8a8fcaf56f
|
Add: Chapter T
|
2023-11-24 00:45:23 +08:00 |
|
LA-DI-DA
|
5a8182256e
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# module/config/argument/args.json
# module/config/argument/override.yaml
|
2023-10-29 12:03:28 +08:00 |
|
LA-DI-DA
|
5326fe7940
|
Revert "Add(tmp): Tempesta and the Fountain of Youth"
This reverts commit 9c0d07ae
|
2023-10-29 11:59:30 +08:00 |
|
Zuosizhu
|
8815928c27
|
Merge branch 'LmeSzinc:master' into 20230309
|
2023-10-29 07:01:00 +08:00 |
|