Merge branch 'master' into server

gframe/game.cpp

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

ocgcore @ b2d1a11d

-Subproject commit 1d7398c7e92cf9a53fa483527a9328cc82a067f5
+Subproject commit b2d1a11ded55b3efca59065a63ef55133200a6fc

script @ 12e42e61

-Subproject commit 65a4ab26c4f556e0388a9b6c80cbb090cc5569be
+Subproject commit 12e42e616bfef3a3e4309df389540e71c8a688d9

strings.conf

@@ -1257,3 +1257,5 @@
 !setname 0x1c4 征龙	征竜
 !setname 0x1c5 再世	再世
 !setname 0x1c6 统王	ドミナス
+!setname 0x1c7 塞勒凯特	Serket
+!setname 0x1c8 阿匹卜	Apophis