LmeSzinc 9f47fb9bc2 Merge branch 'master' into app ...

# Conflicts:
#	module/combat/auto_search_combat.py

2021-09-20 18:02:52 +08:00

..

base

Opt: Remove ensure main after task finishes

2021-09-20 17:30:29 +08:00

campaign

Merge branch 'master' into app

2021-09-19 23:34:30 +08:00

combat

Merge branch 'master' into app

2021-09-20 18:02:52 +08:00

commission

Fix: Only 3 Daily commissions are chosen because of wrong de-duplication

2021-09-20 09:33:35 +08:00

config

Opt: Not loading and saving argument database anymore

2021-09-20 12:29:53 +08:00

daemon

Add: support to handle retire/enhance in semi-auto module

2021-09-03 23:10:43 -04:00

daily

Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now

2021-06-20 16:39:14 +08:00

deploy

…

device

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

equipment

[Fix]: get_equiping_list

2021-09-19 20:02:24 +08:00

event

Fix: Daily event SP is influenced by ENABLE_FLEET_REVERSE_IN_HARD in settings

2021-04-25 16:57:01 +08:00

exercise

Merge branch 'gems_farming' into dev

2021-07-24 17:33:58 +08:00

gacha

Fix: [JP] retire&gacha assets except DOCK_SELECTED

2021-08-08 17:01:47 +08:00

guild

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

handler

Fix: Auto search option handling after retire

2021-09-18 18:45:35 +08:00

hard

Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now

2021-06-20 16:39:14 +08:00

map

Merge branch 'master' into app

2021-09-17 23:53:15 +08:00

map_detection

Merge branch 'master' into app

2021-09-17 23:53:15 +08:00

ocr

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

os

Merge branch 'master' into app

2021-09-17 23:53:15 +08:00

os_ash

Fix: typo in condition, args state greater than or equal to configured tier

2021-09-14 18:56:35 -04:00

os_combat

Fix: Miss combat status in OS auto search

2021-08-23 18:27:39 +08:00

os_handler

Fix: Failed to execute map order again after buying action points

2021-09-12 16:04:32 +08:00

raid

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

research

Refactor: Rename auto search configs

2021-09-15 23:50:30 +08:00

retire

Merge branch 'master' into app

2021-09-17 23:53:15 +08:00

reward

Merge branch 'master' into app

2021-09-19 23:34:30 +08:00

shipyard

Merge pull request #623 from railzy/shipyard

2021-09-19 14:25:10 +08:00

shop

Fix: [TW] Shop module asset

2021-08-12 19:16:27 +08:00

sos

Fix: avoid sos calls daily_sos again

2021-09-08 17:29:18 +08:00

statistics

Refactor: Rename retire configs

2021-09-15 23:33:06 +08:00

tactical

Opt: Remove ensure main after task finishes

2021-09-20 17:30:29 +08:00

template

Fix: [JP] SOS module assets

2021-09-04 17:37:05 +08:00

ui

Opt: Remove ensure main after task finishes

2021-09-20 17:30:29 +08:00

war_archives

Add: [EN, JP] War Archives daily option

2021-09-18 13:16:54 -04:00

exception.py

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

logger.py

Rename configs in device, and research

2021-09-14 14:43:14 +08:00

update.py

…