Merge branch master into devel
Conflicts: docs/config.rst overviewer.py overviewer_core/settingsDefinition.py overviewer_core/tileset.py
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user