1
0
mirror of https://github.com/minetest/minetest.git synced 2024-09-27 15:00:30 +02:00
Commit Graph

6 Commits

Author SHA1 Message Date
Brendan
93b59ed08a modified: src/content_craft.cpp
modified:   src/content_inventory.cpp
	modified:   src/content_mapblock.cpp
	modified:   src/content_mapnode.cpp
	modified:   src/content_mapnode.h
	modified:   src/mapgen.cpp
	modified:   src/mineral.cpp
	modified:   src/tile.cpp
	data/brightglass.png
	data/glowdust.png
	data/glowstone.png
2011-08-13 21:30:25 -07:00
Mark Holmquist
bc2819cab2 Added ladders--they don't have any use yet, though 2011-08-01 09:22:36 +02:00
Perttu Ahola
2587bb361c merged the content type extension and delta 2011-07-23 19:04:37 +03:00
Perttu Ahola
90d793f8f3 extended content-type range 2011-07-23 16:55:26 +03:00
Sebastian Rühl
9d09103e48 Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git 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-26 12:24:32 +02:00
Perttu Ahola
da692355e8 Created and moved stuff to content_nodemeta.{h,cpp} 2011-06-18 00:46:50 +03:00