LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch master into devel

Browse Source 
Conflicts:
	docs/config.rst
	overviewer.py
	overviewer_core/settingsDefinition.py
	overviewer_core/tileset.py
This commit is contained in:
Andrew Chin
2012-04-15 11:03:16 -04:00
parent c583a94d7d 9a8aa6865a
commit d97c3547f9
4 changed files with 76 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
overviewer_core/settingsDefinition.py
View File

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

5
overviewer_core/tileset.py
View File

@@ -527,8 +527,11 @@ class TileSet(object):
if isOverlay:
d.update({"tilesets": self.options.get("overlay")})
if (self.regionset.get_type() == "overworld"):
if (self.regionset.get_type() == "overworld" and self.options.get("showspawn", True)):
d.update({"spawn": self.options.get("spawn")})
else:
d.update({"spawn": "false"});
try:
d['north_direction'] = self.regionset.north_dir
except AttributeError: