Merge branch 'master' into rewrite

2012-02-06 21:41:11 -05:00
parent 50ebdd7f2c 41e8546be6
commit 302e1d592a
51 changed files with 114 additions and 46 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,11 +6,14 @@ Minecraft_Overviewer.egg-info
 terrain.png
 cachedir*

+#MCPatcher HD texture files
+custom_*.png
+
 # vim swap files
 .*.swp

-# user-provided settings file
-settings.py
+# user-provided settings file as well as any variations on that name
+settings*.py

 # header files that may be copied over, if missing
 ImPlatform.h