Merge branch 'master' into server

gframe/duelclient.cpp

@@ -2219,7 +2219,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->showcardp = 0;
 				mainGame->showcard = 4;
 			}
-			mainGame->WaitFrameSignal(45);
+			mainGame->WaitFrameSignal(count > 5 ? 12 : 45);
 			mainGame->dField.MoveCard(pcard, 5);
 			if (auto_watch_mode) {
 				mainGame->showcard = 0;

gframe/game.cpp

@@ -214,7 +214,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Sunflower", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Setsuna", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

ocgcore @ 2615ef6a

-Subproject commit 5ad519099511f9b4ff1ebc22992929990ef8bc5e
+Subproject commit 2615ef6a609576d3fd34be6130620f30a30d21b7

script @ 97bbddc0

-Subproject commit 37ebb4228538260fb3e54583c518f8d11b1e2546
+Subproject commit 97bbddc05f32aeab9127fdb50f93c2de380d51fd

strings.conf

@@ -1142,3 +1142,7 @@
 !setname 0x17a 肆世坏	スケアクロー
 !setname 0x17b 野蛮人	バーバリアン
 !setname 0x17c 漫读使灵	Libromancer
+!setname 0x17d 群豪	ヴァリアンツ
+!setname 0x17e 拉比林斯迷宫	ラビュリンス
+!setname 0x117e 拉比林斯迷宫欢迎	ウェルカム・ラビュリンス
+!setname 0x17f 神碑