LA-DI-DA 1bdb8c842a Merge branch 'zuosizhu-alas/20230309' into smallkai ...

# Conflicts:
#	module/config/argument/args.json

2023-09-15 11:17:08 +08:00

..

base

Merge branch 'LmeSzinc:master' into 20230309

2023-08-23 19:04:03 +08:00

campaign

Fix: Get value error while creating new enemies

2023-09-15 08:51:24 +08:00

coalition

Merge branch 'master_lme'

2023-09-02 17:47:24 +08:00

combat

Merge branch 'master_lme'

2023-09-02 17:47:24 +08:00

commission

…

config

Merge branch 'zuosizhu-alas/20230309' into smallkai

2023-09-15 11:17:08 +08:00

daemon

Merge branch 'LmeSzinc:master' into 20230309

2023-08-08 20:40:20 +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

2023-09-03 19:13:52 +08:00

dorm

Fix: Handle random ocr error from OCR_DORM_FILL

2023-08-24 12:38:43 +08:00

equipment

Merge branch 'zuosizhu-alas/20230309' into smallkai

2023-08-04 18:22:15 +08:00

event

…

exercise

Del: useless small game

2023-08-18 20:34: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

Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes.

2023-08-27 22:14:28 +08:00

guild

Refactor: [ALAS] Page class

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

handler

Merge branch 'master_lme'

2023-09-15 08:26:53 +08:00

hard

…

log_res

…

map

Merge branch 'master_lme'

2023-09-15 08:26:53 +08:00

map_detection

…

meowfficer

Refactor: [ALAS] Page class

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

meta_reward

Refactor: [ALAS] Page class

2023-07-02 15:24:40 +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

2023-09-11 21:48:50 +08:00

os_ash

Merge branch 'master_lme'

2023-09-02 17:47:24 +08:00

os_combat

Merge branch 'master_lme'

2023-09-11 08:16:09 +08:00

os_handler

Merge branch 'master_lme'

2023-09-15 08:26:53 +08:00

raid

Merge branch 'master_lme'

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

research

Fix: get_research_series() (#2975)

2023-08-06 17:40:43 +08:00

retire

Merge branch 'master_lme'

2023-08-19 09:23:28 +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 'master_lme'

2023-09-02 17:47:24 +08:00

sos

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

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

statistics

add: analysis resource collection (#3107)

2023-09-10 19:53:50 +08:00

storage

Add: Siren templates in chapter A

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

submodule

…

tactical

Merge branch 'lme-alas/master' into wait

2023-07-02 17:28:05 +08:00

template

Add: TEMPLATE_SIREN_Zuiho

2023-09-15 02:37:23 +08:00

ui

Merge branch 'zuosizhu-alas/20230309' into smallkai

2023-09-11 21:48:50 +08:00

war_archives

add war_archive: Inverted orthant (#3089)

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

webui

Merge branch 'master_lme'

2023-09-02 17:47:24 +08:00

exception.py

…

logger.py

…

logger.pyi

…

notify.py

…

server_checker.py

…