Merge branch 'patch-1' into 'master'

fix--水晶機巧-トリスタロス

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

00:00:14

 
  Prepare2
passed #136823
linux
json

00:00:14

passed #136824
linux
json2

00:00:15

 
  Pack
passed #136825
linux
neos

00:00:14

passed #136826
linux
pack

00:00:11

passed #136827
linux
server

00:00:07

 
  Deploy
passed #136831
linux
deploy_to_koishi

00:00:17

passed #136830
linux
deploy_to_tiramisu

00:00:22

passed #136828
linux
upload_neos

00:00:10

passed #136829
linux
upload_version_json

00:00:11