Commit 1466c4e4 authored by Momobako's avatar Momobako

Merge branch 'master' of /root/7210

parents c51027aa 1b9dc1e9
...@@ -40,8 +40,10 @@ ...@@ -40,8 +40,10 @@
/*.dylib /*.dylib
# windbot related files # windbot related files
/[Bb]ot
/[Bb]ot.conf /[Bb]ot.conf
/[Bb]ot.exe /[Bb]ot.exe
/[Bb]ot.sh
/[Ww]ind[Bb]ot /[Ww]ind[Bb]ot
# ygopro config file # ygopro config file
...@@ -62,13 +64,11 @@ ...@@ -62,13 +64,11 @@
/ygopro_*.exe /ygopro_*.exe
/ygopro.app /ygopro.app
/ygopro_*.app /ygopro_*.app
/premake4
/premake4.exe
/premake5 /premake5
/premake5.exe /premake5.exe
# 2pick related temp files
/card_list.txt
/card_list_*.txt
# others # others
*.log *.log
/.vscode /.vscode
...@@ -76,3 +76,4 @@ ...@@ -76,3 +76,4 @@
/temp /temp
/PrinterData.txt /PrinterData.txt
/ygopro_*.bat /ygopro_*.bat
/ygopro_*.sh
...@@ -4,7 +4,7 @@ use_d3d = 0 ...@@ -4,7 +4,7 @@ use_d3d = 0
use_image_scale = 1 use_image_scale = 1
pro_version = 4930 pro_version = 4930
antialias = 2 antialias = 2
errorlog = 2 errorlog = 3
nickname = Komeiji Koishi nickname = Komeiji Koishi
gamename = Game gamename = Game
lastdeck = new lastdeck = new
......
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