Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

729ef754 · mercury233 · 15192e51 · c1ac0d7f · 729ef754 · 02691a96
Commit 729ef754 authored May 30, 2019 by mercury233
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

gframe/game.cpp gframe/game.cpp +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -16,7 +16,7 @@
 #include "single_mode.h"
 #endif //YGOPRO_SERVER_MODE
-const unsigned short PRO_VERSION = 0x1349;
+const unsigned short PRO_VERSION = 0x134A;
 namespace ygo {

--- a/ocgcore @ 02691a96
+++ b/ocgcore @ 02691a96
-Subproject commit 8a0195b233fe36cdca8f313a8550037e2d4f22e4
+Subproject commit 02691a9601d3c36279ffb07a672e26404bc7e621
--- a/script @ 9ec1a442
+++ b/script @ 9ec1a442
-Subproject commit bcbf3043ea4824a87484533f0b325d80d99c71b3
+Subproject commit 9ec1a4429cf9e3a3fd5002b6286061f9a83db917
--- a/strings.conf
+++ b/strings.conf
@@ -570,6 +570,7 @@
 !counter 0x4e 指示物（魂之灵摆）
 !counter 0x104f 蛊指示物
 !counter 0x50 指示物（娱乐伙伴 掉头跑骑兵）
+!counter 0x51 指示物（蜂军巢）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス