Merge branch 'master' into server

gframe/game.cpp

@@ -18,9 +18,9 @@
 #include <regex>
 #endif //YGOPRO_SERVER_MODE
 
-#define KOISHI_VERNAME	"Overture"
+#define KOISHI_VERNAME	"Hameln"
 
-unsigned short PRO_VERSION = 0x1349;
+unsigned short PRO_VERSION = 0x134A;
 
 namespace ygo {
 

gframe/menu_handler.cpp

@@ -307,7 +307,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					int extra = replay.ReadInt32();
 					for(int j = 0; j < extra; ++j)
 						tmp_deck.extra.push_back(dataManager.GetCodePointer(replay.ReadInt32()));
-					myswprintf(filename, L"%ls %ls", ex_filename, namebuf[i]);
+					myswprintf(filename, L"./deck/%ls %ls.ydk", ex_filename, namebuf[i]);
 					deckManager.SaveDeck(tmp_deck, filename);
 				}
 				mainGame->stACMessage->setText(dataManager.GetSysString(1335));

script @ 9ec1a442

-Subproject commit 8866a7cc82f43978c8cd561d54f15d57e4122079
+Subproject commit 9ec1a4429cf9e3a3fd5002b6286061f9a83db917

strings.conf

@@ -601,6 +601,7 @@
 !counter 0x4e 指示物（魂之灵摆）
 !counter 0x104f 蛊指示物
 !counter 0x50 指示物（娱乐伙伴 掉头跑骑兵）
+!counter 0x51 指示物（蜂军巢）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス