From 0dd824783ab6570d940c6ed8a890a7c6d6126cec Mon Sep 17 00:00:00 2001 From: Zach Date: Fri, 29 May 2015 05:21:29 -0500 Subject: [PATCH] fixed gitignores --- .gitignore | 17 ++++------------- dependencies/.gitignore | 2 ++ dependencies/astron/logs/.gitignore | 2 ++ preferences.json | 1 + user/.gitignore | 4 ++++ 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 dependencies/.gitignore create mode 100644 dependencies/astron/logs/.gitignore create mode 100644 preferences.json create mode 100644 user/.gitignore diff --git a/.gitignore b/.gitignore index 9d2f1973..84df6e7b 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # Python artifacts *.pyc +# Batch +*.bat + # PyCharm .idea @@ -11,16 +14,4 @@ *.lnk # Git -*.rej - -# Game-specific files and directories -preferences.json -*.json -logs/ -screenshots/ -backups/ -contentpacks/ -resources/ -save.dat -ai-crash.txt -gentokenlr.py +*.rej \ No newline at end of file diff --git a/dependencies/.gitignore b/dependencies/.gitignore new file mode 100644 index 00000000..97da4482 --- /dev/null +++ b/dependencies/.gitignore @@ -0,0 +1,2 @@ +*.json +backups/ \ No newline at end of file diff --git a/dependencies/astron/logs/.gitignore b/dependencies/astron/logs/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/dependencies/astron/logs/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/preferences.json b/preferences.json new file mode 100644 index 00000000..1b683dea --- /dev/null +++ b/preferences.json @@ -0,0 +1 @@ +{"fullscreen": false, "musicVol": 1.0, "sfx": true, "sfxVol": 1.0, "trueFriends": true, "res": [1280, 720], "speedchatPlus": true, "loadDisplay": "pandagl", "cogLevel": true, "language": "English", "music": true, "toonChatSounds": true} \ No newline at end of file diff --git a/user/.gitignore b/user/.gitignore new file mode 100644 index 00000000..d7148438 --- /dev/null +++ b/user/.gitignore @@ -0,0 +1,4 @@ +logs/ +screenshots/ +contentpacks/ +preferences.json \ No newline at end of file