Merge branch '19prep'

Conflicts:
	overviewer_core/src/overviewer.h
	overviewer_core/textures.py

overviewer_core/src/rendermodes.h

@@ -143,8 +143,6 @@ extern RenderModeInterface rendermode_normal;
 typedef struct {
     /* top facemask and white color image, for drawing overlays */
     PyObject *facemask_top, *white_color;
-    /* only show overlay on top of solid or fluid blocks */
-    PyObject *solid_blocks, *fluid_blocks;
     /* can be overridden in derived classes to control
        overlay alpha and color
        last four vars are r, g, b, a out */
@@ -206,8 +204,6 @@ typedef struct {
     /* inherits from overlay */
     RenderModeOverlay parent;
     
-    /* used to figure out which blocks are spawnable */
-    PyObject *nospawn_blocks;
     PyObject *skylight, *blocklight;
 } RenderModeSpawn;
 extern RenderModeInterface rendermode_spawn;