Merge branch 'master' of git://github.com/overviewer/Minecraft-Overviewer

contrib/png-it.py

@@ -18,7 +18,7 @@ def main():
     parser.add_option('--memory-limit', '-m', help = 'Limit the amount of ram to use in MB. If it\'s expected to exceed the limit it won\'t do anything.',\
         metavar = '<memory>', type = int, dest = 'memory_limit', default = None)
     
-    parser.add_option('--zoom-level', '-z', help = 'Which zoom leve to use from the overviewer map. NOTE: the RAM usage will increase exponentially with the zoom level.',\
+    parser.add_option('--zoom-level', '-z', help = 'Which zoom level to use from the overviewer map. NOTE: the RAM usage will increase exponentially with the zoom level.',\
         metavar = '<zoom-level>', type = int, dest = 'zoom_level', default = None)
 
     parser.add_option('--crop', '-c', help = 'It will crop a frame around the image, give it in percentage. For example in a image of 1000x2000 pixels, a 10% crop will crop 100 pixels in the left, right sides and 200 pixels in the bottom and top sides. NOTE: this is no exact, it will be rounded to the nearest overviewer map tile.',\
@@ -68,7 +68,7 @@ def main():
     
     all_images = glob(path)
     if not all_images:
-        "Error! No images found in this zoom leve. Is this really an overviewer tile set directory?"
+        print "Error! No images found in this zoom level. Is this really an overviewer tile set directory?"
         sys.exit(1)
 
     # autocrop will calculate the center and crop values automagically

docs/config.rst

@@ -87,6 +87,14 @@ A more complicated example
         "dimension": "nether",
     }
 
+    renders["survivalnethersouth"] = {
+        "world": "survival",
+        "title": "Survival Nether",
+        "rendermode": nether_smooth_lighting,
+        "dimension": "nether",
+        "northdirection" : "lower-right",
+    }
+
     renders["creative"] = {
         "world": "creative",
         "title": "Creative",
@@ -460,7 +468,7 @@ values. The valid configuration keys are listed below.
         objects.  See :ref:`customrendermodes` for more information.
 
 ``northdirection``
-    This is direction that north will be rendered. This north direction will
+    This is direction or viewpoint angle with which north will be rendered. This north direction will
     match the established north direction in the game where the sun rises in the
     east and sets in the west.
 

docs/running.rst

@@ -295,3 +295,15 @@ modification times intact, use ``cp -p``. For people who render from backups,
 GNU ``tar`` automatically handles modification times correctly. ``rsync -a
 --delete`` will handle this correctly as well. If you use some other tool,
 you'll have to figure out how to do this yourself.
+
+HTTPS support
+-------------
+
+In order to support displaying maps over HTTPS, Overviewer loads the Google
+maps API and JQuery over HTTPS. This avoids security warnings for HTTPS
+sites, and is not expected to cause problems for users.
+
+If this change causes problems, take a look at the
+:ref:`custom web assets<customwebassets>` option. This allows you to
+provide a custom index.html which loads the required Javascript libraries
+over HTTP.

overviewer_core/assetmanager.py

@@ -101,8 +101,8 @@ directory.
                 'defaultMarker':    'signpost.png',
                 'signMarker':       'signpost_icon.png',
                 'bedMarker':        'bed.png',
-                'spawnMarker':      'http://google-maps-icons.googlecode.com/files/home.png',
-                'queryMarker':      'http://google-maps-icons.googlecode.com/files/regroup.png'
+                'spawnMarker':      'https://google-maps-icons.googlecode.com/files/home.png',
+                'queryMarker':      'https://google-maps-icons.googlecode.com/files/regroup.png'
                 }
         dump['CONST']['mapDivId'] = 'mcmap'
         dump['CONST']['regionStrokeWeight'] = 2 # Obselete

overviewer_core/data/web_assets/index.html

@@ -10,8 +10,8 @@
 
 <link rel="stylesheet" href="overviewer.css" type="text/css" />
 
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
 
 <script type="text/javascript" src="underscore.js"></script>
 <script type="text/javascript" src="backbone.js"></script>