Merge branch 'master' into py-package

2011-06-04 20:05:31 -04:00
parent 317f7794fe ac91268c66
commit c10074e87f
7 changed files with 38 additions and 19 deletions
--- a/contrib/rerenderBlocks.py
+++ b/contrib/rerenderBlocks.py
@@ -20,7 +20,7 @@ import sys
 sys.path.insert(0,".")

 import nbt
-from chunk import get_blockarray_fromfile
+from chunk import get_blockarray_fromfile, get_blockarray
 import os
 import re