Default: Make some plant nodes non-flammable

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 47d344fd7154c7eec47ffecdd8ec4d4f9d585523..bb90451e20e42e0d187c05862078fc04b368b7c8 100644 (file)
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -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",

diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua
index dd90f4c9f29e11443e7a65226c9d6612cd2ab4fc..85fa36efc18be408f4351098dedbbe9b2c2da2cc 100644 (file)
--- a/mods/flowers/init.lua
+++ b/mods/flowers/init.lua
@@ -31,7 +31,6 @@ minetest.register_alias("flowers:flower_dandelion_white", "flowers:dandelion_whi
 local function add_simple_flower(name, desc, box, f_groups)
        -- Common flowers' groups
        f_groups.snappy = 3
-       f_groups.flammable = 2
        f_groups.flower = 1
        f_groups.flora = 1
        f_groups.attached_node = 1
@@ -134,7 +133,7 @@ minetest.register_node("flowers:mushroom_red", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flammable = 3, attached_node = 1},
+       groups = {snappy = 3, attached_node = 1},
        sounds = default.node_sound_leaves_defaults(),
        on_use = minetest.item_eat(-5),
        selection_box = {
@@ -153,7 +152,7 @@ minetest.register_node("flowers:mushroom_brown", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flammable = 3, attached_node = 1},
+       groups = {snappy = 3, attached_node = 1},
        sounds = default.node_sound_leaves_defaults(),
        on_use = minetest.item_eat(1),
        selection_box = {