Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2024-09-15 09:40:56 +02:00
commit 6d096beca8
150 changed files with 149 additions and 87 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 609 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 525 B

View File

@ -161,6 +161,7 @@ for i, bush_name in ipairs(bushes_classic.bushes) do
paramtype2 = "facedir", paramtype2 = "facedir",
on_use = minetest.item_eat(18), on_use = minetest.item_eat(18),
groups = { dig_immediate = 3 }, groups = { dig_immediate = 3 },
is_ground_content = false,
}) })
@ -212,4 +213,5 @@ minetest.register_node(":bushes:basket_empty", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = { dig_immediate = 3 }, groups = { dig_immediate = 3 },
is_ground_content = false,
}) })

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

@ -17,7 +17,7 @@ minetest.register_node("cavestuff:pebble_1",{
tiles = {"undergrowth_pebble.png"}, tiles = {"undergrowth_pebble.png"},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {cracky=3, stone=1, attached_node=1}, groups = {cracky=3, stone=1, attached_node=1, dig_immediate=3},
selection_box = cbox, selection_box = cbox,
collision_box = cbox, collision_box = cbox,
on_place = function(itemstack, placer, pointed_thing) on_place = function(itemstack, placer, pointed_thing)
@ -36,7 +36,7 @@ minetest.register_node("cavestuff:pebble_2",{
drop = "cavestuff:pebble_1", drop = "cavestuff:pebble_1",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1}, groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1, dig_immediate=3},
selection_box = cbox, selection_box = cbox,
collision_box = cbox, collision_box = cbox,
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
@ -49,7 +49,7 @@ minetest.register_node("cavestuff:desert_pebble_1",{
tiles = {"default_desert_stone.png"}, tiles = {"default_desert_stone.png"},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {cracky=3, stone=1, attached_node=1}, groups = {cracky=3, stone=1, attached_node=1, dig_immediate=3},
selection_box = cbox, selection_box = cbox,
collision_box = cbox, collision_box = cbox,
on_place = function(itemstack, placer, pointed_thing) on_place = function(itemstack, placer, pointed_thing)
@ -68,7 +68,7 @@ minetest.register_node("cavestuff:desert_pebble_2",{
tiles = {"default_desert_stone.png"}, tiles = {"default_desert_stone.png"},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1}, groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1, dig_immediate=3},
selection_box = cbox, selection_box = cbox,
collision_box = cbox, collision_box = cbox,
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
@ -80,6 +80,7 @@ minetest.register_node("cavestuff:stalactite_1",{
drawtype="nodebox", drawtype="nodebox",
tiles = {"undergrowth_pebble.png"}, tiles = {"undergrowth_pebble.png"},
groups = {cracky=3,attached_node=1}, groups = {cracky=3,attached_node=1},
is_ground_content = false,
description = S("Stalactite"), description = S("Stalactite"),
paramtype = "light", paramtype = "light",
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
@ -126,6 +127,7 @@ minetest.register_node("cavestuff:stalactite_2",{
drawtype="nodebox", drawtype="nodebox",
tiles = {"undergrowth_pebble.png"}, tiles = {"undergrowth_pebble.png"},
groups = {cracky=3,attached_node=1,not_in_creative_inventory=1}, groups = {cracky=3,attached_node=1,not_in_creative_inventory=1},
is_ground_content = false,
drop = "cavestuff:stalactite_1", drop = "cavestuff:stalactite_1",
paramtype = "light", paramtype = "light",
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
@ -144,6 +146,7 @@ minetest.register_node("cavestuff:stalactite_3",{
drawtype="nodebox", drawtype="nodebox",
tiles = {"undergrowth_pebble.png"}, tiles = {"undergrowth_pebble.png"},
groups = {cracky=3,attached_node=1,not_in_creative_inventory=1}, groups = {cracky=3,attached_node=1,not_in_creative_inventory=1},
is_ground_content = false,
drop = "cavestuff:stalactite_1", drop = "cavestuff:stalactite_1",
paramtype = "light", paramtype = "light",
paramtype2 = "wallmounted", paramtype2 = "wallmounted",

View File

@ -119,6 +119,7 @@ minetest.register_node("dryplants:grass", {
fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 },
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -151,6 +152,7 @@ minetest.register_node("dryplants:hay", {
fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 },
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })

View File

@ -44,6 +44,7 @@ minetest.register_node("dryplants:wetreed_slab", {
fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2},
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -72,6 +73,7 @@ minetest.register_node("dryplants:wetreed_roof", {
} }
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -194,6 +196,7 @@ minetest.register_node("dryplants:wetreed_roof_corner", {
} }
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -224,6 +227,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", {
} }
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -263,6 +267,7 @@ minetest.register_node("dryplants:reed", {
paramtype2 = "facedir", paramtype2 = "facedir",
tiles = {"dryplants_reed.png"}, tiles = {"dryplants_reed.png"},
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -284,6 +289,7 @@ minetest.register_node("dryplants:reed_slab", {
fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2},
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -312,6 +318,7 @@ minetest.register_node("dryplants:reed_roof", {
} }
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -342,6 +349,7 @@ minetest.register_node("dryplants:reed_roof_corner", {
} }
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -372,5 +380,6 @@ minetest.register_node("dryplants:reed_roof_corner_2", {
} }
}, },
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
is_ground_content = false,
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })

View File

@ -88,6 +88,7 @@ minetest.register_node("dryplants:reedmace_spikes", {
flammable=2, flammable=2,
not_in_creative_inventory=1 not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = 'dryplants:reedmace_sapling', drop = 'dryplants:reedmace_sapling',
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -110,6 +111,7 @@ minetest.register_node("dryplants:reedmace_top", {
flammable=2, flammable=2,
not_in_creative_inventory=1 not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = 'dryplants:reedmace_sapling', drop = 'dryplants:reedmace_sapling',
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -133,6 +135,7 @@ minetest.register_node("dryplants:reedmace_height_2", {
flammable=2--, flammable=2--,
--not_in_creative_inventory=1 --not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = 'dryplants:reedmace_sapling', drop = 'dryplants:reedmace_sapling',
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -156,6 +159,7 @@ minetest.register_node("dryplants:reedmace_height_3", {
flammable=2--, flammable=2--,
--not_in_creative_inventory=1 --not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = 'dryplants:reedmace_sapling', drop = 'dryplants:reedmace_sapling',
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -179,6 +183,7 @@ minetest.register_node("dryplants:reedmace_height_3_spikes", {
flammable=2--, flammable=2--,
--not_in_creative_inventory=1 --not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = 'dryplants:reedmace_sapling', drop = 'dryplants:reedmace_sapling',
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -201,6 +206,7 @@ minetest.register_node("dryplants:reedmace", {
flammable=2, flammable=2,
not_in_creative_inventory=1 not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = 'dryplants:reedmace_sapling', drop = 'dryplants:reedmace_sapling',
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -231,6 +237,7 @@ minetest.register_node("dryplants:reedmace_bottom", {
flammable=2, flammable=2,
not_in_creative_inventory=1 not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = 'dryplants:reedmace_sapling', drop = 'dryplants:reedmace_sapling',
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 352 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 734 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 B

View File

@ -138,6 +138,7 @@ minetest.register_node("ferns:tree_fern_leaves_giant", {
attached_node=1, attached_node=1,
not_in_creative_inventory=1 not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = { drop = {
max_items = 2, max_items = 2,
items = { items = {
@ -179,6 +180,7 @@ minetest.register_node("ferns:tree_fern_leave_big", {
attached_node=1, attached_node=1,
not_in_creative_inventory=1 not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = "", drop = "",
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
after_destruct = function(pos,oldnode) after_destruct = function(pos,oldnode)
@ -217,6 +219,7 @@ minetest.register_node("ferns:tree_fern_leave_big_end", {
attached_node=1, attached_node=1,
not_in_creative_inventory=1 not_in_creative_inventory=1
}, },
is_ground_content = false,
drop = "", drop = "",
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
@ -255,6 +258,7 @@ minetest.register_node("ferns:fern_trunk_big_top", {
not_in_creative_inventory=1, not_in_creative_inventory=1,
leafdecay=3 -- to support vines leafdecay=3 -- to support vines
}, },
is_ground_content = false,
drop = "ferns:fern_trunk_big", drop = "ferns:fern_trunk_big",
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
}) })
@ -281,6 +285,7 @@ minetest.register_node("ferns:fern_trunk_big", {
fixed = {-1/4, -1/2, -1/4, 1/4, 1/2, 1/4}, fixed = {-1/4, -1/2, -1/4, 1/4, 1/2, 1/4},
}, },
groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
is_ground_content = false,
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
after_dig_node = function(pos, node, metadata, digger) after_dig_node = function(pos, node, metadata, digger)
if digger == nil then return end if digger == nil then return end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 640 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 554 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 677 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 664 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 669 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 814 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Some files were not shown because too many files have changed in this diff Show More