0

Merge remote-tracking branch 'ion1/master'

This commit is contained in:
Aaron Griffith
2011-12-30 13:22:54 -05:00
4 changed files with 13 additions and 12 deletions

View File

@@ -19,7 +19,7 @@ import stat
import cPickle
import Image
import shutil
from time import strftime, localtime
from time import strftime, time, localtime
import json
import locale
import codecs
@@ -130,6 +130,8 @@ class MapGen(object):
config = config.replace("{spawn_coords}",
json.dumps(list(self.world.spawn)))
config = config.replace("{cache_tag}", str(int(time())))
#config = config.replace("{bg_color}", self.bg_color)
# helper function to get a label for the given rendermode