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/overviewer_core/src/overviewer.h
+++ b/overviewer_core/src/overviewer.h
@@ -26,7 +26,7 @@

 // increment this value if you've made a change to the c extesion
 // and want to force users to rebuild
-#define OVERVIEWER_EXTENSION_VERSION 16
+#define OVERVIEWER_EXTENSION_VERSION 18

 /* Python PIL, and numpy headers */
 #include <Python.h>
@@ -102,6 +102,7 @@ typedef enum
    SOLID,
    FLUID,
    NOSPAWN,
+    NODATA,
 } BlockProperty;
 /* globals set in init_chunk_render, here because they're used
   in block_has_property */