diff options
Diffstat (limited to 'moreblocks')
61 files changed, 226 insertions, 157 deletions
diff --git a/moreblocks/.editorconfig b/moreblocks/.editorconfig new file mode 100644 index 0000000..a41c697 --- /dev/null +++ b/moreblocks/.editorconfig @@ -0,0 +1,13 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{lua,luacheckrc}] +indent_style = tab +indent_size = 4 diff --git a/moreblocks/.luacheckrc b/moreblocks/.luacheckrc index fbf3483..7089a5d 100644 --- a/moreblocks/.luacheckrc +++ b/moreblocks/.luacheckrc @@ -1,14 +1,35 @@ +std = "lua51+minetest" unused_args = false allow_defined_top = true +max_line_length = 999 + +stds.minetest = { + read_globals = { + "DIR_DELIM", + "minetest", + "core", + "dump", + "vector", + "nodeupdate", + "VoxelManip", + "VoxelArea", + "PseudoRandom", + "ItemStack", + "default", + table = { + fields = { + "copy", + }, + }, + } +} read_globals = { - "DIR_DELIM", - "minetest", "core", - "dump", - "vector", "nodeupdate", - "VoxelManip", "VoxelArea", - "PseudoRandom", "ItemStack", "intllib", - "default", + "protector", + "isprotect", + "IsPlayerNodeOwner", + "HasOwner", + "getLastOwner", + "GetNodeOwnerName", } - diff --git a/moreblocks/.pre-commit-config.yaml b/moreblocks/.pre-commit-config.yaml new file mode 100644 index 0000000..9c72498 --- /dev/null +++ b/moreblocks/.pre-commit-config.yaml @@ -0,0 +1,9 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.1.0 + hooks: + - id: end-of-file-fixer + - id: trailing-whitespace + + - id: mixed-line-ending + args: [--fix=lf] diff --git a/moreblocks/CHANGELOG.md b/moreblocks/CHANGELOG.md index 53c4458..0d949aa 100644 --- a/moreblocks/CHANGELOG.md +++ b/moreblocks/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Fixed + +- Node rotation now works correctly when placing Stairs+ nodes. +- Stairs+ glasslike nodes' textures are now easier to see. + ## [1.2.0] - 2018-11-24 ### Added diff --git a/moreblocks/LICENSE.md b/moreblocks/LICENSE.md index f68debf..d7470b4 100644 --- a/moreblocks/LICENSE.md +++ b/moreblocks/LICENSE.md @@ -1,6 +1,6 @@ # zlib license -Copyright (c) 2011-2018 Hugo Locurcio and contributors +Copyright © 2011-2019 Hugo Locurcio and contributors **This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.** diff --git a/moreblocks/README.md b/moreblocks/README.md index 33b9d6b..739164b 100644 --- a/moreblocks/README.md +++ b/moreblocks/README.md @@ -65,7 +65,7 @@ versions than 0.4.16 will generally not be fixed. ## License -Copyright © 2011-2018 Hugo Locurcio and contributors +Copyright © 2011-2019 Hugo Locurcio and contributors - More Blocks code is licensed under the zlib license, see [`LICENSE.md`](LICENSE.md) for details. diff --git a/moreblocks/aliases.lua b/moreblocks/aliases.lua index 59f5d5c..524876c 100644 --- a/moreblocks/aliases.lua +++ b/moreblocks/aliases.lua @@ -1,7 +1,7 @@ --[[ More Blocks: alias definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/circular_saw.lua b/moreblocks/circular_saw.lua index 94e680e..4d1a3d9 100644 --- a/moreblocks/circular_saw.lua +++ b/moreblocks/circular_saw.lua @@ -1,7 +1,7 @@ --[[ More Blocks: circular saw -Copyright (c) 2011-2018 Hugo Locurcio, Sokomine and contributors. +Copyright © 2011-2019 Hugo Locurcio, Sokomine and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/config.lua b/moreblocks/config.lua index 84dcaf2..a855d5c 100644 --- a/moreblocks/config.lua +++ b/moreblocks/config.lua @@ -1,7 +1,7 @@ --[[ More Blocks: configuration handling -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/crafting.lua b/moreblocks/crafting.lua index 5fdd82f..468667d 100644 --- a/moreblocks/crafting.lua +++ b/moreblocks/crafting.lua @@ -1,7 +1,7 @@ --[[ More Blocks: crafting recipes -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/init.lua b/moreblocks/init.lua index 168768a..ad5ad25 100644 --- a/moreblocks/init.lua +++ b/moreblocks/init.lua @@ -3,7 +3,7 @@ ** More Blocks ** By Calinou, with the help of ShadowNinja and VanessaE. -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. ===================================================================== --]] diff --git a/moreblocks/locale/de.txt b/moreblocks/locale/de.txt index 542f977..03b71f6 100644 --- a/moreblocks/locale/de.txt +++ b/moreblocks/locale/de.txt @@ -15,15 +15,15 @@ Up Wooden Tile = Holzfliese oben Down Wooden Tile = Holzfliese unten Left Wooden Tile = Holzfliese links Right Wooden Tile = Holzfliese rechts -Circle Stone Bricks = Kreissteinziegel +Circle Stone Bricks = Kreissteinziegel Stone Tile = Steinfliese Split Stone Tile = Geteilte Steinfliese Glow Glass = Leuchtglas Super Glow Glass = Superleuchtglas Coal Glass = Kohleglas Iron Glass = Eisenglas -Coal Checker = Karierte Kohle -Iron Checker = Kariertes Eisen +Coal Checker = Karierte Kohle +Iron Checker = Kariertes Eisen Trap Stone = Steinfalle Trap Glass = Glasfalle Trap Glow Glass = Leuchtglasfalle @@ -64,4 +64,3 @@ Recycle\noutput = Wiederver-\nwerten ###ownership.lua### someone = jemand Sorry, %s owns that spot. = Tut mir leid, %s gehoert diese Stelle. - diff --git a/moreblocks/locale/es.txt b/moreblocks/locale/es.txt index d11ba49..e3b1eab 100644 --- a/moreblocks/locale/es.txt +++ b/moreblocks/locale/es.txt @@ -1,52 +1,65 @@ -# Translation by kaeza - +###init.lua### [moreblocks] loaded. = [moreblocks] cargado. -Jungle Wooden Planks = Tablones de madera de jungla -Empty Bookshelf = Estante para libros vacío -Clean Glass = Cristal Limpio -Plankstone = Tablones de piedra -Wooden Tile = Parquet -Full Wooden Tile = Parquet Completo -Centered Wooden Tile = Parquet Centrado -Up Wooden Tile = Parquet Superior -Down Wooden Tile = Parquet Inferior -Left Wooden Tile = Parquet Izquierdo -Right Wooden Tile = Parquet Derecho -Circle Stone Bricks = Bloques de Piedra Circulares -Stone Tile = Baldosa de Piedra -Split Stone Tile = Baldosas de Piedra Partida -Glow Glass = Cristal Brillante -Super Glow Glass = Cristal Súper Brillante -Coal Glass = Cristal con Carbón -Iron Glass = Cristal con Hierro -Coal Checker = Cuadros de Carbón -Iron Checker = Cuadros de Hierro -Trap Stone = Piedra Trampa -Trap Glass = Cristal Trampa -Coal Stone = Carbón y Piedra -Iron Stone = Hierro y Piedra -Cactus Checker = Cuadros de Cactus -Cactus Brick = Ladrillos de Cactus +###nodes.lua### +Jungle Wood Fence = Valla de madera tropical +Empty Bookshelf = Librería vacía +Clean Glass = Cristal límpido +Plankstone = Piedra en planchas +Wooden Tile = Caldosa de madera +Full Wooden Tile = Parquet completo +Centered Wooden Tile = Parquet centrado +Up Wooden Tile = Parquet superior +Down Wooden Tile = Parquet inferior +Left Wooden Tile = Parquet izquierdo +Right Wooden Tile = Parquet derecho +Circle Stone Bricks = Ladrillo de piedra circulares +Stone Tile = Baldosa de piedra +Split Stone Tile = Baldosa de piedra partida +Glow Glass = Cristal brillante +Super Glow Glass = Cristal súper brillante +Coal Glass = Cristal armado de carbón +Iron Glass = Cristal armado de hierro +Coal Checker = Mosaico de carbón +Iron Checker = Mosaico de hierro +Trap Stone = Trampa de piedra +Trap Glass = Trampa de cristal +Trap Glow Glass = Trampa de cristal brillante +Trap Super Glow Glass = Trampa de cristal súper brillante +Coal Stone = Piedra con carbón +Iron Stone = Piedra con hierro +Coal Stone Bricks = Ladrillos de piedra con carbón +Iron Stone Bricks = Ladrillos de piedra con hierro +Cactus Checker = Mosaico de cactus +Cactus Brick = Ladrillo de cactus Sweeper = Limpiador -Jungle Stick = Varita de Madera de Jungla -Horizontal Tree = Tronco de árbol horizontal -Horizontal Jungle Tree = Tronco de árbol de la jungla horizontal -Rope = Soga -All-faces Tree = Tronco de Árbol +Jungle Stick = Palo de madera tropical +Rope = Cuerda +All-faces Tree = madera + +###circular_saw.lua### +Circular Saw = Sierra circular +Circular saw, empty (owned by %s) = Sierra circular, vacía (propiedad de %s) +Circular saw, working with %s (owned by %s) = Sierra circular, trabajando con %s (propiedad de %s) +Circular saw, empty = Sierra circular, vacía +Circular saw is empty (owned by %s) = La sierra circular está vacía (propiedad de %s) + +Input\nmaterial = Entrada de\nmaterial: +Left-over = Remanente: +Max = Máx. +Set = Guardar +Recycle\noutput = Salida de\nreciclaje: -%s Stairs = Escalera de %s +###ownership.lua### +someone = alguien +Sorry, %s owns that spot. = Lo siento, esto pertenece a %s. + +###./stairsplus/*### +%s Stairs = Escaleras de %s %s Slab = Losa de %s %s Panel = Panel de %s %s Microblock = Microbloque de %s - -Wooden = Madera -Papyrus = Papiro -Dry Shrub = Arbusto Desértico -Sapling = Brote de Árbol -Wooden Planks = Tablones de Madera -Ladder = Escalera de Mano -Glass = Cristal +%s Slope = Biselado de %s %s Pane = Panel de %s %s Fence = Valla de %s diff --git a/moreblocks/locale/fr.txt b/moreblocks/locale/fr.txt index 6bd7f98..72c09f5 100644 --- a/moreblocks/locale/fr.txt +++ b/moreblocks/locale/fr.txt @@ -56,7 +56,7 @@ Circular saw, working with %s (owned by %s) = Scie circulaire, manipule %s (prop Circular saw, empty = Scie circulaire, vide Circular saw is empty (owned by %s) = Scie circulaire est vide (proprit de %s) -Input material = Entre du matriel +Input material = Entre du matriel Rest/microblocks = Reste/microbloc Max: = Max: Set = Fixer @@ -69,4 +69,4 @@ Recycle output = Recyclage %s Microblock = Microbloc en %s %s Pane = Panneau en %s -%s Fence = Barrire en %s
\ No newline at end of file +%s Fence = Barrire en %s diff --git a/moreblocks/locale/it.txt b/moreblocks/locale/it.txt index 589e104..821ff36 100644 --- a/moreblocks/locale/it.txt +++ b/moreblocks/locale/it.txt @@ -33,7 +33,7 @@ Trap Glass = Vetro trappola Trap Glow Glass = Vetro luminoso trappola Trap Super Glow Glass = Super vetro luminoso trappola Coal Stone = Pietra in carbone -Iron Stone = Pietra in ferro +Iron Stone = Pietra in ferro Coal Stone Bricks = Mattoni di pietra in carbone Iron Stone Bricks = Mattoni di pietra in ferro Cactus Checker = Scacchiera in cactus diff --git a/moreblocks/locale/template.txt b/moreblocks/locale/template.txt index 2b88227..ea6f8ac 100644 --- a/moreblocks/locale/template.txt +++ b/moreblocks/locale/template.txt @@ -1,64 +1,64 @@ ###init.lua### -[moreblocks] loaded. = +[moreblocks] loaded. = ###nodes.lua### -Jungle Wood Fence = -Empty Bookshelf = -Clean Glass = -Plankstone = -Wooden Tile = -Full Wooden Tile = -Centered Wooden Tile = -Up Wooden Tile = -Down Wooden Tile = -Left Wooden Tile = -Right Wooden Tile = -Circle Stone Bricks = -Stone Tile = -Split Stone Tile = -Glow Glass = -Super Glow Glass = -Coal Glass = -Iron Glass = -Coal Checker = -Iron Checker = -Trap Stone = -Trap Glass = -Trap Glow Glass = -Trap Super Glow Glass = -Coal Stone = -Iron Stone = -Coal Stone Bricks = -Iron Stone Bricks = -Cactus Checker = -Cactus Brick = -Sweeper = -Jungle Stick = -Rope = -All-faces Tree = +Jungle Wood Fence = +Empty Bookshelf = +Clean Glass = +Plankstone = +Wooden Tile = +Full Wooden Tile = +Centered Wooden Tile = +Up Wooden Tile = +Down Wooden Tile = +Left Wooden Tile = +Right Wooden Tile = +Circle Stone Bricks = +Stone Tile = +Split Stone Tile = +Glow Glass = +Super Glow Glass = +Coal Glass = +Iron Glass = +Coal Checker = +Iron Checker = +Trap Stone = +Trap Glass = +Trap Glow Glass = +Trap Super Glow Glass = +Coal Stone = +Iron Stone = +Coal Stone Bricks = +Iron Stone Bricks = +Cactus Checker = +Cactus Brick = +Sweeper = +Jungle Stick = +Rope = +All-faces Tree = ###circular_saw.lua### -Circular Saw = -Circular saw, empty (owned by %s) = -Circular saw, working with %s (owned by %s) = -Circular saw, empty = -Circular saw is empty (owned by %s) = +Circular Saw = +Circular saw, empty (owned by %s) = +Circular saw, working with %s (owned by %s) = +Circular saw, empty = +Circular saw is empty (owned by %s) = -Input\nmaterial = -Left-over = -Max = -Set = -Recycle\noutput = +Input\nmaterial = +Left-over = +Max = +Set = +Recycle\noutput = ###ownership.lua### -someone = -Sorry, %s owns that spot. = +someone = +Sorry, %s owns that spot. = ###./stairsplus/*### -%s Stairs = -%s Slab = -%s Panel = -%s Microblock = +%s Stairs = +%s Slab = +%s Panel = +%s Microblock = -%s Pane = -%s Fence = +%s Pane = +%s Fence = diff --git a/moreblocks/nodes.lua b/moreblocks/nodes.lua index f898068..5bcab6c 100644 --- a/moreblocks/nodes.lua +++ b/moreblocks/nodes.lua @@ -1,7 +1,7 @@ --[[ More Blocks: node definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] @@ -459,6 +459,21 @@ for name, def in pairs(nodes) do def.tiles = def.tiles or {"moreblocks_" ..name.. ".png"} minetest.register_node("moreblocks:" ..name, def) minetest.register_alias(name, "moreblocks:" ..name) + + def_copy = table.copy(def) + + -- Use the primary tile for all sides of cut glasslike nodes. + -- This makes them easier to see + if + #def_copy.tiles > 1 and + def_copy.drawtype and + def_copy.drawtype == "glasslike_framed" or + def_copy.drawtype == "glasslike_framed_optional" + then + def.tiles = {def_copy.tiles[1]} + end + + if not def.no_stairs then local groups = {} for k, v in pairs(def.groups) do groups[k] = v end diff --git a/moreblocks/ownership.lua b/moreblocks/ownership.lua index eb1ae0e..34bcffa 100644 --- a/moreblocks/ownership.lua +++ b/moreblocks/ownership.lua @@ -1,7 +1,7 @@ --[[ More Blocks: ownership handling -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/redefinitions.lua b/moreblocks/redefinitions.lua index fd24c80..b05c2c0 100644 --- a/moreblocks/redefinitions.lua +++ b/moreblocks/redefinitions.lua @@ -1,7 +1,7 @@ --[[ More Blocks: redefinitions of default stuff -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/API.md b/moreblocks/stairsplus/API.md index cd8d1a7..b5cb0c1 100644 --- a/moreblocks/stairsplus/API.md +++ b/moreblocks/stairsplus/API.md @@ -79,4 +79,4 @@ The subset table should have the following format: { "stair", "_alt_4" }, } ``` -You can remove entries as needed.
\ No newline at end of file +You can remove entries as needed. diff --git a/moreblocks/stairsplus/aliases.lua b/moreblocks/stairsplus/aliases.lua index 224dce7..b005a06 100644 --- a/moreblocks/stairsplus/aliases.lua +++ b/moreblocks/stairsplus/aliases.lua @@ -1,7 +1,7 @@ --[[ More Blocks: alias definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/common.lua b/moreblocks/stairsplus/common.lua index a7134b2..6ec5101 100644 --- a/moreblocks/stairsplus/common.lua +++ b/moreblocks/stairsplus/common.lua @@ -1,7 +1,7 @@ --[[ More Blocks: registrations -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] @@ -10,11 +10,11 @@ local S = moreblocks.intllib stairsplus.register_single = function(category, alternate, info, modname, subname, recipeitem, fields) local descriptions = { - ["micro"] = "Microblock", - ["slab"] = "Slab", - ["slope"] = "Slope", - ["panel"] = "Panel", - ["stair"] = "Stairs", + ["micro"] = S("Microblock"), + ["slab"] = S("Slab"), + ["slope"] = S("Slope"), + ["panel"] = S("Panel"), + ["stair"] = S("Stairs"), } local def = {} if category ~= "slab" then @@ -30,6 +30,10 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam end def.paramtype = "light" def.paramtype2 = def.paramtype2 or "facedir" + + -- This makes node rotation work on placement + def.place_param2 = nil + def.on_place = minetest.rotate_node if category ~= "slab" then def.description = S("%s " .. descriptions[category]):format(fields.description) @@ -58,4 +62,4 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam end minetest.register_node(":" ..modname.. ":" .. category .. "_" .. subname .. alternate, def) stairsplus.register_recipes(category, alternate, modname, subname, recipeitem) -end
\ No newline at end of file +end diff --git a/moreblocks/stairsplus/conversion.lua b/moreblocks/stairsplus/conversion.lua index bc8e77e..e73dfb0 100644 --- a/moreblocks/stairsplus/conversion.lua +++ b/moreblocks/stairsplus/conversion.lua @@ -1,7 +1,7 @@ --[[ More Blocks: conversion -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/custom.lua b/moreblocks/stairsplus/custom.lua index e456f7c..ad67009 100644 --- a/moreblocks/stairsplus/custom.lua +++ b/moreblocks/stairsplus/custom.lua @@ -1,12 +1,10 @@ --[[ More Blocks: microblock definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - --[[ Subset table should have the following format: (You can remove entries as needed.) @@ -75,22 +73,22 @@ function register_custom_subset(subset, modname, subname, recipeitem, groups, im end function stairsplus:register_custom_subset_alias(subset, modname_old, subname_old, modname_new, subname_new) - local subset = table.copy(subset) - for k, v in pairs(subset) do + local subset_copy = table.copy(subset) + for k, v in pairs(subset_copy) do minetest.register_alias(modname_old .. ":" .. v[1] .. "_" .. subname_old .. v[2], modname_new .. ":" .. v[1] .. "_" .. subname_new .. v[2]) end end function stairsplus:register_custom_subset_alias_force(subset, modname_old, subname_old, modname_new, subname_new) - local subset = table.copy(subset) - for k, v in pairs(subset) do + local subset_copy = table.copy(subset) + for k, v in pairs(subset_copy) do minetest.register_alias_force(modname_old .. ":" .. v[1] .. "_" .. subname_old .. v[2], modname_new .. ":" .. v[1] .. "_" .. subname_new .. v[2]) end end function stairsplus:register_custom_subset(subset, modname, subname, recipeitem, fields) - local subset = table.copy(subset) - for k, v in pairs(subset) do + local subset_copy = table.copy(subset) + for k, v in pairs(subset_copy) do stairsplus.register_single(v[1], v[2], stairsplus.defs[v[1]][v[2]], modname, subname, recipeitem, fields) end diff --git a/moreblocks/stairsplus/defs.lua b/moreblocks/stairsplus/defs.lua index 560b1f2..a3d2cb1 100644 --- a/moreblocks/stairsplus/defs.lua +++ b/moreblocks/stairsplus/defs.lua @@ -1,7 +1,7 @@ --[[ More Blocks: registrations -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] @@ -406,4 +406,4 @@ for type,a in pairs(stairsplus.defs) do for name,b in pairs(stairsplus.defs[type]) do table.insert(stairsplus.shapes_list, { type .. "_", name }) end -end
\ No newline at end of file +end diff --git a/moreblocks/stairsplus/init.lua b/moreblocks/stairsplus/init.lua index 624b7c8..0d99a14 100644 --- a/moreblocks/stairsplus/init.lua +++ b/moreblocks/stairsplus/init.lua @@ -1,7 +1,7 @@ --[[ More Blocks: Stairs+ -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/microblocks.lua b/moreblocks/stairsplus/microblocks.lua index dc8ddfd..a08ec7c 100644 --- a/moreblocks/stairsplus/microblocks.lua +++ b/moreblocks/stairsplus/microblocks.lua @@ -1,12 +1,10 @@ --[[ More Blocks: microblock definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called <modname>:micro_<subname> function register_micro(modname, subname, recipeitem, groups, images, description, drop, light) diff --git a/moreblocks/stairsplus/panels.lua b/moreblocks/stairsplus/panels.lua index 5e2bf7b..c017af6 100644 --- a/moreblocks/stairsplus/panels.lua +++ b/moreblocks/stairsplus/panels.lua @@ -1,12 +1,10 @@ --[[ More Blocks: panel definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called <modname>:panel_<subname> function register_panel(modname, subname, recipeitem, groups, images, description, drop, light) diff --git a/moreblocks/stairsplus/recipes.lua b/moreblocks/stairsplus/recipes.lua index ec908bd..f4d259c 100644 --- a/moreblocks/stairsplus/recipes.lua +++ b/moreblocks/stairsplus/recipes.lua @@ -1,7 +1,7 @@ --[[ More Blocks: Stairs+ -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/registrations.lua b/moreblocks/stairsplus/registrations.lua index 6262a6d..189ca84 100644 --- a/moreblocks/stairsplus/registrations.lua +++ b/moreblocks/stairsplus/registrations.lua @@ -1,7 +1,7 @@ --[[ More Blocks: registrations -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/slabs.lua b/moreblocks/stairsplus/slabs.lua index 11618a2..c41b2e3 100644 --- a/moreblocks/stairsplus/slabs.lua +++ b/moreblocks/stairsplus/slabs.lua @@ -1,7 +1,7 @@ --[[ More Blocks: slab definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/slopes.lua b/moreblocks/stairsplus/slopes.lua index 63635eb..0652a51 100644 --- a/moreblocks/stairsplus/slopes.lua +++ b/moreblocks/stairsplus/slopes.lua @@ -1,12 +1,10 @@ --[[ More Blocks: slope definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called <modname>:slope_<subname> function register_slope(modname, subname, recipeitem, groups, images, description, drop, light) diff --git a/moreblocks/stairsplus/stairs.lua b/moreblocks/stairsplus/stairs.lua index 0ccf081..c72b268 100644 --- a/moreblocks/stairsplus/stairs.lua +++ b/moreblocks/stairsplus/stairs.lua @@ -1,12 +1,10 @@ --[[ More Blocks: stair definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called <modname>:stair_<subname> function register_stair(modname, subname, recipeitem, groups, images, description, drop, light) diff --git a/moreblocks/textures/moreblocks_cactus_brick.png b/moreblocks/textures/moreblocks_cactus_brick.png Binary files differindex 0e8c2c9..43d2479 100644 --- a/moreblocks/textures/moreblocks_cactus_brick.png +++ b/moreblocks/textures/moreblocks_cactus_brick.png diff --git a/moreblocks/textures/moreblocks_cactus_checker.png b/moreblocks/textures/moreblocks_cactus_checker.png Binary files differindex 99c2677..79f2e32 100644 --- a/moreblocks/textures/moreblocks_cactus_checker.png +++ b/moreblocks/textures/moreblocks_cactus_checker.png diff --git a/moreblocks/textures/moreblocks_checker_stone_tile.png b/moreblocks/textures/moreblocks_checker_stone_tile.png Binary files differindex 9d11b4f..7261586 100644 --- a/moreblocks/textures/moreblocks_checker_stone_tile.png +++ b/moreblocks/textures/moreblocks_checker_stone_tile.png diff --git a/moreblocks/textures/moreblocks_circle_stone_bricks.png b/moreblocks/textures/moreblocks_circle_stone_bricks.png Binary files differindex 4ca0134..d14057a 100644 --- a/moreblocks/textures/moreblocks_circle_stone_bricks.png +++ b/moreblocks/textures/moreblocks_circle_stone_bricks.png diff --git a/moreblocks/textures/moreblocks_circular_saw_bottom.png b/moreblocks/textures/moreblocks_circular_saw_bottom.png Binary files differindex 1522829..1a67636 100644 --- a/moreblocks/textures/moreblocks_circular_saw_bottom.png +++ b/moreblocks/textures/moreblocks_circular_saw_bottom.png diff --git a/moreblocks/textures/moreblocks_circular_saw_side.png b/moreblocks/textures/moreblocks_circular_saw_side.png Binary files differindex ce9e16f..567082b 100644 --- a/moreblocks/textures/moreblocks_circular_saw_side.png +++ b/moreblocks/textures/moreblocks_circular_saw_side.png diff --git a/moreblocks/textures/moreblocks_circular_saw_top.png b/moreblocks/textures/moreblocks_circular_saw_top.png Binary files differindex 96f3350..1b491da 100644 --- a/moreblocks/textures/moreblocks_circular_saw_top.png +++ b/moreblocks/textures/moreblocks_circular_saw_top.png diff --git a/moreblocks/textures/moreblocks_clean_glass.png b/moreblocks/textures/moreblocks_clean_glass.png Binary files differindex 140ee2b..73febdb 100644 --- a/moreblocks/textures/moreblocks_clean_glass.png +++ b/moreblocks/textures/moreblocks_clean_glass.png diff --git a/moreblocks/textures/moreblocks_coal_checker.png b/moreblocks/textures/moreblocks_coal_checker.png Binary files differindex 3df90c3..181cb97 100644 --- a/moreblocks/textures/moreblocks_coal_checker.png +++ b/moreblocks/textures/moreblocks_coal_checker.png diff --git a/moreblocks/textures/moreblocks_coal_glass_stairsplus.png b/moreblocks/textures/moreblocks_coal_glass_stairsplus.png Binary files differindex 8086a28..7aee70a 100644 --- a/moreblocks/textures/moreblocks_coal_glass_stairsplus.png +++ b/moreblocks/textures/moreblocks_coal_glass_stairsplus.png diff --git a/moreblocks/textures/moreblocks_coal_stone_bricks.png b/moreblocks/textures/moreblocks_coal_stone_bricks.png Binary files differindex 366e445..08e87a7 100644 --- a/moreblocks/textures/moreblocks_coal_stone_bricks.png +++ b/moreblocks/textures/moreblocks_coal_stone_bricks.png diff --git a/moreblocks/textures/moreblocks_copperpatina.png b/moreblocks/textures/moreblocks_copperpatina.png Binary files differindex 1b971dc..1216d8d 100644 --- a/moreblocks/textures/moreblocks_copperpatina.png +++ b/moreblocks/textures/moreblocks_copperpatina.png diff --git a/moreblocks/textures/moreblocks_dirt_compressed.png b/moreblocks/textures/moreblocks_dirt_compressed.png Binary files differindex 0a98272..a307202 100644 --- a/moreblocks/textures/moreblocks_dirt_compressed.png +++ b/moreblocks/textures/moreblocks_dirt_compressed.png diff --git a/moreblocks/textures/moreblocks_glass_stairsplus.png b/moreblocks/textures/moreblocks_glass_stairsplus.png Binary files differindex b879ec3..30aadfb 100644 --- a/moreblocks/textures/moreblocks_glass_stairsplus.png +++ b/moreblocks/textures/moreblocks_glass_stairsplus.png diff --git a/moreblocks/textures/moreblocks_iron_stone.png b/moreblocks/textures/moreblocks_iron_stone.png Binary files differindex 20c42f3..5a6e457 100644 --- a/moreblocks/textures/moreblocks_iron_stone.png +++ b/moreblocks/textures/moreblocks_iron_stone.png diff --git a/moreblocks/textures/moreblocks_iron_stone_bricks.png b/moreblocks/textures/moreblocks_iron_stone_bricks.png Binary files differindex 1f817f8..bc2ef2e 100644 --- a/moreblocks/textures/moreblocks_iron_stone_bricks.png +++ b/moreblocks/textures/moreblocks_iron_stone_bricks.png diff --git a/moreblocks/textures/moreblocks_junglestick.png b/moreblocks/textures/moreblocks_junglestick.png Binary files differindex 7c6c462..23644fd 100644 --- a/moreblocks/textures/moreblocks_junglestick.png +++ b/moreblocks/textures/moreblocks_junglestick.png diff --git a/moreblocks/textures/moreblocks_split_stone_tile.png b/moreblocks/textures/moreblocks_split_stone_tile.png Binary files differindex d7d69af..7af4fdd 100644 --- a/moreblocks/textures/moreblocks_split_stone_tile.png +++ b/moreblocks/textures/moreblocks_split_stone_tile.png diff --git a/moreblocks/textures/moreblocks_split_stone_tile_top.png b/moreblocks/textures/moreblocks_split_stone_tile_top.png Binary files differindex 3c8eb6d..f3184a8 100644 --- a/moreblocks/textures/moreblocks_split_stone_tile_top.png +++ b/moreblocks/textures/moreblocks_split_stone_tile_top.png diff --git a/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png b/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png Binary files differindex 9118c78..ae3f01f 100644 --- a/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png +++ b/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png diff --git a/moreblocks/textures/moreblocks_sweeper.png b/moreblocks/textures/moreblocks_sweeper.png Binary files differindex 34f1cde..770b988 100644 --- a/moreblocks/textures/moreblocks_sweeper.png +++ b/moreblocks/textures/moreblocks_sweeper.png diff --git a/moreblocks/textures/moreblocks_tar.png b/moreblocks/textures/moreblocks_tar.png Binary files differindex e1eb427..846d068 100644 --- a/moreblocks/textures/moreblocks_tar.png +++ b/moreblocks/textures/moreblocks_tar.png diff --git a/moreblocks/textures/moreblocks_trap_box_glass.png b/moreblocks/textures/moreblocks_trap_box_glass.png Binary files differindex fbb25ca..b0c0993 100644 --- a/moreblocks/textures/moreblocks_trap_box_glass.png +++ b/moreblocks/textures/moreblocks_trap_box_glass.png diff --git a/moreblocks/textures/moreblocks_tree_stairsplus.png b/moreblocks/textures/moreblocks_tree_stairsplus.png Binary files differindex 60100c9..bed0969 100644 --- a/moreblocks/textures/moreblocks_tree_stairsplus.png +++ b/moreblocks/textures/moreblocks_tree_stairsplus.png diff --git a/moreblocks/textures/moreblocks_wood_tile.png b/moreblocks/textures/moreblocks_wood_tile.png Binary files differindex d0faa3d..6e34453 100644 --- a/moreblocks/textures/moreblocks_wood_tile.png +++ b/moreblocks/textures/moreblocks_wood_tile.png diff --git a/moreblocks/textures/moreblocks_wood_tile_center.png b/moreblocks/textures/moreblocks_wood_tile_center.png Binary files differindex 02b0f84..a7d399a 100644 --- a/moreblocks/textures/moreblocks_wood_tile_center.png +++ b/moreblocks/textures/moreblocks_wood_tile_center.png diff --git a/moreblocks/textures/moreblocks_wood_tile_full.png b/moreblocks/textures/moreblocks_wood_tile_full.png Binary files differindex 7ec7f05..edfd5d2 100644 --- a/moreblocks/textures/moreblocks_wood_tile_full.png +++ b/moreblocks/textures/moreblocks_wood_tile_full.png diff --git a/moreblocks/textures/moreblocks_wood_tile_offset.png b/moreblocks/textures/moreblocks_wood_tile_offset.png Binary files differindex 3f6a2f2..fde40a2 100644 --- a/moreblocks/textures/moreblocks_wood_tile_offset.png +++ b/moreblocks/textures/moreblocks_wood_tile_offset.png |
