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

..

base

Merge branch 'LmeSzinc:master' into 20230309

2023-11-10 14:33:24 +08:00

campaign

Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai

2024-01-31 18:27:04 +08:00

coalition

Merge branch 'master_lme'

2023-10-20 01:01:54 +08:00

combat

Merge branch 'zuosizhu-alas/20230309' into smallkai

2023-10-27 19:28:33 +08:00

commission

Fix: Slow OCR is detected as commission flashing bug

2024-01-12 18:29:25 +08:00

config

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-02-18 17:43:53 +08:00

daemon

Merge branch 'master_lme'

2023-10-20 01:01:54 +08:00

daily

Fix: Error caused by loop of Daily Emergency Module Development (#3096)

2023-09-08 12:08:55 +08:00

device

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-01-12 10:31:19 +08:00

dorm

Fix: Handle missing / in dorm food ocr

2024-02-06 20:39:23 +08:00

equipment

Merge branch 'zuosizhu-alas/20230309' into smallkai

2023-10-27 19:28:33 +08:00

event

Opt: Raise error if user is using EventABCD before stages unlocked

2023-03-10 23:30:28 +08:00

exercise

Merge branch 'master_lme'

2023-10-20 01:01:54 +08:00

freebies

Upd: Assets for entering supply pack

2023-07-14 00:31:52 +08:00

gacha

Merge branch 'master_lme'

2023-07-15 20:26:12 +08:00

game_setting

…

gg_handler

Fix: gg ui display incomplete

2024-01-12 12:19:04 +08:00

guild

Fix: Screenshot interval is not extended in daemon and guild combat

2023-10-21 21:35:17 +08:00

handler

Adj: Disable auto clear map for 15-3/15-4, for there's new mechanism

2024-01-27 09:24:17 +08:00

hard

Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn

2023-02-18 01:19:04 +08:00

log_res

commit stashed for GG

2023-02-16 04:01:18 +08:00

map

Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai

2024-01-31 18:27:04 +08:00

map_detection

Fix: Use the same edge_th in detect_edges() and generate()

2023-02-21 21:43:35 +08:00

meowfficer

Upd:[TW]Update Meowfficer assets (#3341)

2023-12-08 18:02:31 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING

2023-09-28 16:26:20 +08:00

ocr

Opt: Add Ocr.SHOW_REVISE_WARNING

2023-06-08 23:27:58 +08:00

os

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-01-12 10:31:19 +08:00

os_ash

Fix: Ash power limit not safe enough

2023-12-28 01:19:55 +08:00

os_combat

Merge branch 'lme-alas/master' into smallkai

2023-10-19 23:00:39 +08:00

os_handler

Fix: unstoppable loop of entering strategic search setting page when opsi_hazard1_leveling

2023-10-25 00:27:30 +08:00

raid

Merge branch 'LmeSzinc:master' into 20230309

2024-02-07 01:42:58 +08:00

research

Fix: [JP] GameTooManyClickError in research_detect()

2023-12-14 00:55:58 +08:00

retire

Fix: Same ships are black when changing hard mode flagships

2023-12-24 18:57:53 +08:00

reward

Refactor: [ALAS] Page class

2023-07-02 15:24:40 +08:00

shipyard

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

shop

Fix: reset general shop consume coins setting when setting is still bool

2024-02-15 18:16:28 +08:00

sos

Del: [CN][EN][JP] Disable SOS task

2023-06-08 16:49:57 +08:00

statistics

Fix: Limit text length when logging upload errors (#3242)

2023-11-01 01:48:42 +08:00

storage

Add: Siren templates in chapter A

2023-08-18 22:29:25 +08:00

submodule

Opt: No raw command textarea in FpyBenchmark

2023-05-09 14:40:24 +08:00

tactical

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-02-06 21:48:59 +08:00

template

Upd: Siren templates

2023-12-23 00:38:13 +08:00

ui

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-02-18 17:43:53 +08:00

war_archives

Upd:[TW]war_archives assets (#3490)

2024-02-18 01:37:15 +08:00

webui

Add: one click clear all task

2024-02-15 19:23:34 +08:00

exception.py

Add: Stop Alas or GemsFarming when auto search settings could not be set

2023-02-28 20:29:30 +08:00

logger.py

Sync: [SRC] Sync alas changes

2023-09-10 15:04:32 +08:00

logger.pyi

Opt: Remove log output to stdout when using electron

2023-02-08 16:37:11 +08:00

notify.py

…

server_checker.py

…