max-mapper / voxel-engine

3D HTML5 voxel game engine

http://maxogden.github.com/voxel-engine

BSD 3-Clause "New" or "Revised" License

1.29k stars 220 forks source link

Open z3t0 opened 9 years ago

z3t0 commented 9 years ago

118

deathcap commented 8 years ago

@z3t0 GitHub says this PR has conflicts: "This branch has conflicts that must be resolved"

z3t0 commented 8 years ago

@deathcap I'll take a look

z3t0 commented 8 years ago

I can't really fix them as I dont have write access, can you just close this and add the change manually? Thanks