nEEtdo0d c398d7422e Fix: Resolve merge conflicts with page.py, new page page_guild ...

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

# Conflicts:
#	module/ui/page.py

2021-01-01 10:51:52 -05:00

..

cn

Fix: GUILD_SUPPLY_REWARDS_AZUR asset

2020-12-31 14:36:12 -05:00

en

Upd: [EN] Update campaign mode switch 2

2020-12-31 13:52:31 -03:00

gooey

Fix: [CN] missioning translation in gui

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

jp

Opt: Inverted Orthant D3 low cost farming

2020-12-31 22:50:06 +08:00

map_detection

Add: Modularized perspective detection

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

mask

Add: Dorm reward

2020-09-27 17:28:00 +08: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

Add: [TW] Campaign menu and SOS

2021-01-01 14:44:28 +08:00