Merge branch 'master' into server

26d81a15 · nanahira · 99cbd2d3 · 4ff6578e · 26d81a15 · e69d428f
Commit 26d81a15 authored Dec 26, 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 @ e69d428f
+++ b/script @ e69d428f
-Subproject commit 38a3c3f1eef3d455e664c37aad8bd3fd803de6f0
+Subproject commit e69d428ff26af364effc96271b25776b5e11f476
--- a/strings.conf
+++ b/strings.conf
@@ -571,6 +571,9 @@
 !counter 0x4a 运动员指示物
 !counter 0x4b 枪管指示物
 !counter 0x4c 召唤指示物
+!counter 0x104d 信号指示物
+!counter 0x104e 蛊指示物
+!counter 0x4f 指示物（魂之灵摆）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス