Merge branch 'master' into server

b92b3111 · nanahira · f0eebe5b · 6cce8f72 · b92b3111 · cf25fb78
Commit b92b3111 authored Apr 15, 2019 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 @ cf25fb78
+++ b/script @ cf25fb78
-Subproject commit 6e6057147932c871ec1b9d3fb94e1b6278f0fb83
+Subproject commit cf25fb78c1d28bf63ccf2111ec92ed75895a0e52
--- a/strings.conf
+++ b/strings.conf
@@ -964,3 +964,6 @@
 !setname 0x128 魔女术	ウィッチクラフト
 !setname 0x129 咒眼	呪眼
 !setname 0x12a 恩底弥翁	エンディミオン
+!setname 0x12b 海晶少女	マリンセス
+!setname 0x12c 天威
+!setname 0x12d 斯摩夫	シムルグ