Merge branch 'master' into another

.travis.yml

@@ -79,7 +79,7 @@ before_deploy:
     7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-$TRAVIS_TAG.zip ygopro.app;
   fi
 
-- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/HuangYuNan/ygopro222-images/archive/master.zip
+- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro222-images/archive/master.zip
 - 7z x -y ygopro222-images-master.zip > /dev/null
 - mv -f ygopro222-images-master pics
 

appveyor.yml

@@ -55,7 +55,7 @@ after_build:
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/windbot/releases/download/latest/WindBot.7z ; exit 0"
   - 7z x -y WindBot.7z
 
-  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/HuangYuNan/ygopro222-images/archive/master.zip ; exit 0"
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro222-images/archive/master.zip ; exit 0"
   - 7z x -y ygopro222-images-master.zip
   - mv -f ygopro222-images-master pics
 

gframe/game.cpp

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

-Subproject commit e18df9cd2f2af54026d0a48a607d0db83b54310c
+Subproject commit da0cd22bbb58d6a871a3f8517eaf91b0bd4fbff5

premake/gframe/ygopro.rc

@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro Another"
 VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira"
 VALUE "OriginalFilename", "ygopro_another.exe"
 VALUE "ProductName", "KoishiPro Another"
-VALUE "FileVersion", "Scarlet"
-VALUE "ProductVersion", "Scarlet"
+VALUE "FileVersion", "Nemesis"
+VALUE "ProductVersion", "Nemesis"
 END
 END
 BLOCK "VarFileInfo"

script @ feb9ce79

-Subproject commit f6d075baab757900f16210b77e47149319c4fc4e
+Subproject commit feb9ce79cb5d52ae6ec047d467befec49329d601