Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge master of minetest/minetest_game

Browse source
This commit is contained in:
tchncs 2016-03-29 16:08:55 +02:00
commit 0b4aa7b59c
15 changed files with 383 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

24
mods/default/nodes.lua
View file

@ -14,7 +14,7 @@ language (for example pinewood and pine wood) the underscore form should be used
Stone
-----
(1. Material 2. Cobble variant 3. Brick variant [4. Modified forms])
(1. Material 2. Cobble variant 3. Brick variant 4. Modified forms)
default:stone
default:cobble
@ -33,7 +33,7 @@ default:obsidianbrick
Soft / Non-Stone
----------------
(1. Material [2. Modified forms])
(1. Material 2. Modified forms)
default:dirt
default:dirt_with_grass
@ -55,7 +55,7 @@ default:ice
Trees
-----
(1. Trunk 2. Fabricated trunk 3. Leaves 4. Sapling [5. Fruits])
(1. Trunk 2. Fabricated trunk 3. Leaves 4. Sapling 5. Fruits)
default:tree
default:wood
@ -82,9 +82,10 @@ default:aspen_tree
default:aspen_wood
default:aspen_leaves
default:aspen_sapling
Ores
----
(1. In stone 2. Block)
(1. In stone 2. Blocks)
default:stone_with_coal
default:coalblock
@ -107,6 +108,7 @@ default:diamondblock
Plantlife (non-cubic)
---------------------
default:cactus
default:papyrus
default:dry_shrub
@ -139,6 +141,7 @@ default:lava_flowing
Tools / "Advanced" crafting / Non-"natural"
-------------------------------------------
default:torch
default:chest
@ -169,6 +172,7 @@ default:meselamp
Misc
----
default:cloud
default:nyancat
default:nyancat_rainbow
@ -884,7 +888,7 @@ minetest.register_node("default:cactus", {
tiles = {"default_cactus_top.png", "default_cactus_top.png",
"default_cactus_side.png"},
paramtype2 = "facedir",
groups = {snappy = 1, choppy = 3, flammable = 2},
groups = {snappy = 1, choppy = 3},
sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node,
})
@ -942,7 +946,7 @@ minetest.register_node("default:junglegrass", {
sunlight_propagates = true,
walkable = false,
buildable_to = true,
groups = {snappy = 3, flammable = 2, flora = 1, attached_node = 1},
groups = {snappy = 3, flora = 1, attached_node = 1},
sounds = default.node_sound_leaves_defaults(),
selection_box = {
type = "fixed",
@ -963,7 +967,7 @@ minetest.register_node("default:grass_1", {
sunlight_propagates = true,
walkable = false,
buildable_to = true,
groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1},
groups = {snappy = 3, flora = 1, attached_node = 1},
sounds = default.node_sound_leaves_defaults(),
selection_box = {
type = "fixed",
@ -992,8 +996,8 @@ for i = 2, 5 do
walkable = false,
buildable_to = true,
drop = "default:grass_1",
groups = {snappy = 3, flammable = 3, flora = 1,
attached_node = 1, not_in_creative_inventory = 1},
groups = {snappy = 3, flora = 1, attached_node = 1,
not_in_creative_inventory = 1},
sounds = default.node_sound_leaves_defaults(),
selection_box = {
type = "fixed",
@ -1667,7 +1671,7 @@ end
register_sign("wood", "Wooden", {
sounds = default.node_sound_wood_defaults(),
groups = {choppy = 2, attached_node = 1, flammable = 2}
groups = {choppy = 2, attached_node = 1, flammable = 2, oddly_breakable_by_hand = 3}
})
register_sign("steel", "Steel", {