Merge branch 'patch-7' into 'master'

Fix 紋章獣スタット・ホエール

See merge request !159
10 jobs for master in 1 minute and 29 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Prepare
passed #150741
linux
merge_databases

00:00:11

 
  Prepare2
passed #150742
linux
json

00:00:29

passed #150743
linux
json2

00:00:24

 
  Pack
passed #150744
linux
neos

00:00:21

passed #150745
linux
pack

00:00:13

passed #150746
linux
server

00:00:09

 
  Deploy
passed #150750
linux
deploy_to_koishi

00:00:24

passed #150749
linux
deploy_to_tiramisu

00:00:21

passed #150747
linux
upload_neos

00:00:11

passed #150748
linux
upload_version_json

00:00:15