Merge branch 'master' into server

2e0cacc3 · nanahira · 3240002f · d0f9594a · 2e0cacc3 · 8cee6944
Commit 2e0cacc3 authored Aug 16, 2018 by nanahira
Show 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 @ 8cee6944
+++ b/script @ 8cee6944
-Subproject commit a485a0a595c4ced78be46b86d1c607fb17f24fc2
+Subproject commit 8cee6944a9e4c65a5e1ef81b1af835c2010aea31
--- a/strings.conf
+++ b/strings.conf
@@ -243,6 +243,9 @@
 !system 1164 同调召唤
 !system 1165 超量召唤
 !system 1166 连接召唤
+!system 1190 加入手卡
+!system 1191 送去墓地
+!system 1192 除外
 #menu
 !system 1200 联机模式
 !system 1201 单人模式