Merge branch 'master' into server

59e50e89 · nanahira · 1c2dceef · c0eae1c4 · 59e50e89 · f78188ae
Commit 59e50e89 authored Jul 22, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cards.cdb cards.cdb +0 -0

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/script @ f78188ae
+++ b/script @ f78188ae
-Subproject commit cafcf9ecc0e3b96c2297ef9734ff90cadecb506a
+Subproject commit f78188ae8cf69e84c8d14ef7a35322387288cbab
--- a/strings.conf
+++ b/strings.conf
@@ -911,3 +911,4 @@
 !setname 0x11b 自奏圣乐	オルフェゴール
 !setname 0x11c 雷龙	サンダー·ドラゴン
 !setname 0x11d 禁忌的	禁じられた
+!setname 0x11e 危险！