Merge branch 'master' into another

.travis.yml

@@ -81,10 +81,10 @@ script:
 
 before_deploy:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro libirrKlang.so;
+    zip -q -r KoishiPro-$TRAVIS_OS_NAME.zip ygopro libirrKlang.so;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME.zip ygopro.app;
+    zip -q -r KoishiPro-$TRAVIS_OS_NAME.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
@@ -104,20 +104,20 @@ before_deploy:
 - rm -rf pics/thumbnail pics/*.db
 - mkdir replay
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME-full.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay;
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME-full-with-sound.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound;
+    zip -q -r KoishiPro-$TRAVIS_OS_NAME-full.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay;
+    zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-with-sound.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME-full.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay;
-    zip -q -r ygopro-koishi-$TRAVIS_OS_NAME-full-with-sound.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound;
+    zip -q -r KoishiPro-$TRAVIS_OS_NAME-full.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay;
+    zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-with-sound.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound;
   fi
 
 deploy:
   provider: releases
   file:
-  - ygopro-koishi-$TRAVIS_OS_NAME.zip
-  - ygopro-koishi-$TRAVIS_OS_NAME-full.zip
-  - ygopro-koishi-$TRAVIS_OS_NAME-full-with-sound.zip
+  - KoishiPro-$TRAVIS_OS_NAME.zip
+  - KoishiPro-$TRAVIS_OS_NAME-full.zip
+  - KoishiPro-$TRAVIS_OS_NAME-full-with-sound.zip
   skip_cleanup: true
   overwrite: true
   on:

appveyor.yml

@@ -87,9 +87,9 @@ after_build:
   - rm -rf pics/thumbnail pics/*.db
   - mkdir replay
 
-  - 7z a -mx9 -xr!.git* YGOPro-by-Koishi.7z ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics update-koishipro replay WindBot Bot.exe bot.conf
-  - cp -rf YGOPro-by-Koishi.7z YGOPro-by-Koishi-with-sound.7z
-  - 7z a -mx9 -xr!.git* YGOPro-by-Koishi-with-sound.7z sound
+  - 7z a -mx9 -xr!.git* KoishiPro.7z ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics update-koishipro replay WindBot Bot.exe bot.conf
+  - cp -rf KoishiPro.7z KoishiPro-with-sound.7z
+  - 7z a -mx9 -xr!.git* KoishiPro-with-sound.7z sound
 
 test: off
 
@@ -104,9 +104,9 @@ deploy:
 artifacts:
   - path: ygopro.exe
     name: ygopro client
-  - path: YGOPro-by-Koishi.7z
+  - path: KoishiPro.7z
     name: ygopro full repack
-  - path: YGOPro-by-Koishi-with-sound.7z
+  - path: KoishiPro-with-sound.7z
     name: ygopro full repack with sound
 
 cache:

ocgcore @ 6cdd6679

-Subproject commit c544bb506d96e83a5a7274c244a5cd90f5c1edba
+Subproject commit 6cdd6679bffa27f95441098f608821e1d01adf88

script @ b6d35b7d

-Subproject commit 4fdae89b75a8762d72feaa2ad5e9ab36d55c6004
+Subproject commit b6d35b7de601e0bf6522d474f28b9069b6da3e71