Merge branch 'patch-1' into 'master'

fix--創星竜華-光巴

See merge request !91
10 jobs for master in 1 minute and 10 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #131893
linux
merge_databases

00:00:13

 
  Prepare2
passed #131894
linux
json

00:00:13

passed #131895
linux
json2

00:00:16

 
  Pack
passed #131896
linux
neos

00:00:17

passed #131897
linux
pack

00:00:10

passed #131898
linux
server

00:00:07

 
  Deploy
passed #131902
linux
deploy_to_koishi

00:00:21

passed #131901
linux
deploy_to_tiramisu

00:00:11

passed #131899
linux
upload_neos

00:00:13

passed #131900
linux
upload_version_json

00:00:13