Merge branch 'patch-7' into 'master'

Fix 超征竜-ディザスター

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

00:00:14

 
  Prepare2
passed #150485
linux
json

00:00:23

passed #150486
linux
json2

00:00:23

 
  Pack
passed #150487
linux
neos

00:00:24

passed #150488
linux
pack

00:00:20

passed #150489
linux
server

00:00:17

 
  Deploy
passed #150493
linux
deploy_to_koishi

00:00:16

passed #150492
linux
deploy_to_tiramisu

00:00:19

passed #150490
linux
upload_neos

00:00:13

passed #150491
linux
upload_version_json

00:00:08