LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'exhuma/master', PR #963

Browse Source 
Conflicts:
	overviewer.py
	overviewer_core/aux_files/genPOI.py
	overviewer_core/textures.py
This commit is contained in:
Aaron Griffith
2013-12-01 16:35:28 -05:00
parent 7bbb077704 d4f19bda76
commit e26727943f
11 changed files with 219 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overviewer_core/assetmanager.py
View File

@@ -27,6 +27,10 @@ import world
import util
from files import FileReplacer, mirror_dir
LOG = logging.getLogger(__name__)
class AssetManager(object):
"""\
These objects provide an interface to metadata and persistent data, and at the
@@ -51,8 +55,8 @@ directory.
self.overviewerConfig = json.loads(overviewerConfig_str)
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())
LOG.warning("A previous overviewerConfig.js was found, but I couldn't read it for some reason. Continuing with a blank config")
LOG.debug(traceback.format_exc())
self.overviewerConfig = dict(tilesets=dict())
# Make sure python knows the preferred encoding. If it does not, set it