Merge remote-tracking branch 'upstream/master' into weather

This commit is contained in:
proller 2013-11-08 21:20:56 +04:00
commit 2386003508
2 changed files with 7 additions and 0 deletions

View file

@ -358,3 +358,4 @@ minetest.register_abm({
end end
end end
}) })

View file

@ -253,15 +253,19 @@ minetest.register_node("default:brick", {
minetest.register_node("default:tree", { minetest.register_node("default:tree", {
description = "Tree", description = "Tree",
tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"}, tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
paramtype2 = "facedir",
groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
}) })
minetest.register_node("default:jungletree", { minetest.register_node("default:jungletree", {
description = "Jungle Tree", description = "Jungle Tree",
tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"}, tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
paramtype2 = "facedir",
groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
}) })
minetest.register_node("default:junglewood", { minetest.register_node("default:junglewood", {
@ -360,9 +364,11 @@ minetest.register_node("default:leaves", {
minetest.register_node("default:cactus", { minetest.register_node("default:cactus", {
description = "Cactus", description = "Cactus",
tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"}, tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
paramtype2 = "facedir",
is_ground_content = true, is_ground_content = true,
groups = {snappy=1,choppy=3,flammable=2}, groups = {snappy=1,choppy=3,flammable=2},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
}) })
minetest.register_node("default:papyrus", { minetest.register_node("default:papyrus", {