Merge branch 'master' of /root/7210

.gitignore

@@ -40,8 +40,10 @@
 /*.dylib
 
 # windbot related files
+/[Bb]ot
 /[Bb]ot.conf
 /[Bb]ot.exe
+/[Bb]ot.sh
 /[Ww]ind[Bb]ot
 
 # ygopro config file
@@ -62,13 +64,11 @@
 /ygopro_*.exe
 /ygopro.app
 /ygopro_*.app
+/premake4
+/premake4.exe
 /premake5
 /premake5.exe
 
-# 2pick related temp files
-/card_list.txt
-/card_list_*.txt
-
 # others
 *.log
 /.vscode
@@ -76,3 +76,4 @@
 /temp
 /PrinterData.txt
 /ygopro_*.bat
+/ygopro_*.sh

system.conf

@@ -4,7 +4,7 @@ use_d3d = 0
 use_image_scale = 1
 pro_version = 4930
 antialias = 2
-errorlog = 2
+errorlog = 3
 nickname = Komeiji Koishi
 gamename = Game
 lastdeck = new