0

Merge remote-tracking branch 'fabiann/remote-tiles' into devel

This commit is contained in:
Aaron Griffith
2012-05-06 12:52:42 -04:00
4 changed files with 10 additions and 2 deletions

View File

@@ -81,6 +81,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
"markers": Setting(required=False, validator=validateMarkers, default=[]),
"overlay": Setting(required=False, validator=validateOverlays, default=[]),
"showspawn": Setting(required=False, validator=validateBool, default=True),
"base": Setting(required=False, validator=validateStr, default=""),
# Remove this eventually (once people update their configs)
"worldname": Setting(required=False, default=None,

View File

@@ -516,7 +516,7 @@ class TileSet(object):
defaultZoom = 1,
maxZoom = self.treedepth,
path = self.options.get('name'),
base = '',
base = self.options.get('base'),
bgcolor = bgcolorformat(self.options.get('bgcolor')),
world = self.options.get('worldname_orig') +
(" - " + self.options.get('dimension') if self.options.get('dimension') != 'default' else ''),