Merge branch 'master' into another

fecb20d6 · nanahira · f363816e · 8d671c2c · fecb20d6 · cce4df21
Commit fecb20d6 authored Mar 06, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ cce4df21
+++ b/ocgcore @ cce4df21
-Subproject commit 33616e9aeeffb60d71837920e3a5837688f628a1
+Subproject commit cce4df213bf5e928438860478038a0a59d69b846
--- a/script @ e57b95dc
+++ b/script @ e57b95dc
-Subproject commit b7bb0303ecb48d66960e6c4cf10cd8f5c7eadd43
+Subproject commit e57b95dc0820f7dd5d58d52115f533fd87b16f0a
--- a/strings.conf
+++ b/strings.conf
@@ -500,6 +500,7 @@
 !victory 0x1c 「幻煌龙的天涡」效果胜利
 !victory 0x1d 「方程式运动员胜利团队」效果胜利
 !victory 0x1e 「飞行象」效果胜利
+!victory 0x1f 「守护神 艾克佐迪亚」效果胜利
 !victory 0x20 由于「%ls」的效果获得比赛胜利
 #counters
 !counter 0x1 魔力指示物
@@ -957,4 +958,3 @@
 !setname 0x127 无限起动	無限起動
 !setname 0x128 魔女术	ウィッチクラフト
 !setname 0x129 咒眼	呪眼
-!setname 0x130 恩底弥翁