Merge branch 'master' into another

42eb8bba · nanahira · 4a794f3b · 97885a86 · 42eb8bba · 4f828d62
Commit 42eb8bba authored Sep 09, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ 4f828d62
+++ b/ocgcore @ 4f828d62
-Subproject commit 46fab45266611473e1e1406dc91c23bb22a69157
+Subproject commit 4f828d62e4849da39c09b97cf115ca20e2b869b0
--- a/script @ e6ea98bc
+++ b/script @ e6ea98bc
-Subproject commit 0d848b379e0d010fbe1a86b641485c15173f9944
+Subproject commit e6ea98bc66790af7c93066c2bb3c9dd0cb2dc4d1
--- a/strings.conf
+++ b/strings.conf
@@ -554,6 +554,7 @@
 !counter 0x47 指示物（限制代码）
 !counter 0x48 指示物（连接死亡炮塔）
 !counter 0x1049 警逻指示物
+!counter 0x4a 运动员指示物
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス