Merge branch 'master' into server

dd6772f4 · nanahira · 5b7d9194 · bc57847f · dd6772f4 · 27fd14e4
Commit dd6772f4 authored Feb 23, 2019 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

cards.cdb cards.cdb +0 -0

script script +1 -1

strings.conf strings.conf +4 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/script @ 27fd14e4
+++ b/script @ 27fd14e4
-Subproject commit 0f9dfaba36ff8531f9ed8f7f6dc9859f826c5937
+Subproject commit 27fd14e4dfed96117edd7df9ec4b752bd2bf8186
--- a/strings.conf
+++ b/strings.conf
@@ -953,3 +953,7 @@
 !setname 0x124 机械天使	機械天使
 !setname 0x125 笑容	スマイル
 !setname 0x126 时间怪盗	Time Thief
+!setname 0x127 咒眼
+!setname 0x128 无限启动
+!setname 0x129 魔女术
+!setname 0x130 恩底弥翁