Merge branch 'master' of ../ygopro-7210srv

.gitignore

@@ -26,14 +26,14 @@
 # git repos
 /pics
 /script
-/WindBot
 
-# ygopro main program
-/ygopro
-/ygopro.exe
-/ygopro_*.exe
-/premake5
-/premake5.exe
+# windbot related files
+/[Bb]ot.conf
+/[Bb]ot.exe
+/[Ww]ind[Bb]ot
+
+# ygopro config file
+/system_user.conf
 
 # ygopro folders
 /deck
@@ -43,9 +43,15 @@
 /sound
 /update
 
+# ygopro main program
+/ygopro
+/ygopro.exe
+/ygopro_*.exe
+/premake5
+/premake5.exe
+
 # others
 /.vscode
 /bak/
 /card_list.txt
 /ygopro_*.bat
-

system.conf

 #config file
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
+use_image_scale = 1
+pro_version = 4930
 antialias = 2
 errorlog = 2
 nickname = Komeiji Koishi