Merge branch 'master' into another

.travis.yml

@@ -115,11 +115,9 @@ before_deploy:
 - mv -f ygopro-database/locales .
 
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    sed -i "s/c:\/windows/./g" ./system.conf;
     7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro libIrrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures fonts skin deck single pics sound windbot locales bot.conf bot > /dev/null;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    sed -i "" "s/c:\/windows/./g" ./system.conf;
     7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures fonts skin deck single pics sound windbot locales bot.conf bot > /dev/null;
   fi
 

appveyor.yml

@@ -80,7 +80,9 @@ after_build:
   - git clone --depth=1 https://github.com/purerosefallen/ygopro-database
   - mv -f ygopro-database/locales .
   
-  - 7z a -mx9 -xr!.git* KoishiPro-%APPVEYOR_REPO_TAG_NAME%.7z ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures skin deck single pics sound update-koishipro locales WindBot Bot.exe bot.conf
+  - git clone --depth=1 https://%access_token%@github.com/purerosefallen/fonts
+
+  - 7z a -mx9 -xr!.git* KoishiPro-%APPVEYOR_REPO_TAG_NAME%.7z ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures skin deck single pics sound update-koishipro locales fonts WindBot Bot.exe bot.conf
 
 test: off
 

ocgcore @ 46fab452

-Subproject commit 9b3d66b0afae15bc02d2294c620a3c8c912a9b6c
+Subproject commit 46fab45266611473e1e1406dc91c23bb22a69157

script @ 62d8ae36

-Subproject commit 682d795eb0ff5ae931e5af912c7ce51c2d92d876
+Subproject commit 62d8ae362ad4bc863a11797954045ac34eb6ecd1

system.conf

@@ -8,8 +8,8 @@ errorlog = 3
 nickname = Komeiji Koishi
 gamename = Game
 lastdeck = new
-textfont = c:/windows/fonts/simhei.ttf 14
-numfont = c:/windows/fonts/arial.ttf
+textfont = ./fonts/simhei.ttf 14
+numfont = ./fonts/arial.ttf
 serverport = 7911
 lasthost = 127.0.0.1
 lastport = 7911