Ryan Rector
|
1b25f187ff
|
Merge remote-tracking branch 'upstream/master' into configurable-north
|
2011-08-03 20:41:09 -06:00 |
|
Alejandro Aguilera
|
aecb39bbbc
|
Delete generate_pseudo_ancil_data function from chunk.py
|
2011-07-26 00:57:12 +02:00 |
|
Alejandro Aguilera
|
2f3f358d84
|
Add pistons to textures.py
|
2011-07-26 00:24:26 +02:00 |
|
Aaron Griffith
|
317f7794fe
|
Merge branch 'master' into py-package
|
2011-05-31 20:26:00 -04:00 |
|
Aaron Griffith
|
383b01859f
|
Merge branch 'master' into py-package
Conflicts:
overviewer_core/data/config.js
overviewer_core/data/web_assets/functions.js
overviewer_core/data/web_assets/style.css
setup.py
web_assets/overviewer.css
web_assets/style.css
|
2011-05-10 20:19:10 -04:00 |
|
Aaron Griffith
|
299f15a312
|
Merge branch 'dtt-c-render' into py-package
|
2011-04-13 02:42:22 -04:00 |
|
Aaron Griffith
|
42596416d9
|
sdist and install now work
next step is using a custom data dir, and falling back on the package
data dir. Also, fixing --version.
|
2011-03-29 13:49:50 -04:00 |
|