Merge branch 'patch-3' into 'master'

fix 原石穿光

See merge request !42
10 jobs for master in 1 minute and 4 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #123847
linux
merge_databases

00:00:14

 
  Prepare2
passed #123848
linux
json

00:00:19

passed #123849
linux
json2

00:00:18

 
  Pack
passed #123850
linux
neos

00:00:16

passed #123851
linux
pack

00:00:10

passed #123852
linux
server

00:00:05

 
  Deploy
passed #123856
linux
deploy_to_koishi

00:00:11

passed #123855
linux
deploy_to_tiramisu

00:00:14

passed #123853
linux
upload_neos

00:00:08

passed #123854
linux
upload_version_json

00:00:08