LmeSzinc 85101590b7 Merge branch 'master' into app ...

# Conflicts:
#	module/config/event.py

2021-10-11 12:58:52 +08:00

..

assets.py

Fix: [EN] QUIT_RECONFIRM down scaled after update

2021-07-22 15:33:07 -04:00

combat.py

Merge branch 'master' into app

2021-10-11 12:58:52 +08:00

equipment.py

Fix: Increase interval of exercise timer

2020-07-14 00:24:44 +08:00

exercise.py

Fix: OS explore scheduling

2021-09-26 18:47:00 +08:00

hp_daemon.py

Refactor: Exercise module, mode easiest_else_exp might have issues

2021-09-23 02:35:22 +08:00

opponent.py

Merge branch 'master' into app

2021-10-08 01:40:11 +08:00