LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'master' into mineral-overlay

Browse Source 
Conflicts:
	src/overviewer.h
This commit is contained in:
Aaron Griffith
2011-06-06 22:18:23 -04:00
parent 3065f871d9 ac91268c66
commit 03094b1af9
27 changed files with 449 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -28,7 +28,7 @@ setup_kwargs['cmdclass'] = {}
if py2exe is not None:
setup_kwargs['console'] = ['overviewer.py']
setup_kwargs['data_files'] = [('textures', ['textures/lava.png', 'textures/water.png', 'textures/fire.png', 'textures/portal.png']),
('', ['overviewerConfig.js', 'COPYING.txt', 'README.rst']),
('', ['COPYING.txt', 'README.rst']),
('web_assets', glob.glob('web_assets/*'))]
setup_kwargs['zipfile'] = None
if platform.system() == 'Windows' and '64bit' in platform.architecture():