Merge branch 'master' into server

gframe/game.cpp

@@ -149,7 +149,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Ayakashi", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Hanabi", 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 @ 9a8e61b1

-Subproject commit 338c4e1cbe1f130f1dadc3c8cc358a7783b5af35
+Subproject commit 9a8e61b17f572030ac2c72f6df2aa1552683caed

premake/gframe/ygopro.rc

@@ -16,8 +16,8 @@ VALUE "InternalName", "YGOPRO Server Mode"
 VALUE "LegalCopyright", "Copyright (C) 2018 Nanahira"
 VALUE "OriginalFilename", "ygopro.exe"
 VALUE "ProductName", "YGOPRO Server Mode"
-VALUE "FileVersion", "Ayakashi"
-VALUE "ProductVersion", "Ayakashi"
+VALUE "FileVersion", "Hanabi"
+VALUE "ProductVersion", "Hanabi"
 END
 END
 BLOCK "VarFileInfo"

script @ 25c1ae68

-Subproject commit f4ddb0c0248dc4f813640f0bd7e91ab5cf8b6bbd
+Subproject commit 25c1ae68406482d3ea490e3647009ab518e76d35

strings.conf

@@ -612,6 +612,10 @@
 !counter 0x104f 蛊指示物
 !counter 0x50 指示物（娱乐伙伴 掉头跑骑兵）
 !counter 0x51 指示物（蜂军巢）
+!counter 0x52 指示物（防火龙·暗流体）
+!counter 0x53 指示物（炽天蝶）
+!counter 0x54 指示物（星遗物引导的前路）
+!counter 0x55 指示物（隐居者的大釜）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1000,3 +1004,5 @@
 !setname 0x12d 斯摩夫	シムルグ
 !setname 0x12e 占卜魔女	占い魔女
 !setname 0x12f 蜂军	B・F（ビー・フォース）
+!setname 0x130 破械
+!setname 0x1130 破械神