0

Merge remote-tracking branch 'origin/master' into brownan-chunkscan

Conflicts:
	overviewer.py
This commit is contained in:
Andrew Brown
2011-11-26 16:58:27 -05:00
6 changed files with 117 additions and 51 deletions

View File

@@ -214,7 +214,7 @@ class QuadtreeGen(object):
curdepth = self._get_cur_depth()
if curdepth != -1:
if self.p > curdepth:
logging.warning("Your map seemes to have expanded beyond its previous bounds.")
logging.warning("Your map seems to have expanded beyond its previous bounds.")
logging.warning( "Doing some tile re-arrangements... just a sec...")
for _ in xrange(self.p-curdepth):
self._increase_depth()