Merge branch 'master' into server

bab59c98 · nanahira · 9b0994ef · 04ec1e99 · bab59c98 · bab59c98
Commit bab59c98 authored Mar 13, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cards.cdb cards.cdb +0 -0

strings.conf strings.conf +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/strings.conf
+++ b/strings.conf
@@ -958,4 +958,4 @@
 !setname 0x127 无限起动	無限起動
 !setname 0x128 魔女术	ウィッチクラフト
 !setname 0x129 咒眼	呪眼
-!setname 0x130 恩底弥翁
+!setname 0x12a 恩底弥翁	エンディミオン