nEEtdo0d a0ec978954 Fix: Resolve merge conflict ...

Merge remote-tracking branch 'origin/master' into guild_reward

# Conflicts:
#	module/guild/assets.py

2021-01-06 10:07:48 -05:00

..

cn

Del: assets from reward, migrate to guild

2021-01-05 19:57:56 -05:00

en

Del: assets from reward, migrate to guild

2021-01-05 19:57:56 -05:00

gooey

Fix: [CN] missioning translation in gui

2020-07-14 23:44:13 +08:00

jp

[jp] update assets imgs

2021-01-06 10:14:48 +08:00

map_detection

Add: Modularized perspective detection

2020-07-08 03:07:59 +08:00

mask

Add: Initial working draft of guild operations mechanism

2021-01-01 18:47:57 -05:00

research_blueprint

Fix: [JP] Research blueprint templates update

2020-09-15 23:40:48 +09:00

stats_basic

Opt: Revamped less OCR dependency, use ItemGrid and stats_basic assets

2020-12-30 19:00:58 -05:00

tw

Del: assets from reward, migrate to guild

2021-01-05 19:57:56 -05:00