Merge branch 'master' into server

0ceaecc8 · nanahira · e2f06f5e · 2a79d899 · 0ceaecc8 · 712bb529
Commit 0ceaecc8 authored Jul 01, 2023 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +2 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ 712bb529
+++ b/ocgcore @ 712bb529
-Subproject commit 29f43b232c1ca9d661bd4e373db4ce543ea3768e
+Subproject commit 712bb529afb1e50a800aff8f5b65530302f209f1
--- a/script @ 1e91cbe2
+++ b/script @ 1e91cbe2
-Subproject commit 66532d87f88cb95256f74ecad9d41485ee16ea88
+Subproject commit 1e91cbe228cbab2d6f6fd40d567dd7975be63b0e
--- a/strings.conf
+++ b/strings.conf
@@ -661,6 +661,8 @@
 !counter 0x64 G石人指示物
 !counter 0x1065 兔耳指示物
 !counter 0x66 指示物（推荐捏军贯）
+!counter 0x67 指示物（战斗车轮）
+!counter 0x68 指示物（图腾柱）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス