Merge branch 'master' into rewrite

2012-02-06 21:41:11 -05:00
parent 50ebdd7f2c 41e8546be6
commit 302e1d592a
51 changed files with 114 additions and 46 deletions
--- a/overviewer_core/assetmanager.py
+++ b/overviewer_core/assetmanager.py
@@ -92,6 +92,7 @@ directory.
        dump['worlds'] = worlds
        dump['map'] = dict()
        dump['map']['debug'] = True
+        dump['map']['cacheTag'] = str(int(time()))
        dump['map']['north_direction'] = 'lower-left' # only temporary
        dump['map']['center'] = [-314, 67, 94]
        dump['map']['controls'] = {