Merge branch 'master' into server

40f8dce0 · nanahira · 1467fe41 · d5da6bcb · 84bb80e5 · e213010a
Commit 40f8dce0 authored Mar 05, 2019 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/ocgcore @ 84bb80e5
+++ b/ocgcore @ 84bb80e5
-Subproject commit 33616e9aeeffb60d71837920e3a5837688f628a1
+Subproject commit 84bb80e59c743efdf87822c89fd3b596f47d6d03
--- a/script @ e213010a
+++ b/script @ e213010a
-Subproject commit ac4c3eee9c5d0255845f9dc192666a35adc2ffcc
+Subproject commit e213010a16be910277fbe0c951734e1b62cbc8e0
--- a/strings.conf
+++ b/strings.conf
@@ -500,6 +500,7 @@
 !victory 0x1c 「幻煌龙的天涡」效果胜利
 !victory 0x1d 「方程式运动员胜利团队」效果胜利
 !victory 0x1e 「飞行象」效果胜利
+!victory 0x1f 「守护神 艾克佐迪亚」效果胜利
 !victory 0x20 由于「%ls」的效果获得比赛胜利
 #counters
 !counter 0x1 魔力指示物