Whitespace damage fixes.

This is cleaned up by `cleanfile` (from the linux kernel tree
tool set).
This commit is contained in:
Auke Kok 2016-12-15 13:23:31 -08:00 committed by Auke Kok
parent 6256427ce7
commit 138e078f1b
26 changed files with 109 additions and 119 deletions

View File

@ -588,14 +588,14 @@ minetest.register_craft({
}
})
if not minetest.get_modpath("technic") then
if not minetest.get_modpath("technic") then
minetest.register_node( ":technic:granite", {
description = "Granite",
tiles = { "technic_granite.png" },
is_ground_content = true,
groups = {cracky=1},
sounds = default.node_sound_stone_defaults(),
})
})
minetest.register_craft({
output = "technic:granite 9",

View File

@ -1,6 +1,6 @@
local shapes = {
{ { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
{ { x = {1, 1, 1, 1}, y = {0, 1, 2, 3} },
{ x = {0, 1, 2, 3}, y = {1, 1, 1, 1} } },
@ -70,7 +70,7 @@ end
local function step(pos, fields)
local meta = minetest.get_meta(pos)
local t = minetest.deserialize(meta:get_string("tetris"))
local function new_game(pos)
local nex = math.random(7)
@ -81,7 +81,7 @@ local function step(pos, fields)
score = 0,
cur = math.random(7),
nex = nex,
x=4, y=0, rot=1
x=4, y=0, rot=1
}
local timer = minetest.get_node_timer(pos)
@ -99,7 +99,7 @@ local function step(pos, fields)
i*sizey+boardy, semi,
size, comma, size, semi,
colors[tile[2]], close }
ins = ins + 1
scr[ins] = concat(tmp)
end
@ -138,9 +138,9 @@ local function step(pos, fields)
for i=1,4 do
local cx, cy = d.x[i]+x, d.y[i]+y
if cx < 0 or cx > 9 or cy < 0 or cy > 19 then
return false
return false
end
for _, tile in pairs(t.board[ cy ] or {}) do
@ -157,7 +157,7 @@ local function step(pos, fields)
end
local function tick()
if stuck() then
if stuck() then
if t.y <= 0 then
return false end
add()
@ -170,7 +170,7 @@ local function step(pos, fields)
t.y = t.y + 1
end
return true
end
end
local function move(dx, dy)
local newx, newy = t.x+dx, t.y+dy
@ -225,10 +225,10 @@ local function step(pos, fields)
end
if t then
local scr = { formsize, background,
local scr = { formsize, background,
t.boardstring, t.previewstring,
draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy),
"label[3.8,0.1;Next...]label[3.8,2.7;Score: ",
"label[3.8,0.1;Next...]label[3.8,2.7;Score: ",
t.score, close, buttons }

View File

@ -37,7 +37,7 @@ local function start_smoke(pos, node, clicker, chimney)
s_handle = minetest.sound_play("fire_small", {
pos = pos,
max_hear_distance = 5,
loop = true
loop = true
})
this_spawner_meta:set_int("smoky", id)
this_spawner_meta:set_int("sound", s_handle)
@ -81,7 +81,7 @@ for _, f in ipairs(flame_types) do
light_source = 14,
waving = 1,
tiles = {
{name=f.."_fire_animated.png", animation={type="vertical_frames",
{name=f.."_fire_animated.png", animation={type="vertical_frames",
aspect_w=16, aspect_h=16, length=1.5}},
},
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@ -112,7 +112,7 @@ minetest.register_node("fake_fire:fancy_fire", {
damage_per_second = 4,
on_rotate = screwdriver.rotate_simple,
tiles = {
{name="fake_fire_animated.png",
{name="fake_fire_animated.png",
animation={type='vertical_frames', aspect_w=16, aspect_h=16, length=1}}, {name='fake_fire_logs.png'}},
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
start_smoke(pos, node, clicker)
@ -172,7 +172,7 @@ for _, m in ipairs(materials) do
stop_smoke(pos)
end
})
minetest.register_craft({
type = "shapeless",
output = 'fake_fire:chimney_top_'..m,

View File

@ -103,4 +103,3 @@ homedecor.register("medicine_cabinet_open", {
minetest.swap_node(pos, node)
end,
})

View File

@ -7,7 +7,7 @@ local toilet_sbox = {
local toilet_cbox = {
type = "fixed",
fixed = {
fixed = {
{-6/16, -8/16, -8/16, 6/16, 1/16, 8/16 },
{-6/16, -8/16, 4/16, 6/16, 9/16, 8/16 }
}

View File

@ -11,7 +11,7 @@ local bedcolors = {
{ "grey", "#101010:100" }, --new cg72
{ "magenta", "#e0048b:150" }, --new cg72
{ "orange", "#ff3000:150" },
{ "pink", "#ff80b0:150" },
{ "pink", "#ff80b0:150" },
{ "red", "#d00000:150" },
{ "violet", "#7000e0:150" },
{ "white", "#000000:000" }, --new cg72
@ -167,7 +167,7 @@ for _, w in pairs({"mahogany", "oak"}) do
type = "fixed",
fixed = {
{ -8/16, 0, -30/64, 8/16, 8/16, 8/16 }, -- top half
{ -7/16, 1/16, -32/64, 7/16, 7/16, -29/64}, -- drawer face
{ -7/16, 1/16, -32/64, 7/16, 7/16, -29/64}, -- drawer face
{ -8/16, -8/16, -30/64, -7/16, 0, 8/16 }, -- left
{ 7/16, -8/16, -30/64, 8/16, 0, 8/16 }, -- right
{ -8/16, -8/16, 7/16, 8/16, 0, 8/16 }, -- back

View File

@ -639,7 +639,7 @@ minetest.register_craft({
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_mahogany 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -649,14 +649,14 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_mahogany",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_mahogany",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_red 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -666,15 +666,15 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_red",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_red",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_yellow 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -684,9 +684,9 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_yellow",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_yellow",
burntime = 30,
})
--
@ -714,7 +714,7 @@ minetest.register_craft({
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_light_blue 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -724,15 +724,15 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_light_blue",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_light_blue",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_violet 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -742,9 +742,9 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_violet",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_violet",
burntime = 30,
})
--
@ -931,7 +931,7 @@ minetest.register_craft( {
minetest.register_craft( {
type = "shapeless",
output = "homedecor:rug_small 8",
recipe = {
recipe = {
"wool:red",
"wool:yellow",
"wool:blue",
@ -953,7 +953,7 @@ minetest.register_craft( {
minetest.register_craft( {
type = "shapeless",
output = "homedecor:rug_small 8",
recipe = {
recipe = {
"cotton:red",
"cotton:yellow",
"cotton:blue",
@ -973,37 +973,37 @@ minetest.register_craft( {
-- fuel recipes for same
minetest.register_craft({
type = "fuel",
recipe = "homedecor:rug_small",
burntime = 30,
type = "fuel",
recipe = "homedecor:rug_small",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:rug_large 2",
recipe = {
recipe = {
"homedecor:rug_small",
"homedecor:rug_small",
},
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:rug_large",
burntime = 30,
type = "fuel",
recipe = "homedecor:rug_large",
burntime = 30,
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:rug_persian",
burntime = 30,
type = "fuel",
recipe = "homedecor:rug_persian",
burntime = 30,
})
-- Speakers
minetest.register_craft( {
output = "homedecor:speaker_driver 2",
recipe = {
recipe = {
{ "", "default:steel_ingot", "" },
{ "default:paper", "homedecor:copper_wire", "default:iron_lump" },
{ "", "default:steel_ingot", "" },
@ -1012,14 +1012,14 @@ minetest.register_craft( {
minetest.register_craft( {
output = "homedecor:speaker_small",
recipe = {
recipe = {
{ "wool:black", "homedecor:speaker_driver", "group:wood" },
},
})
minetest.register_craft( {
output = "homedecor:speaker",
recipe = {
recipe = {
{ "wool:black", "homedecor:speaker_driver", "group:wood" },
{ "wool:black", "homedecor:speaker_driver", "group:wood" },
{ "wool:black", "group:wood", "group:wood" },
@ -1030,14 +1030,14 @@ minetest.register_craft( {
minetest.register_craft( {
output = "homedecor:speaker_small",
recipe = {
recipe = {
{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
},
})
minetest.register_craft( {
output = "homedecor:speaker",
recipe = {
recipe = {
{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
{ "cotton:black", "group:wood", "group:wood" },
@ -1059,7 +1059,7 @@ for c in ipairs(curtaincolors) do
local color = curtaincolors[c]
minetest.register_craft( {
output = "homedecor:curtain_"..color.." 3",
recipe = {
recipe = {
{ "wool:"..color, "", ""},
{ "wool:"..color, "", ""},
{ "wool:"..color, "", ""},
@ -2120,64 +2120,64 @@ minetest.register_craft({
local painting_patterns = {
[1] = { { "brown", "red", "brown" },
{ "dark_green", "red", "green" } },
{ "dark_green", "red", "green" } },
[2] = { { "green", "yellow", "green" },
{ "green", "yellow", "green" } },
{ "green", "yellow", "green" } },
[3] = { { "green", "pink", "green" },
{ "brown", "pink", "brown" } },
{ "brown", "pink", "brown" } },
[4] = { { "black", "orange", "grey" },
{ "dark_green", "orange", "orange" } },
{ "dark_green", "orange", "orange" } },
[5] = { { "blue", "orange", "yellow" },
{ "green", "red", "brown" } },
{ "green", "red", "brown" } },
[6] = { { "green", "red", "orange" },
{ "orange", "yellow", "green" } },
{ "orange", "yellow", "green" } },
[7] = { { "blue", "dark_green", "dark_green" },
{ "green", "grey", "green" } },
{ "green", "grey", "green" } },
[8] = { { "blue", "blue", "blue" },
{ "green", "green", "green" } },
{ "green", "green", "green" } },
[9] = { { "blue", "blue", "dark_green" },
{ "green", "grey", "dark_green" } },
{ "green", "grey", "dark_green" } },
[10] = { { "green", "white", "green" },
{ "dark_green", "white", "dark_green" } },
{ "dark_green", "white", "dark_green" } },
[11] = { { "blue", "white", "blue" },
{ "blue", "grey", "dark_green" } },
{ "blue", "grey", "dark_green" } },
[12] = { { "green", "green", "green" },
{ "grey", "grey", "green" } },
{ "grey", "grey", "green" } },
[13] = { { "blue", "blue", "grey" },
{ "dark_green", "white", "white" } },
{ "dark_green", "white", "white" } },
[14] = { { "red", "yellow", "blue" },
{ "blue", "green", "violet" } },
{ "blue", "green", "violet" } },
[15] = { { "blue", "yellow", "blue" },
{ "black", "black", "black" } },
{ "black", "black", "black" } },
[16] = { { "red", "orange", "blue" },
{ "black", "dark_grey", "grey" } },
{ "black", "dark_grey", "grey" } },
[17] = { { "orange", "yellow", "orange" },
{ "black", "black", "black" } },
{ "black", "black", "black" } },
[18] = { { "grey", "dark_green", "grey" },
{ "white", "white", "white" } },
{ "white", "white", "white" } },
[19] = { { "white", "brown", "green" },
{ "green", "brown", "brown" } },
{ "green", "brown", "brown" } },
[20] = { { "blue", "blue", "blue" },
{ "red", "brown", "grey" } }
{ "red", "brown", "grey" } }
}
for i,recipe in pairs(painting_patterns) do
@ -3414,4 +3414,3 @@ end
if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then
technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} })
end

View File

@ -137,7 +137,7 @@ local door_model_list = {
tiles = {
"homedecor_door_exterior_fancy.png",
"homedecor_door_exterior_fancy_insert.png"
},
},
usealpha = true
},
@ -303,13 +303,13 @@ local gate_models_closed = {
{{ -0.5, -0.5, 0.498, 0.5, 0.5, 0.498 }},
{{ -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece
{ -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece
{ -6/16, -8/16, 7/16, 6/16, 8/16, 7/16 }}, -- the wire
{{ -8/16, -8/16, 6/16, -7/16, 8/16, 8/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece
{ -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece
{ -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }, -- the chainlink itself
@ -322,13 +322,13 @@ local gate_models_open = {
{{ 0.498, -0.5, -0.5, 0.498, 0.5, 0.5 }},
{{ 6/16, -8/16, -8/16, 8/16, 8/16, -6/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 13/32, 7/16, -8/16, 15/32, 8/16, 8/16 }, -- top piece
{ 13/32, -8/16, -8/16, 15/32, -7/16, 8/16 }, -- bottom piece
{ 7/16, -8/16, -6/16, 7/16, 8/16, 6/16 }}, -- the wire
{{ 6/16, -8/16, -8/16, 8/16, 8/16, -7/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 13/32, 7/16, -8/16, 15/32, 8/16, 8/16 }, -- top piece
{ 13/32, -8/16, -8/16, 15/32, -7/16, 8/16 }, -- bottom piece
{ 7/16, -8/16, -8/16, 7/16, 8/16, 8/16 }, -- the chainlink itself

View File

@ -301,4 +301,3 @@ if signs_modpath then
signs_lib.register_fence_with_sign("homedecor:fence_brass", "homedecor:fence_brass_with_sign")
signs_lib.register_fence_with_sign("homedecor:fence_wrought_iron", "homedecor:fence_wrought_iron_with_sign")
end

View File

@ -52,7 +52,7 @@ local kc_cbox = {
local ac_cbox = {
type = "fixed",
fixed = {
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 0.5 },
{-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 }
}

View File

@ -93,7 +93,7 @@ local wl_cbox = {
homedecor.register("wall_lamp", {
description = S("Wall Lamp"),
mesh = "homedecor_wall_lamp.obj",
tiles = {"homedecor_generic_metal_black.png^[brighten", "homedecor_generic_wood_luxury.png^[colorize:#000000:30",
tiles = {"homedecor_generic_metal_black.png^[brighten", "homedecor_generic_wood_luxury.png^[colorize:#000000:30",
"homedecor_light.png", "homedecor_generic_metal_wrought_iron.png"},
use_texture_alpha = true,
inventory_image = "homedecor_wall_lamp_inv.png",

View File

@ -170,7 +170,7 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color)
return true
end
if minetest.is_protected(forwardpos, placer_name) then
if minetest.is_protected(forwardpos, placer_name) then
minetest.chat_send_player( placer:get_player_name(), "Someone already owns the spot where the headboard goes." )
return true
end
@ -196,7 +196,7 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color)
minetest.set_node(rightpos, {name = "air"})
minetest.set_node(pos, { name = newname, param2 = fdir})
end
local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z})
local bottomnode = minetest.get_node({x=pos.x, y=pos.y-1.0, z=pos.z})
@ -244,7 +244,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
return itemstack
end
if minetest.is_protected(abovepos, placer_name) then
if minetest.is_protected(abovepos, placer_name) then
minetest.chat_send_player(placer_name, "Someone already owns that spot." )
return itemstack
end
@ -269,7 +269,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
local right_fwd_below_pos = { x=pos.x+rxd+fxd, y=pos.y-1, z=pos.z+rzd+fzd }
local left_fwd_below_pos = { x=pos.x+lxd+fxd, y=pos.y-1, z=pos.z+lzd+fzd }
local below_node = minetest.get_node(below_pos)
local below_node = minetest.get_node(below_pos)
local fwd_node = minetest.get_node(fwd_pos)
local left_node = minetest.get_node(left_pos)
local right_node = minetest.get_node(right_pos)
@ -326,7 +326,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
new_place_name = string.gsub(right_node.name, "_diagonal_.-$", "_horizontal")
-- try to place a horizontal in-line with the nearest diagonal, at the bottom
elseif left_fwd_node and string.find(left_fwd_node.name, "homedecor:banister_.*_diagonal")
elseif left_fwd_node and string.find(left_fwd_node.name, "homedecor:banister_.*_diagonal")
and is_buildable_to(placer_name, fwd_pos, fwd_pos) then
fdir = left_fwd_node.param2
pos = fwd_pos
@ -359,4 +359,3 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
itemstack:take_item()
return itemstack
end

View File

@ -57,6 +57,3 @@ mt.__index = function(table, key)
error("unexpected datatype " .. tostring(type(ref)) .. " while looking for " .. key)
end
setmetatable(homedecor.nodebox, mt)

View File

@ -112,4 +112,3 @@ function homedecor.stop_particle_spawner(pos)
this_spawner_meta:set_int("active", nil)
this_spawner_meta:set_int("sound", nil)
end

View File

@ -158,7 +158,7 @@ homedecor.register("plasma_ball", {
"homedecor_plasma_ball_glass.png"
},
inventory_image = "homedecor_plasma_ball_inv.png",
selection_box = {
selection_box = {
type = "fixed",
fixed = { -0.1875, -0.5, -0.1875, 0.1875, 0, 0.1875 }
},
@ -357,7 +357,7 @@ homedecor.register("ceiling_lantern", {
use_texture_alpha = true,
inventory_image = "homedecor_ceiling_lantern_inv.png",
description = "Ceiling Lantern",
groups = {snappy=3},
groups = {snappy=3},
light_source = 11,
selection_box = cl_cbox,
walkable = false
@ -504,7 +504,7 @@ local dlamp_cbox = {
local dlamp_colors = { "red","blue","green","violet" }
for _, color in ipairs(dlamp_colors) do
for _, color in ipairs(dlamp_colors) do
homedecor.register("desk_lamp_"..color, {
description = S("Desk Lamp ("..color..")"),
mesh = "homedecor_desk_lamp.obj",

View File

@ -41,7 +41,7 @@ for i in ipairs(rug_types) do
if type(m) == "table" then
mesh = nil
nodebox = {
type = "fixed",
type = "fixed",
fixed = m
}
tiles = {
@ -80,8 +80,8 @@ homedecor.register("flower_pot_"..p, {
end
local flowers_list = {
{ "Rose", "rose", "flowers:rose" },
{ "Tulip", "tulip", "flowers:tulip" },
{ "Rose", "rose", "flowers:rose" },
{ "Tulip", "tulip", "flowers:tulip" },
{ "Yellow Dandelion", "dandelion_yellow", "flowers:dandelion_yellow" },
{ "White Dandelion", "dandelion_white", "flowers:dandelion_white" },
{ "Blue Geranium", "geranium", "flowers:geranium" },
@ -94,7 +94,7 @@ for i in ipairs(flowers_list) do
local flowerdesc = flowers_list[i][1]
local flower = flowers_list[i][2]
local craftwith = flowers_list[i][3]
homedecor.register("potted_"..flower, {
description = S("Potted flower ("..flowerdesc..")"),
mesh = "homedecor_potted_plant.obj",

View File

@ -49,4 +49,3 @@ for i in ipairs(shutters) do
end
minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")

View File

@ -11,7 +11,7 @@ homedecor.register("trash_can_green", {
tiles = { "homedecor_pool_table_baize.png" },
inventory_image = "homedecor_trash_can_green_inv.png",
description = "Trash Can (green)",
groups = {snappy=3},
groups = {snappy=3},
selection_box = tg_cbox,
collision_box = tg_cbox,
on_punch = function(pos, node, puncher, pointed_thing)

View File

@ -27,7 +27,7 @@ if minetest.get_modpath("vessels")
paramtype2 = "facedir",
use_texture_alpha = true
})
local sbox = {
type = "fixed",
fixed = { -0.15, -0.5, -0.15, 0.15, -0.1, 0.15 }
@ -89,4 +89,3 @@ if minetest.get_modpath("moreblocks") then
}
})
end

View File

@ -1,6 +1,6 @@
local lavalamps_list = {
{ "Red Lava Lamp", "red"},
{ "Orange Lava Lamp", "orange"},
{ "Orange Lava Lamp", "orange"},
{ "Yellow Lava Lamp", "yellow"},
{ "Green Lava Lamp", "green"},
{ "Blue Lava Lamp", "blue"},
@ -53,7 +53,7 @@ for i in ipairs(lavalamps_list) do
tiles = {
"lavalamp_metal.png",
"lavalamp_lamp_off.png",
},
},
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
@ -80,5 +80,5 @@ for i in ipairs(lavalamps_list) do
{"", "wool:black", "", }
}
})
end

View File

@ -1,7 +1,7 @@
local armchair_cbox = {
type = "fixed",
fixed = {
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 0.5 },
{-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 }
}

View File

@ -68,7 +68,7 @@ minetest.register_node("lrfurn:coffeetable_back", {
if minetest.is_protected(pos, digger:get_player_name()) then return true end
if (minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).name == "lrfurn:coffeetable_front")
if (minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).name == "lrfurn:coffeetable_front")
and (minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).param2 == param2) then
minetest.remove_node(pos)
end

View File

@ -9,17 +9,17 @@ lrfurn.fdir_to_fwd = {
}
lrfurn.colors = { -- mod changed to use colorize feature of minetest engine (cg72)
{ "black", "#000000:230" },
{ "black", "#000000:230" },
{ "brown", "#251005:225" },
{ "blue", "#0000d0:225" },
{ "cyan", "#009fa7:250" },
{ "cyan", "#009fa7:250" },
{ "dark_grey", "#101010:175" },
{ "dark_green", "#007000:230" },
{ "green", "#00d000:250" },
{ "grey", "#101010:100" },
{ "magenta", "#e0048b:250" },
{ "orange", "#ee9000:240" },
{ "pink", "#ff90b0:250" },
{ "pink", "#ff90b0:250" },
{ "red", "#800000:240" },
{ "violet", "#9000d0:250" },
{ "white", "#000000:000" },

View File

@ -6,7 +6,7 @@ local longsofa_sbox = {
local longsofa_cbox = {
type = "fixed",
fixed = {
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 2.5 },
{-0.5, -0.5, 0.5, -0.4, 0.5, 2.5 }
}

View File

@ -7,7 +7,7 @@ local sofa_sbox = {
local sofa_cbox = {
type = "fixed",
fixed = {
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 1.5 },
{-0.5, -0.5, 0.5, -0.4, 0.5, 1.5 }
}

View File

@ -85,7 +85,7 @@ local function checkwall(pos)
end
local node5 = minetest.get_node({x=pos.x+dxr, y=pos.y+1, z=pos.z+dzr})
if not node5 or not minetest.registered_nodes[node5.name]
if not node5 or not minetest.registered_nodes[node5.name]
or not minetest.registered_nodes[node5.name].buildable_to then
return false
end