Merge remote-tracking branches 'tswsl1989/biomesoverlay', 'socolin/patch-2', 'tswsl1989/upstream', 'counterpillow/ffscalefix' and 'maruohon/log-rotation-fix'

overviewer_core/assetmanager.py

@@ -19,6 +19,7 @@ import codecs
 import locale
 import time
 import logging
+import traceback
 
 from PIL import Image
 
@@ -51,6 +52,7 @@ directory.
         except Exception, e:
             if os.path.exists(os.path.join(self.outputdir, "overviewerConfig.js")):
                 logging.warning("A previous overviewerConfig.js was found, but I couldn't read it for some reason. Continuing with a blank config")
+            logging.debug(traceback.format_exc())
             self.overviewerConfig = dict(tilesets=dict())
 
     def get_tileset_config(self, name):

overviewer_core/aux_files/genPOI.py

@@ -57,7 +57,9 @@ def handlePlayers(rset, render, worldpath):
     playerdir = os.path.join(worldpath, "players")
     if os.path.isdir(playerdir):
         playerfiles = os.listdir(playerdir)
+        playerfiles = [x for x in playerfiles if x.endswith(".dat")]
         isSinglePlayer = False
+
     else:
         playerfiles = [os.path.join(worldpath, "level.dat")]
         isSinglePlayer = True

overviewer_core/data/web_assets/overviewer.css

@@ -25,7 +25,7 @@ body {
 .infoWindow>img {
     width:80px;
     float: left;
-
+    image-rendering: -moz-crisp-edges;
 }
 
 .infoWindow>p {

overviewer_core/src/overviewer.h

@@ -136,7 +136,7 @@ extern unsigned int max_blockid;
 extern unsigned int max_data;
 extern unsigned char *block_properties;
 static inline int
-block_has_property(unsigned char b, BlockProperty prop) {
+block_has_property(unsigned short b, BlockProperty prop) {
     if (b >= max_blockid || !(block_properties[b] & (1 << KNOWN))) {
         /* block is unknown, return defaults */
         if (prop == TRANSPARENT)

overviewer_core/textures.py

@@ -860,7 +860,7 @@ def wood(self, blockid, data):
     if self.rotation == 1:
         if wood_orientation == 4: wood_orientation = 8
         elif wood_orientation == 8: wood_orientation = 4
-    elif self.rotation == 2: 
+    elif self.rotation == 3:
         if wood_orientation == 4: wood_orientation = 8
         elif wood_orientation == 8: wood_orientation = 4
 

overviewer_core/tileset.py

@@ -513,7 +513,7 @@ class TileSet(object):
         """
         def bgcolorformat(color):
             return "#%02x%02x%02x" % color[0:3]
-        isOverlay = not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode"))
+        isOverlay = self.options.get("overlay") or (not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode")))
         
         d = dict(name = self.options.get('title'),
                 zoomLevels = self.treedepth,