diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index 6ab9a5c..45594dd 100755 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -563,7 +563,7 @@ minetest.register_node("default:sapling", { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} }, - groups = {snappy = 3, flammable=2, + groups = {snappy = 3, flammable=2, attached_node = 1, sapling = 1}, sounds = default.node_sound_leaves_defaults(), }) diff --git a/mods/ambience/init.lua b/mods/ambience/init.lua index 617a012..b0e939b 100755 --- a/mods/ambience/init.lua +++ b/mods/ambience/init.lua @@ -177,7 +177,7 @@ local get_ambience = function(player) if num_desert > 150 then return {desert=desert} end - + if pos.y > 60 then return {high_up=high_up} end diff --git a/mods/irc_modpack b/mods/irc_modpack index 9fae29e..eca49ef 160000 --- a/mods/irc_modpack +++ b/mods/irc_modpack @@ -1 +1 @@ -Subproject commit 9fae29e3b91be9ce07f01a42761ab52788d0b500 +Subproject commit eca49efd4a337a42e6f9dd8c42ab901b7352bb4c diff --git a/mods/jukebox/init.lua b/mods/jukebox/init.lua index d9c6602..0f8a4bd 100755 --- a/mods/jukebox/init.lua +++ b/mods/jukebox/init.lua @@ -65,7 +65,7 @@ minetest.register_node("jukebox:box", { selection_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - + }, on_rightclick = function(pos, node, clicker, itemstack) local meta = minetest.get_meta(pos) @@ -108,7 +108,7 @@ minetest.register_node("jukebox:box", { local meta = minetest.get_meta(pos) local inv = meta:get_inventory() inv:set_size("main", 1) - end, + end, on_destruct = function(pos) local meta = minetest.env:get_meta(pos) local inv = meta:get_inventory() diff --git a/mods/liquid_security/init.lua b/mods/liquid_security/init.lua index 6762c36..101ed0b 100755 --- a/mods/liquid_security/init.lua +++ b/mods/liquid_security/init.lua @@ -67,5 +67,5 @@ local function save_liquid(loop) end save_liquid(true) - + minetest.register_on_shutdown(save_liquid) diff --git a/mods/mff_hud b/mods/mff_hud index ce77600..fec4bed 160000 --- a/mods/mff_hud +++ b/mods/mff_hud @@ -1 +1 @@ -Subproject commit ce776002d036cfcbba7639e91daf41a1b731bf8f +Subproject commit fec4bedfbe637144aea69965dea6c9e188f3d5fc diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index e26eb4f..7242b50 100755 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -388,7 +388,7 @@ function mobs:register_mob(name, def) self.jumptimer = 0 end end - + -- environmental damage timer (every 1 second) self.env_damage_timer = self.env_damage_timer + dtime if self.state == "attack" diff --git a/mods/mobs/bee.lua b/mods/mobs/bee.lua index 3709ab8..aa5a753 100755 --- a/mods/mobs/bee.lua +++ b/mods/mobs/bee.lua @@ -80,7 +80,7 @@ minetest.register_node("mobs:beehive", { minetest.add_entity(pos, "mobs:bee") end end, - + }) minetest.register_craft({ diff --git a/mods/mobs/mff_menu.lua b/mods/mobs/mff_menu.lua index 282f9a6..b775b21 100755 --- a/mods/mobs/mff_menu.lua +++ b/mods/mobs/mff_menu.lua @@ -20,14 +20,14 @@ end minetest.register_on_player_receive_fields(function(player, formname, fields) local player_name = player:get_player_name() if not player_name then return end - if formname == "mobs:spawner" then + if formname == "mobs:spawner" then for f in pairs(fields) do if string.find(f, "mobs:") then local pos = player:getpos() pos.y = pos.y+1 minetest.add_entity(pos, f) return - end + end end end end) @@ -55,5 +55,5 @@ else func = function(name, param) mobs.shown_spawner_menu(name) end, - }) + }) end diff --git a/mods/multitest/init.lua b/mods/multitest/init.lua index 525fbb4..f76dd74 100755 --- a/mods/multitest/init.lua +++ b/mods/multitest/init.lua @@ -1,7 +1,7 @@ multitest = {} -multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", -"dark_grey", "green", "grey", "magenta", "orange", +multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", +"dark_grey", "green", "grey", "magenta", "orange", "pink", "red", "violet", "white", "yellow"} multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green", diff --git a/mods/multitest/nodes.lua b/mods/multitest/nodes.lua index 98a8533..5e8a0e2 100755 --- a/mods/multitest/nodes.lua +++ b/mods/multitest/nodes.lua @@ -24,7 +24,7 @@ minetest.register_node("multitest:blackstone_paved", { description = "Paved Blackstone", tiles = {"multitest_blackstone_paved.png"}, groups = {cracky=2, stone=1}, - sounds = default.node_sound_stone_defaults(), + sounds = default.node_sound_stone_defaults(), }) minetest.register_node("multitest:blackstone_paved", { @@ -122,28 +122,28 @@ minetest.register_node("multitest:sandstone_carved", { }) -- stairs:stair_blackstone -stairs.register_stair_and_slab("blackstone", "multitest:blackstone", - {cracky=3, stone=1}, - {"multitest_blackstone.png"}, - "Blackstone Stairs", +stairs.register_stair_and_slab("blackstone", "multitest:blackstone", + {cracky=3, stone=1}, + {"multitest_blackstone.png"}, + "Blackstone Stairs", "Blackstone Slab", nil) -stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", - {cracky=3, stone=1}, - {"multitest_blackcobble.png"}, - "Black Cobble Stairs", +stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", + {cracky=3, stone=1}, + {"multitest_blackcobble.png"}, + "Black Cobble Stairs", "Black Cobble Slab", nil) -stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", - {cracky=3, stone=1}, - {"multitest_blackstone_brick.png"}, - "Blackstonestone brick Stairs", +stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", + {cracky=3, stone=1}, + {"multitest_blackstone_brick.png"}, + "Blackstonestone brick Stairs", "Blackstone Brick Slab", nil) -stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", - {cracky=3, stone=1}, - {"multitest_blackstone_paved.png"}, - "Paved Blackstone Stairs", +stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", + {cracky=3, stone=1}, + {"multitest_blackstone_paved.png"}, + "Paved Blackstone Stairs", "Paved Blackstone Slab", nil) -- others diff --git a/mods/nether/nether/furnace.lua b/mods/nether/nether/furnace.lua index 31e3d66..c306396 100755 --- a/mods/nether/nether/furnace.lua +++ b/mods/nether/nether/furnace.lua @@ -250,7 +250,7 @@ minetest.register_abm({ if last_time == current_time then return end - + local timediff = get_timediff(last_time, current_time)+meta:get_string("timedif") local times = math.floor(timediff) meta:set_string("last_active", current_time) @@ -272,13 +272,13 @@ minetest.register_abm({ local srclist = inv:get_list("src") local cooked = nil local aftercooked - + if srclist then cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) end - + local was_active = false - + if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then was_active = true meta:set_float("fuel_time", meta:get_float("fuel_time") + 1) @@ -298,7 +298,7 @@ minetest.register_abm({ meta:set_string("src_time", 0) end end - + if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then local percent = math.floor(meta:get_float("fuel_time") / meta:get_float("fuel_totaltime") * 100) @@ -313,7 +313,7 @@ minetest.register_abm({ local cooked = nil local fuellist = inv:get_list("fuel") local srclist = inv:get_list("src") - + if srclist then cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) end @@ -339,7 +339,7 @@ minetest.register_abm({ meta:set_string("fuel_totaltime", fuel.time) meta:set_string("fuel_time", 0) - + inv:set_stack("fuel", 1, afterfuel.items[1]) end end, diff --git a/mods/plantlife_modpack/dryplants/crafting.lua b/mods/plantlife_modpack/dryplants/crafting.lua index ae36a3c..356b8d0 100755 --- a/mods/plantlife_modpack/dryplants/crafting.lua +++ b/mods/plantlife_modpack/dryplants/crafting.lua @@ -2,10 +2,10 @@ -- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt ----------------------------------------------------------------------------------------------- -- by Mossmanikin --- License (everything): WTFPL +-- License (everything): WTFPL -- Looked at code from: darkage, default, farming, sickle, stairs -- Dependencies: default, farming --- Supports: flint, stoneage, sumpf +-- Supports: flint, stoneage, sumpf ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- @@ -220,7 +220,7 @@ for i in pairs(ReeD) do recipe = { {slab}, } - }) + }) ----------------------------------------------------------------------------------------------- -- Roof Corner ----------------------------------------------------------------------------------------------- @@ -343,7 +343,7 @@ minetest.register_craft({ burntime = 2, }) ----------------------------------------------------------------------------------------------- --- Dandelion Leave +-- Dandelion Leave ----------------------------------------------------------------------------------------------- --[[minetest.register_craftitem("dryplants:dandelion_leave", { description = "Dandelion Leave", diff --git a/mods/plantlife_modpack/dryplants/init.lua b/mods/plantlife_modpack/dryplants/init.lua index 0a2be68..4dbb67d 100755 --- a/mods/plantlife_modpack/dryplants/init.lua +++ b/mods/plantlife_modpack/dryplants/init.lua @@ -7,10 +7,10 @@ local mname = "dryplants" -- textures & ideas partly by Neuromancer -- License (everything): WTFPL --- Contains code from: default, farming +-- Contains code from: default, farming -- Looked at code from: darkage, sickle, stairs -- Dependencies: default, farming, biome_lib --- Supports: +-- Supports: ----------------------------------------------------------------------------------------------- abstract_dryplants = {} diff --git a/mods/plantlife_modpack/dryplants/moregrass.lua b/mods/plantlife_modpack/dryplants/moregrass.lua index 52e0091..e1a7149 100755 --- a/mods/plantlife_modpack/dryplants/moregrass.lua +++ b/mods/plantlife_modpack/dryplants/moregrass.lua @@ -5,7 +5,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default +-- Looked at code from: default ----------------------------------------------------------------------------------------------- abstract_dryplants.grow_grass = function(pos) diff --git a/mods/plantlife_modpack/dryplants/reed.lua b/mods/plantlife_modpack/dryplants/reed.lua index 51dc8dd..f8d0a2d 100755 --- a/mods/plantlife_modpack/dryplants/reed.lua +++ b/mods/plantlife_modpack/dryplants/reed.lua @@ -4,7 +4,7 @@ -- by Mossmanikin -- License (everything): WTFPL -- Looked at code from: darkage, default, stairs --- Dependencies: default +-- Dependencies: default ----------------------------------------------------------------------------------------------- minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof") minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab") @@ -93,7 +93,7 @@ if AUTO_ROOF_CORNER == true then interval = 1, chance = 1, action = function(pos) - + local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) @@ -106,7 +106,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 1) or (node_north.name == corner and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 0) @@ -114,7 +114,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 2) or (node_east.name == corner and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 1) @@ -122,7 +122,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 3) or (node_south.name == corner and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 2) @@ -138,7 +138,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 3) or (node_north.name == corner_2 and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 2) @@ -146,7 +146,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 0) or (node_east.name == corner_2 and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 3) @@ -154,7 +154,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 1) or (node_south.name == corner_2 and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 0) @@ -227,7 +227,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", { groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) - + ----------------------------------------------------------------------------------------------- -- Wet Reed becomes (dry) Reed over time ----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/ferns/crafting.lua b/mods/plantlife_modpack/ferns/crafting.lua index 656a763..c37100f 100755 --- a/mods/plantlife_modpack/ferns/crafting.lua +++ b/mods/plantlife_modpack/ferns/crafting.lua @@ -2,7 +2,7 @@ -- Ferns - Crafting 0.0.5 ----------------------------------------------------------------------------------------------- -- (by Mossmanikin) --- License (everything): WTFPL +-- License (everything): WTFPL ----------------------------------------------------------------------------------------------- minetest.register_craft({ type = "shapeless", diff --git a/mods/plantlife_modpack/ferns/fern.lua b/mods/plantlife_modpack/ferns/fern.lua index fe391bd..370863a 100755 --- a/mods/plantlife_modpack/ferns/fern.lua +++ b/mods/plantlife_modpack/ferns/fern.lua @@ -6,7 +6,7 @@ -- Contains code from: biome_lib -- Looked at code from: default, flowers, painting, trees -- Dependencies: biome_lib --- Supports: dryplants, stoneage, sumpf +-- Supports: dryplants, stoneage, sumpf ----------------------------------------------------------------------------------------------- -- some inspiration from here -- https://en.wikipedia.org/wiki/Athyrium_yokoscense diff --git a/mods/spawn/init.lua b/mods/spawn/init.lua index f679abb..0028a3a 100755 --- a/mods/spawn/init.lua +++ b/mods/spawn/init.lua @@ -15,5 +15,5 @@ minetest.register_chatcommand("spawn", { minetest.chat_send_player(player:get_player_name(), "ERROR: No spawn point is set on this server!") return false end - end + end }) diff --git a/mods/xdecor/crafts.lua b/mods/xdecor/crafts.lua index b330242..b999e92 100755 --- a/mods/xdecor/crafts.lua +++ b/mods/xdecor/crafts.lua @@ -1,10 +1,10 @@ -minetest.register_craft({ +minetest.register_craft({ output = "xdecor:baricade", recipe = { {"group:stick", "", "group:stick"}, {"", "default:steel_ingot", ""}, {"group:stick", "", "group:stick"} - } + } }) minetest.register_craft({ @@ -16,11 +16,11 @@ minetest.register_craft({ } }) -minetest.register_craft({ +minetest.register_craft({ output = "xdecor:candle", recipe = { {"default:torch"} - } + } }) minetest.register_craft({ @@ -71,7 +71,7 @@ minetest.register_craft({ {"group:stick", "", "group:stick"} } }) - + minetest.register_craft({ output = "xdecor:chandelier", recipe = { @@ -120,7 +120,7 @@ minetest.register_craft({ {"default:desert_cobble", "default:desert_cobble"} } }) - + minetest.register_craft({ output = "xdecor:empty_shelf", recipe = { @@ -163,7 +163,7 @@ minetest.register_craft({ {"group:stick", "group:stick", "group:stick"} } }) - + minetest.register_craft({ output = "xdecor:hammer", recipe = { @@ -212,7 +212,7 @@ minetest.register_craft({ {"group:wood", "default:paper"} } }) - + minetest.register_craft({ output = "xdecor:lantern", recipe = { @@ -324,7 +324,7 @@ minetest.register_craft({ {"group:wood", "group:wood"} } }) - + minetest.register_craft({ output = "xdecor:stereo", recipe = { @@ -333,7 +333,7 @@ minetest.register_craft({ {"default:steel_ingot", "default:copper_ingot", "default:steel_ingot"} } }) - + minetest.register_craft({ output = "xdecor:stone_tile 2", recipe = { @@ -341,7 +341,7 @@ minetest.register_craft({ {"default:cobble", "default:cobble"} } }) - + minetest.register_craft({ output = "xdecor:stone_rune 4", recipe = { @@ -369,11 +369,11 @@ minetest.register_craft({ } }) -minetest.register_craft({ +minetest.register_craft({ output = "xdecor:tatami", recipe = { {"farming:wheat", "farming:wheat", "farming:wheat"} - } + } }) minetest.register_craft({ @@ -393,7 +393,7 @@ minetest.register_craft({ {"group:wood", "group:wood", "group:wood"} } }) - + minetest.register_craft({ output = "xdecor:woodframed_glass", recipe = { diff --git a/mods/xdecor/handlers/registration.lua b/mods/xdecor/handlers/registration.lua index 94f708b..5b28dd4 100755 --- a/mods/xdecor/handlers/registration.lua +++ b/mods/xdecor/handlers/registration.lua @@ -37,7 +37,7 @@ function xdecor.register(name, def) def.drawtype = def.drawtype or (def.node_box and "nodebox") def.paramtype = def.paramtype or "light" def.sounds = def.sounds or default.node_sound_defaults() - + if not (def.drawtype == "glasslike_framed" or def.drawtype == "glasslike_framed_optional" or def.drawtype == "plantlike" or def.drawtype == "signlike" or def.drawtype == "normal") then diff --git a/mods/xdecor/itemframe.lua b/mods/xdecor/itemframe.lua index bb3b4b9..1010afc 100755 --- a/mods/xdecor/itemframe.lua +++ b/mods/xdecor/itemframe.lua @@ -57,7 +57,7 @@ local update_item = function(pos, node) local meta = minetest.get_meta(pos) local str_item = meta:get_string("item") if str_item == "" then return end - + local posad = facedir[node.param2] if not posad then return end pos.x = pos.x + posad.x * 6.5/16 @@ -91,7 +91,7 @@ xdecor.register("frame", { tiles = { "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_frame.png" - }, + }, inventory_image = "xdecor_frame.png", after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) diff --git a/mods/xdecor/nodes.lua b/mods/xdecor/nodes.lua index 7d2ece5..7ad8983 100755 --- a/mods/xdecor/nodes.lua +++ b/mods/xdecor/nodes.lua @@ -89,7 +89,7 @@ xdecor.register("cardboard_box", { inventory = {size=8}, infotext = "Cardboard Box", groups = {snappy=3, flammable=3}, - tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png", + tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png", "xdecor_cardbox_sides.png"}, node_box = { type = "fixed", fixed = {{-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}} @@ -359,7 +359,7 @@ xdecor.register("lantern", { light_source = 12, drawtype = "torchlike", inventory_image = "xdecor_lantern_floor.png", - wield_image = "xdecor_lantern_floor.png", + wield_image = "xdecor_lantern_floor.png", paramtype2 = "wallmounted", legacy_wallmounted = true, walkable = false, diff --git a/mods/xdecor/worktable.lua b/mods/xdecor/worktable.lua index 2a105fa..f033c46 100755 --- a/mods/xdecor/worktable.lua +++ b/mods/xdecor/worktable.lua @@ -7,7 +7,7 @@ local material = { "cobble", "mossycobble", "desert_cobble", "stone", "sandstone", "desert_stone", "obsidian", "stonebrick", "sandstonebrick", "desert_stonebrick", "obsidianbrick", - "coalblock", "copperblock", "steelblock", "goldblock", + "coalblock", "copperblock", "steelblock", "goldblock", "bronzeblock", "mese", "diamondblock", "brick", "cactus", "ice", "meselamp", "glass", "obsidian_glass" diff --git a/mods/xdecor/xwall.lua b/mods/xdecor/xwall.lua index 3cc5932..4d78778 100755 --- a/mods/xdecor/xwall.lua +++ b/mods/xdecor/xwall.lua @@ -131,7 +131,7 @@ function xwall.construct_node_box_data(node_box_list, center_node_box_list, node res.c2[#res.c2+1] = v res.c3[#res.c3+1] = v res.c4[#res.c4+1] = v - end + end if #res.c0 < 1 then res.c0 = nil end @@ -146,7 +146,7 @@ function xwall.register_wall(name, tiles, def) ) if def then return end - def = { + def = { description = string.sub(name:gsub("%l", string.upper, 7), 8, -6).." Wall", textures = {tiles, tiles, tiles, tiles}, sounds = default.node_sound_stone_defaults(),