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

This commit is contained in:
Sys Quatre 2021-02-26 12:52:52 +01:00
commit 5e8cd73393
2 changed files with 30 additions and 30 deletions

View File

@ -6,4 +6,4 @@ Changed in V1.2:
>smaller textures
Changed in V1.3:
>added all plants to the group attatched_node
>added all plants to the group attached_node

View File

@ -14,7 +14,7 @@ minetest.register_node("moreplants:tallgrass", {
inventory_image = "moreplants_longgrass.png",
visual_scale = 1.4,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
@ -34,7 +34,7 @@ minetest.register_node("moreplants:aliengrass", {
inventory_image = "moreplants_aliengrass.png",
visual_scale = 1.54,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
@ -55,7 +55,7 @@ minetest.register_node("moreplants:bulrush", {
inventory_image = "moreplants_bullrush.png",
visual_scale = 1.3,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
@ -75,7 +75,7 @@ minetest.register_node("moreplants:bigfern", {
inventory_image = "moreplants_bigfern.png",
visual_scale = 1.5,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
@ -95,7 +95,7 @@ minetest.register_node("moreplants:umbrella", {
inventory_image = "moreplants_umbrella.png",
visual_scale = 2,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 3, 0.3}
@ -115,7 +115,7 @@ minetest.register_node("moreplants:bigflower", {
inventory_image = "moreplants_bigflower.png",
visual_scale = 1.2,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flower=1},
groups = {snappy=3, flammable=1, attached_node=1, flower=1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
@ -135,7 +135,7 @@ minetest.register_node("moreplants:medflower", {
inventory_image = "moreplants_medflower.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flower=1},
groups = {snappy=3, flammable=1, attached_node=1, flower=1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
@ -157,7 +157,7 @@ minetest.register_node("moreplants:weed", {
inventory_image = "moreplants_weed.png",
visual_scale = 1.1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
@ -177,7 +177,7 @@ minetest.register_node("moreplants:stoneweed", {
inventory_image = "moreplants_stoneplant.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -197,7 +197,7 @@ minetest.register_node("moreplants:spikefern", {
inventory_image = "moreplants_spikefern.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -217,7 +217,7 @@ minetest.register_node("moreplants:bluespike", {
inventory_image = "moreplants_bluespike.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -237,7 +237,7 @@ minetest.register_node("moreplants:blueflower", {
inventory_image = "moreplants_blueflower.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flower=1},
groups = {snappy=3, flammable=1, attached_node=1, flower=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -257,7 +257,7 @@ minetest.register_node("moreplants:eyeweed", {
inventory_image = "moreplants_eyeweed.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
drop = "moreplants:eye",
selection_box = {
type = "fixed",
@ -278,7 +278,7 @@ minetest.register_node("moreplants:fern", {
inventory_image = "moreplants_fern.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -298,7 +298,7 @@ minetest.register_node("moreplants:bush", {
inventory_image = "moreplants_bush.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -318,7 +318,7 @@ minetest.register_node("moreplants:cactus", {
inventory_image = "moreplants_cactus.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -338,7 +338,7 @@ minetest.register_node("moreplants:firefung", {
inventory_image = "moreplants_firemush.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, igniter=1, hot=3, attatched_node=1, flora=1},
groups = {snappy=3, igniter=1, hot=3, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -357,7 +357,7 @@ minetest.register_node("moreplants:bluemush", {
inventory_image = "moreplants_bluemush.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -378,7 +378,7 @@ minetest.register_node("moreplants:caveflower", {
visual_scale = 1,
light_source = 5,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flower=1},
groups = {snappy=3, flammable=1, attached_node=1, flower=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -397,7 +397,7 @@ minetest.register_node("moreplants:moonflower", {
inventory_image = "moreplants_moonflower.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flower=1},
groups = {snappy=3, flammable=1, attached_node=1, flower=1},
selection_box = {
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
@ -417,7 +417,7 @@ minetest.register_node("moreplants:fireflower", {
inventory_image = "moreplants_fireflower.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flower=1},
groups = {snappy=3, flammable=1, attached_node=1, flower=1},
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
@ -438,7 +438,7 @@ minetest.register_node("moreplants:deadweed", {
inventory_image = "moreplants_deadweed.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
@ -458,7 +458,7 @@ minetest.register_node("moreplants:taigabush", {
inventory_image = "moreplants_tundrabush.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
@ -488,7 +488,7 @@ minetest.register_node("moreplants:glowfung", {
inventory_image = "moreplants_glowfung.png",
visual_scale = 1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
walkable = false,
})
@ -503,7 +503,7 @@ minetest.register_node("moreplants:jungleflower", {
inventory_image = "moreplants_jungleflower1.png",
visual_scale = 1.1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flower=1},
groups = {snappy=3, flammable=1, attached_node=1, flower=1},
selection_box = {
type = "fixed",
fixed = {-0.4, -0.5, -0.4, 0.4, 0.4, 0.4}
@ -535,7 +535,7 @@ minetest.register_node("moreplants:mushroom", {
{-0.125, -0.1875, -0.125, 0.125, -0.125, 0.125}, -- NodeBox3
}
},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
light_source=2,
})
@ -550,7 +550,7 @@ minetest.register_node("moreplants:curly", {
inventory_image = "moreplants_curly.png",
visual_scale = 1.1,
wield_scale = {x=0.5, y=0.5, z=0.5},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
drop = "moreplants:curlyfruit",
selection_box = {
type = "fixed",
@ -570,7 +570,7 @@ minetest.register_node("moreplants:clover", {
"moreplants_clover.png",
"moreplants_clover.png"
},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
is_ground_content=true,
buildable_to = true,
sunlight_propagates = true,
@ -595,7 +595,7 @@ minetest.register_node("moreplants:groundfung", {
"moreplants_groundfung.png",
"moreplants_groundfung.png"
},
groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
groups = {snappy=3, flammable=1, attached_node=1, flora=1},
is_ground_content=true,
buildable_to = true,
walkable = false,