Merge branch 'master' into another

075d9755 · nanahira · 285cf3c5 · bfb550d8 · 075d9755 · e0280ee5
Commit 075d9755 authored Aug 16, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +3 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ e0280ee5
+++ b/ocgcore @ e0280ee5
-Subproject commit 4a35829ecb498fe99a231de439be7095d974dc83
+Subproject commit e0280ee58c2cde057eaac083b25f3e3c4d39d2cd
--- a/script @ 8cee6944
+++ b/script @ 8cee6944
-Subproject commit f9baf47d51374292b4387ff0f0aa24e1c38a62e4
+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 单人模式