Merge branch 'master' of git://github.com/brownan/Minecraft-Overviewer into logging

chunk.py

@@ -15,7 +15,6 @@
 
 import numpy
 from PIL import Image, ImageDraw
-from itertools import izip, count
 import os.path
 import hashlib
 

quadtree.py

@@ -173,8 +173,8 @@ class QuadtreeGen(object):
             newdir = "new" + str(dirnum)
             newdirpath = getpath(newdir)
 
-            files = [str(dirnum)+"."+imgformat, str(dirnum)+".hash", str(dirnum)]
-            newfiles = [str(newnum)+"."+imgformat, str(newnum)+".hash", str(newnum)]
+            files = [str(dirnum)+"."+self.imgformat, str(dirnum)+".hash", str(dirnum)]
+            newfiles = [str(newnum)+"."+self.imgformat, str(newnum)+".hash", str(newnum)]
 
             os.mkdir(newdirpath)
             for f, newf in zip(files, newfiles):

world.py

@@ -21,7 +21,6 @@ import sys
 import logging
 
 import numpy
-from PIL import Image
 
 import chunk
 import nbt