From f9cae7314e08fbeeef509c5c6ca095822fec1747 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 14 Jul 2016 09:03:38 -0400 Subject: update boost carts, mesecons, moreblocks, moretrees, unified inventory, and worldedit --- moreblocks/aliases.lua | 2 ++ moreblocks/nodes.lua | 21 -------------- moreblocks/redefinitions.lua | 53 ----------------------------------- moreblocks/stairsplus/microblocks.lua | 2 +- moreblocks/stairsplus/panels.lua | 2 +- moreblocks/stairsplus/slabs.lua | 2 +- moreblocks/stairsplus/slopes.lua | 2 +- moreblocks/stairsplus/stairs.lua | 2 +- 8 files changed, 7 insertions(+), 79 deletions(-) (limited to 'moreblocks') diff --git a/moreblocks/aliases.lua b/moreblocks/aliases.lua index 15f7b6b..c34472d 100644 --- a/moreblocks/aliases.lua +++ b/moreblocks/aliases.lua @@ -19,6 +19,8 @@ minetest.register_alias("moreblocks:stone_bricks", "default:stonebrick") minetest.register_alias("moreblocks:stonebrick", "default:stonebrick") minetest.register_alias("moreblocks:junglewood", "default:junglewood") minetest.register_alias("moreblocks:jungle_wood", "default:junglewood") +minetest.register_alias("moreblocks:fence_jungle_wood", "default:fence_junglewood") +minetest.register_alias("moreblocks:jungle_stick", "default:stick") for _, t in pairs(circular_saw.names) do minetest.register_alias("moreblocks:" .. t[1] .. "_jungle_wood" .. t[2], diff --git a/moreblocks/nodes.lua b/moreblocks/nodes.lua index 2d35cd2..8e81131 100644 --- a/moreblocks/nodes.lua +++ b/moreblocks/nodes.lua @@ -239,21 +239,6 @@ local nodes = { sounds = sound_glass, no_stairs = true, }, - ["fence_jungle_wood"] = { - description = S("Jungle Wood Fence"), - drawtype = "fencelike", - tiles = {"default_junglewood.png"}, - inventory_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126", - wield_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126", - paramtype = "light", - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, - groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = sound_wood, - no_stairs = true, - }, ["all_faces_tree"] = { description = S("All-faces Tree"), tiles = {"default_tree_top.png"}, @@ -364,12 +349,6 @@ minetest.register_craftitem("moreblocks:sweeper", { inventory_image = "moreblocks_sweeper.png", }) -minetest.register_craftitem("moreblocks:jungle_stick", { - description = S("Jungle Stick"), - inventory_image = "moreblocks_junglestick.png", - groups = {stick= 1}, -}) - minetest.register_craftitem("moreblocks:nothing", { inventory_image = "invisible.png", on_use = function() end, diff --git a/moreblocks/redefinitions.lua b/moreblocks/redefinitions.lua index 9dc7ae3..d111389 100644 --- a/moreblocks/redefinitions.lua +++ b/moreblocks/redefinitions.lua @@ -45,56 +45,3 @@ minetest.register_craft({ type = "toolrepair", additional_wear = -0.10, -- Tool repair buff (10% bonus instead of 2%). }) - --- Redefinitions of some default nodes --- =================================== - --- Let there be light. This makes some nodes let light pass through: -minetest.override_item("default:ladder", { - paramtype = "light", - sunlight_propagates = true, -}) - -minetest.override_item("default:sapling", { - paramtype = "light", - sunlight_propagates = true, -}) - -minetest.override_item("default:dry_shrub", { - paramtype = "light", - sunlight_propagates = true, -}) - -minetest.override_item("default:papyrus", { - paramtype = "light", - sunlight_propagates = true, -}) - -minetest.override_item("default:fence_wood", { - paramtype = "light", - sunlight_propagates = true, -}) - -minetest.override_item("default:junglegrass", { - paramtype = "light", - sunlight_propagates = true, -}) - -minetest.override_item("default:junglesapling", { - paramtype = "light", - sunlight_propagates = true, -}) - -minetest.override_item("default:grass_1", { - inventory_image = "default_grass_3.png", -- Use a bigger inventory image. - wield_image = "default_grass_3.png", - paramtype = "light", - sunlight_propagates = true, -}) - -for i = 2, 5 do - minetest.override_item("default:grass_" ..i, { - paramtype = "light", - sunlight_propagates = true, - }) -end diff --git a/moreblocks/stairsplus/microblocks.lua b/moreblocks/stairsplus/microblocks.lua index 7902209..3d5de1f 100644 --- a/moreblocks/stairsplus/microblocks.lua +++ b/moreblocks/stairsplus/microblocks.lua @@ -77,7 +77,7 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields) def.on_place = minetest.rotate_node def.groups = stairsplus:prepare_groups(fields.groups) def.description = desc - if fields.drop and not type(fields.drop) == "table" then + if fields.drop and not (type(fields.drop) == "table") then def.drop = modname.. ":micro_" ..fields.drop..alternate end minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def) diff --git a/moreblocks/stairsplus/panels.lua b/moreblocks/stairsplus/panels.lua index dc1d67d..ab6ef83 100644 --- a/moreblocks/stairsplus/panels.lua +++ b/moreblocks/stairsplus/panels.lua @@ -77,7 +77,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields) def.on_place = minetest.rotate_node def.description = desc def.groups = stairsplus:prepare_groups(fields.groups) - if fields.drop and not type(fields.drop) == "table" then + if fields.drop and not (type(fields.drop) == "table") then def.drop = modname.. ":panel_" ..fields.drop..alternate end minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def) diff --git a/moreblocks/stairsplus/slabs.lua b/moreblocks/stairsplus/slabs.lua index e184981..236d91e 100644 --- a/moreblocks/stairsplus/slabs.lua +++ b/moreblocks/stairsplus/slabs.lua @@ -48,7 +48,7 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields) def.on_place = minetest.rotate_node def.description = ("%s (%d/16)"):format(desc_base, num) def.groups = stairsplus:prepare_groups(fields.groups) - if fields.drop and not type(fields.drop) == "table" then + if fields.drop and not (type(fields.drop) == "table") then def.drop = modname.. ":slab_" .. fields.drop .. alternate end minetest.register_node(":" .. modname .. ":slab_" .. subname .. alternate, def) diff --git a/moreblocks/stairsplus/slopes.lua b/moreblocks/stairsplus/slopes.lua index dfb4bcb..f0e8c20 100644 --- a/moreblocks/stairsplus/slopes.lua +++ b/moreblocks/stairsplus/slopes.lua @@ -231,7 +231,7 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields) def.on_place = minetest.rotate_node def.description = desc def.groups = stairsplus:prepare_groups(fields.groups) - if fields.drop and not type(fields.drop) == "table" then + if fields.drop and not (type(fields.drop) == "table") then def.drop = modname.. ":slope_" ..fields.drop..alternate end minetest.register_node(":" ..modname.. ":slope_" ..subname..alternate, def) diff --git a/moreblocks/stairsplus/stairs.lua b/moreblocks/stairsplus/stairs.lua index 04b8667..ee8075f 100644 --- a/moreblocks/stairsplus/stairs.lua +++ b/moreblocks/stairsplus/stairs.lua @@ -117,7 +117,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields) def.on_place = minetest.rotate_node def.description = desc def.groups = stairsplus:prepare_groups(fields.groups) - if fields.drop and not type(fields.drop) == "table" then + if fields.drop and not (type(fields.drop) == "table") then def.drop = modname .. ":stair_" .. fields.drop .. alternate end minetest.register_node(":" .. modname .. ":stair_" .. subname .. alternate, def) -- cgit v1.2.3