Merge branch 'master' into another

.gitignore

@@ -56,6 +56,9 @@
 /sound/*.wav
 /sound/custom
 /sound/BGM
+/sound/README.md
+/sound/LICENSE
+/sound/,*
 /update
 /update*
 /locales

.travis.yml

@@ -104,7 +104,7 @@ before_deploy:
 - chmod +x bot
 
 - cd sound
-- bash -c "grep '.wav' files.txt | xargs -I {} curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro-222DIY-data/raw/master/sound/{} ; exit 0"
+- bash -c "grep '.wav' files.txt | xargs -I {} curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro-222DIY-sound/raw/master/{} ; exit 0"
 - cd ..
 
 - git clone --depth=1 https://github.com/purerosefallen/ygopro-database

appveyor.yml

@@ -68,7 +68,7 @@ after_build:
   - cp -rf ygopro-starter-pack-master/* .
 
   - cd sound
-  - bash -c "grep '.wav' files.txt | xargs -I {} curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro-222DIY-data/raw/master/sound/{} ; exit 0"
+  - bash -c "grep '.wav' files.txt | xargs -I {} curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro-222DIY-sound/raw/master/{} ; exit 0"
   - cd ..
 
   - rm -rf pics/thumbnail pics/*.db

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 Hameln", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro Another %X.0%X.%X Realidea", 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 @ 875160ba

-Subproject commit 11898b44e24bff4b3d0dfb774ede3c434729c264
+Subproject commit 875160baf32b02e6e07f25e410deba6b58469eda

premake/gframe/ygopro.rc

 1 ICON "ygopro.ico"
 
 1 VERSIONINFO
-FILEVERSION 1, 0, 34, 9
-PRODUCTVERSION 1, 0, 34, 9
+FILEVERSION 1, 0, 34, 10
+PRODUCTVERSION 1, 0, 34, 10
 FILEOS 0x4
 FILETYPE 0x1
 
@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro Another"
 VALUE "LegalCopyright", "Copyright (C) 2018 Nanahira"
 VALUE "OriginalFilename", "ygopro_another.exe"
 VALUE "ProductName", "KoishiPro Another"
-VALUE "FileVersion", "1.034.9.Koishi.Another "
-VALUE "ProductVersion", "1.034.9.Koishi.Another"
+VALUE "FileVersion", "1.034.A.Koishi.Another "
+VALUE "ProductVersion", "1.034.A.Koishi.Another"
 END
 END
 BLOCK "VarFileInfo"

script @ cc57b9eb

-Subproject commit 9ec1a4429cf9e3a3fd5002b6286061f9a83db917
+Subproject commit cc57b9eb0d70c5d254e4f3ecae7fd2471e259f9c

strings.conf

@@ -615,7 +615,7 @@
 !setname 0x8 英雄	HERO
 !setname 0x3008 元素英雄	E・HERO
 !setname 0x5008 幻影英雄	V・HERO
-#setname 0x6008 邪心英雄	E-HERO
+!setname 0x6008 邪心英雄	E-HERO
 !setname 0xa008 假面英雄	M・HERO
 !setname 0xc008 命运英雄	D-HERO
 !setname 0x9 新宇	ネオス

system.conf

@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4937
+pro_version = 4938
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi