Merge branch '2pick' of https://github.com/purerosefallen/ygopro-7210srv

.gitignore

 # data files
+/beta
 /expansions
 /specials
 
@@ -24,8 +25,19 @@
 /gframe/dirent.h
 
 # git repos
+/CustomTools
+/DataEditorX
+/Magic*
 /pics
+/Printer
 /script
+/ygopro-*
+/*-Cards
+
+# libs
+/*.dll
+/*.so
+/*.dylib
 
 # windbot related files
 /[Bb]ot.conf
@@ -45,14 +57,19 @@
 
 # ygopro main program
 /ygopro
+/ygopro_*
 /ygopro.exe
 /ygopro_*.exe
+/ygopro.app
+/ygopro_*.app
 /premake5
 /premake5.exe
 
 # others
+*.log
 /.vscode
 /bak/
 /card_list.txt
+/temp
 /PrinterData.txt
 /ygopro_*.bat

appveyor.yml

@@ -59,14 +59,11 @@ after_build:
   - cd ygopro
 
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/Smile-DK/ygopro-scripts/archive/master.zip ; exit 0"
-  - 7z x ygopro-scripts-master.zip
-  - mv -f ygopro-scripts-master script
-
+  - 7z x -y ygopro-scripts-master.zip
   - rm -rf ygopro-scripts-master.zip
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/Fluorohydride/ygopro-scripts/archive/master.zip ; exit 0"
-  - 7z x ygopro-scripts-master.zip
-  - cp -rf ygopro-scripts-master/* script
-  - rm -rf ygopro-scripts-master ygopro-scripts-master.zip
+  - 7z x -y ygopro-scripts-master.zip
+  - mv -f ygopro-scripts-master script
 
   - mkdir replay
   - mv -f ../../gframe .