Merge branch 'development' into stable

a8293102 · Melledy · GitHub · 304b9cb8 · ecf7a81a · a8293102
Commit a8293102 authored Jun 07, 2022 by Melledy Committed by GitHub Jun 07, 2022
--- a/src/main/resources/defaults/data/TowerSchedule.json
+++ b/src/main/resources/defaults/data/TowerSchedule.json
--- a/src/main/resources/defaults/data/documentation/handbook.html
+++ b/src/main/resources/defaults/data/documentation/handbook.html
--- a/src/main/resources/defaults/data/documentation/index.html
+++ b/src/main/resources/defaults/data/documentation/index.html
--- a/src/main/resources/defaults/data/gacha/details.html
+++ b/src/main/resources/defaults/data/gacha/details.html
--- a/data/gacha_records.html
+++ b/data/gacha_records.html
--- a/keys/dispatchKey.bin
+++ b/keys/dispatchKey.bin
--- a/keys/dispatchSeed.bin
+++ b/keys/dispatchSeed.bin
--- a/keys/secretKey.bin
+++ b/keys/secretKey.bin
--- a/keys/secretKeyBuffer.bin
+++ b/keys/secretKeyBuffer.bin
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
--- a/src/main/resources/languages/pl-PL.json
+++ b/src/main/resources/languages/pl-PL.json
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
--- a/src/main/resources/webstatic/de.json
+++ b/src/main/resources/webstatic/de.json
--- a/src/main/resources/webstatic/en.json
+++ b/src/main/resources/webstatic/en.json
--- a/src/main/resources/webstatic/es.json
+++ b/src/main/resources/webstatic/es.json
--- a/src/main/resources/webstatic/fr.json
+++ b/src/main/resources/webstatic/fr.json
--- a/src/main/resources/webstatic/id.json
+++ b/src/main/resources/webstatic/id.json
--- a/src/main/resources/webstatic/ja.json
+++ b/src/main/resources/webstatic/ja.json