Merge branch 'master' into server

04bb59ed · nanahira · fdc0b263 · 1fb390c4 · 04bb59ed · 98dae4c6
Commit 04bb59ed authored May 17, 2018 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 193 additions and 15 deletions

lflist.conf lflist.conf +190 -13

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/lflist.conf
+++ b/lflist.conf
--- a/ocgcore @ 98dae4c6
+++ b/ocgcore @ 98dae4c6
-Subproject commit 92ad9db2a69bbaf4a07ef0173fe3ee03615b1f24
+Subproject commit 98dae4c62f22a8fcfc5595d3a6380739fdcb16fb
--- a/script @ 5c5e8999
+++ b/script @ 5c5e8999
-Subproject commit 5e0679ffb2824618e9c2f7c49c15034dca6a882e
+Subproject commit 5c5e8999fde8fc3b7fe65b0417a64f4be2c8e288
--- a/strings.conf
+++ b/strings.conf
@@ -419,6 +419,7 @@
 !system 1418 额外卡组数量应不超过15张，当前卡组数量为%d张。
 !system 1419 副卡组数量应不超过15张，当前卡组数量为%d张。
 !system 1420 有额外卡组卡片存在于主卡组，可能是额外卡组数量超过15张。
+!system 1421 宣言的卡不符合条件，或无法被主机识别。
 !system 1500 决斗结束。
 !system 1501 录像结束。
 !system 1502 连接已断开。