search

boskee / Minecraft

Simple Minecraft-inspired program using Python and Pyglet
MIT License
207 stars 33 forks source link

fix. commented out /tp command. perlin ores #63

Closed ronmurphy closed 11 years ago

Nebual commented 11 years ago

Righto, I think thats all of your additions in 7f9fdc6. I didn't include the whitespace modifications or the commented code, and I had to do a manual merge commit since your commits haphazardly contained commits from the main repo and it confused the automerge.

ronmurphy commented 11 years ago

Thanks. it seems i am incapable of doing a correct git pull.