Zuosizhu 78d8ed1c5b Merge branch 'master_lme' ...

# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/webui/app.py

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

..

assets.py

fix: shop confirm amount buttom (#3001)

2023-08-11 19:05:52 +08:00

base.py

Add: Crystal Fragment template/filter_string in Voucher Shop (#3068)

2023-09-01 00:46:05 +08:00

clerk.py

Upd: [CN] Shop swipe ends

2023-06-08 16:26:25 +08:00

shop_core.py

Refactor: Abstract ShopStatus class

2023-01-31 23:59:41 +08:00

shop_general.py

Add: Consume spilled Coins

2023-07-18 23:20:50 +08:00

shop_guild.py

Fix: Missing cached_property decorator on shop_guild_items (fixed #2898)

2023-07-20 14:36:48 +08:00

shop_medal.py

Fix: [TW] shop_medal_grid (#2956)

2023-08-02 23:56:56 +08:00

shop_merit.py

Refactor: Abstract ShopStatus class

2023-01-31 23:59:41 +08:00

shop_reward.py

Upd: [TW] shop module

2023-07-14 12:15:49 +08:00

shop_select_globals.py

Fix: Shop select grids (#2684)

2023-06-04 02:44:25 +08:00

shop_status.py

Refactor: the way to call LogRes

2023-02-14 02:21:43 +08:00

shop_voucher.py

Refactor: Abstract ShopStatus class

2023-01-31 23:59:41 +08:00

ui.py

Upd: Shop module

2023-07-14 01:43:19 +08:00