Merge branch 'master' into server

99f5e630 · nanahira · eae39322 · 116fd479 · 99f5e630 · 1fddd328
Commit 99f5e630 authored Apr 14, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

cards.cdb cards.cdb +0 -0

script script +1 -1

strings.conf strings.conf +3 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/script @ 1fddd328
+++ b/script @ 1fddd328
-Subproject commit 891444b15972bc6d52f36df1fe9ae306c45563b7
+Subproject commit 1fddd3286a1897c54a6d023b46e75b648a6ce2ad
--- a/strings.conf
+++ b/strings.conf
@@ -895,3 +895,6 @@
 !setname 0x114 空牙团	空牙団
 !setname 0x115 闪刀	閃刀
 !setname 0x1115 闪刀姬	閃刀姫
+!setname 0x116 圣像骑士	パラディオン
+!setname 0x117 魔神仪	魔神儀