Zuosizhu bb50753c29 Merge branch 'master_lme' ...

# Conflicts:
#	module/device/device.py

2023-12-16 00:39:48 +08:00

..

base

Merge branch 'LmeSzinc:master' into 20230309

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

campaign

Merge branch 'LmeSzinc:master' into 20230309

2023-11-24 07:58:05 +08:00

coalition

Merge branch 'master_lme'

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

combat

Merge branch 'master_lme'

2023-10-26 00:04:07 +08:00

commission

Fix: daily_event typo (fixed #2525)

2023-04-27 22:12:44 +08:00

config

Merge branch 'master_lme'

2023-12-16 00:39:48 +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 'master_lme'

2023-12-16 00:39:48 +08:00

dorm

Fix: Collect coins and loves in dorm

2023-11-10 12:00:30 +08:00

equipment

Merge branch 'LmeSzinc:master' into 20230309

2023-10-27 18:21:25 +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

Add: timeout setting of enabling gg

2023-10-12 22:35:54 +08:00

guild

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

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

handler

Merge branch 'master_lme'

2023-12-16 00:39:48 +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 branch 'LmeSzinc:master' into 20230309

2023-11-10 14:33:24 +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 'LmeSzinc:master' into 20230309

2023-10-19 22:53:32 +08:00

os_ash

Merge branch 'master_lme'

2023-09-28 18:09:13 +08:00

os_combat

Merge branch 'LmeSzinc:master' into 20230309

2023-10-19 22:53:32 +08:00

os_handler

Merge branch 'LmeSzinc:master' into 20230309

2023-09-22 08:15:14 +08:00

raid

Merge branch 'master_lme'

2023-10-26 00:04:07 +08:00

research

Fix: [JP] GameTooManyClickError in research_detect()

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

retire

Merge branch 'LmeSzinc:master' into 20230309

2023-11-17 08:01:26 +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

Merge branch 'LmeSzinc:master' into 20230309

2023-11-24 07:58:05 +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

Fix: Rapid training triggers too many click between 2 buttons (#3349)

2023-12-14 19:26:44 +08:00

template

Add: Chapter T

2023-11-24 00:45:23 +08:00

ui

Merge branch 'LmeSzinc:master' into 20230309

2023-11-24 07:58:05 +08:00

war_archives

add war_archive: Inverted orthant (#3089)

2023-09-08 01:14:18 +08:00

webui

Merge branch 'master_lme'

2023-12-16 00:39:48 +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

…