Skip to content

Y
ygopro
Commit 7774a6b4 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into another

parents b5dde8b2 598dc30d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
.travis.yml
View file @ 7774a6b4
...@@ -82,9 +82,9 @@ before_deploy: ...@@ -82,9 +82,9 @@ before_deploy:
7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-$TRAVIS_TAG.zip ygopro.app; 7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-$TRAVIS_TAG.zip ygopro.app;
fi fi
- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro222-images/archive/master.zip - curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://code.mycard.moe/nanahira/ygopro-images/-/archive/master/ygopro-images-master.zip
- 7z x -y ygopro222-images-master.zip > /dev/null - 7z x -y ygopro-images-master.zip > /dev/null
- mv -f ygopro222-images-master pics - mv -f ygopro-images-master pics
- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/moecube/ygopro-starter-pack/archive/master.zip - curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/moecube/ygopro-starter-pack/archive/master.zip
- 7z x -y ygopro-starter-pack-master.zip > /dev/null - 7z x -y ygopro-starter-pack-master.zip > /dev/null
......
appveyor.yml
View file @ 7774a6b4
...@@ -55,9 +55,9 @@ after_build: ...@@ -55,9 +55,9 @@ 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" - 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 - 7z x -y WindBot.7z
- 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" - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://code.mycard.moe/nanahira/ygopro-images/-/archive/master/ygopro-images-master.zip ; exit 0"
- 7z x -y ygopro222-images-master.zip - 7z x -y ygopro-images-master.zip
- mv -f ygopro222-images-master pics - mv -f ygopro-images-master pics
- bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/update-koishipro/archive/master.zip ; exit 0" - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/update-koishipro/archive/master.zip ; exit 0"
- 7z x -y update-koishipro-master.zip - 7z x -y update-koishipro-master.zip
......
cards.cdb
View file @ 7774a6b4
No preview for this file type
ocgcore @ ba72536e
Subproject commit 1116f40108f0484b58048b9315ee94bfad66c129 Subproject commit ba72536e154a4acf5af41a70227f8b1ff3da422e
premake/gframe/ygopro.rc
View file @ 7774a6b4
...@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro" ...@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro"
VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira" VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira"
VALUE "OriginalFilename", "ygopro_another.exe" VALUE "OriginalFilename", "ygopro_another.exe"
VALUE "ProductName", "KoishiPro" VALUE "ProductName", "KoishiPro"
VALUE "FileVersion", "Owen" VALUE "FileVersion", "Chocolate"
VALUE "ProductVersion", "Owen" VALUE "ProductVersion", "Chocolate"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
script @ 12feaa26
Subproject commit 600984331ce6ea470ed7b0efb4e101ae8b42c29c Subproject commit 12feaa2622e33802667083a90b4a93356a739a5d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment