Merge branch 'master' into server

d5c326d0 · nanahira · ee6dc7ea · 7c3de35d · d5c326d0 · 1b92dc06
Commit d5c326d0 authored Aug 22, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ 1b92dc06
+++ b/ocgcore @ 1b92dc06
-Subproject commit 1b8b3c99eff96d05ef3d5be6daadbb2dfd5a8d42
+Subproject commit 1b92dc064e774fb9a81024d246ce4844df37301f
--- a/script @ ef7429d8
+++ b/script @ ef7429d8
-Subproject commit bc438243dfc01fbf5964ab8eb5955e229e53969d
+Subproject commit ef7429d8fc703a393b8f87c6213e0987801ef060
--- a/strings.conf
+++ b/strings.conf
@@ -925,4 +925,4 @@
 !setname 0x11f 奈芙提斯	ネフティス
 !setname 0x120 调皮宝贝	プランキッズ
 !setname 0x121 魔妖
-!setname 0x122 女武神
+!setname 0x122 女武神	Valkyrie