minetest.git - lizzy's patches for luanti

Age	Commit message (Collapse)	Author
2011-07-14	Merge branch 'upstream/master'	Nils Dagsson Moskopp
	Conflicts: data/oerkki1.png src/client.cpp
2011-06-26	changed one "if" to "else if" in content_mapblock.cpp	Perttu Ahola

2011-06-26	Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵	Sebastian Rühl
	into upstream_merge Conflicts: .gitignore CMakeLists.txt data/heart.png src/CMakeLists.txt src/game.cpp src/guiMainMenu.cpp src/inventory.cpp src/map.cpp src/mapblock.cpp src/mapnode.cpp src/mapnode.h src/materials.cpp src/server.cpp Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
2011-06-25	New map generator added (and SQLite, messed up the commits at that time...) ↵	Perttu Ahola
	(import from temporary git repo)
2011-06-17	Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and ↵	Perttu Ahola
	content_mapblock.{h,cpp}