merge

3f124de9 · nanahira · a82f7335 · 116fd479 · 3f124de9 · c8902079
Commit 3f124de9 authored Apr 14, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +3 -0

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