erlehmann / minetest-delta

Fork of minetest-c55 with additional experimental features.
28 stars 12 forks source link

Erlehmann master merge #11

Closed Bahamada closed 13 years ago

Bahamada commented 13 years ago

I did the upstream merge for you. I did it really carefully and it should be 100% complete.

Bahamada commented 13 years ago

Strangely there are some unwanted commits in it. See here my merge: https://github.com/Bahamada/minetest-delta/commit/7117851682351540f471cff1e4b5e0c49005ab1d