28 Commits

Author SHA1 Message Date
72ef8deeae Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-06-20 15:41:27 +02:00
f8314c322e Add compressed desert cobblestone (#156)
Desert cobblestone can be obtained in large quantities from deserts, so makes sense to add a compressed node.
2020-06-07 14:25:19 +02:00
8e6f339313 Declare the minimum supported Minetest version to 5.0.0
This information can be used by ContentDB.
2020-06-03 18:52:38 +02:00
6f9b787f3e Improve the stairsplus_in_creative_inventory setting description 2020-03-24 22:03:51 +01:00
710b90972b Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-01-04 18:01:47 +01:00
aa3dcd5878 Supprime les redefinitions 2020-01-04 17:57:30 +01:00
bbfd782300 Remove legacy Stairs+ conversion code
It was only required to import worlds last edited before Q3 2013.
2020-01-03 11:34:13 +01:00
6595ebc78d Remove obsolete notice about renaming the extracted mod folder
This is no longer required thanks to `mod.conf`.
2020-01-01 17:54:58 +01:00
917a46014f Update copyright statements to 2020 2020-01-01 04:09:24 +01:00
94247a6449 Merge branch 'master' of yunohost.local:minetest-mods/moreblocks into nalc-1.2-dev 2019-12-22 14:05:04 +01:00
325999f848 Bump to version 2.0.0 2019-11-25 13:43:10 +01:00
5cab63c675 Add ice as a Stairs+ node
This closes #109.
2019-10-17 22:25:44 +02:00
8019f9f309 Update pre-commit hooks to 2.3.0 2019-09-25 23:07:07 +02:00
873019176b Document the Minetest 5.0.0 version requirement 2019-09-08 22:56:32 +02:00
b934d8ad4d Travis CI: Use the bionic distribution 2019-07-29 00:38:26 +02:00
719494b6c4 Optimize PNG images losslessly
Commands used:

- `parallel optipng -o7 -zm1-9 -strip all ::: **/*.png`
- `parallel advpng -z4 -i5000 ::: **/*.png`
2019-06-19 21:19:39 +02:00
8b10e0721e Fix a placeholder in the Polish translation
This closes #143.
2019-06-15 18:16:15 +02:00
b2f1163dad changelog: Put the supported version at the top of the Changed section
This makes it easier to notice.
2019-05-22 11:33:15 +02:00
f421c67372 Fix Centered Wooden Tile crafting
This closes #145.
2019-05-22 09:39:06 +02:00
e7547d57ba Merge branch 'master' into nalc-1.2 2019-05-10 01:02:13 +02:00
72a6ee6032 Make Stairs+ nodes emit slightly less light compared to full nodes
This makes up for their smaller visual size.
2019-05-08 20:00:57 +02:00
c13321142b Ajoute message de chargement du mod dans le journal action 2019-05-06 00:18:07 +02:00
f7ff9644c9 Add description and dependencies to mod.conf
The legacy `depends.txt` and `description.txt` files are no longer
needed since Minetest 5.0.0 or later will read everything from
`mod.conf`.

This raises the minimum supported Minetest version to 5.0.0.
2019-04-21 17:03:15 +02:00
e09d2fab01 Fix several typos in comments 2019-04-21 16:57:42 +02:00
c30366d2dc Add settingtypes.txt to allow configuring settings in the main menu 2019-04-21 16:56:16 +02:00
b3d0f0d179 Remove the optional mod loading message 2019-04-03 00:19:18 +02:00
835aa95f35 Update changelog for the new Polish translation 2019-04-01 11:00:55 +02:00
e8293c4994 Polish translation (#142) 2019-04-01 10:59:16 +02:00
56 changed files with 437 additions and 331 deletions

View File

@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.1.0
rev: v2.3.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace

View File

@ -1,15 +1,15 @@
language: generic
dist: bionic
language: python
addons:
apt:
packages:
- luarocks
python:
- 3.7.1
install:
- pyenv global 3.6.3
- pip3 install --user pre-commit
- sudo apt-get update -qq
- sudo apt-get install -qqq luarocks
- pip3 install pre-commit
- luarocks install --local luacheck
script:
- $HOME/.local/bin/pre-commit run --all-files
- pre-commit run --all-files
- $HOME/.luarocks/bin/luacheck .

View File

@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
### Removed
- Legacy Stairs+ conversion code.
- It was only required to import worlds last edited before Q3 2013.
### Added
- Compressed desert cobblestone.
## [2.0.0] - 2019-11-25
### Added
- Stairs+ nodes for ice.
- `settingtypes.txt` file to allow configuring settings in the main menu.
- Polish translation.
### Changed
- The minimum supported Minetest version is now 5.0.0.
- Stairs+ nodes now emit one light level less compared to full nodes to make up
for their smaller visual size.
### Fixed
- Fixed a recipe conflict that made Centered Wooden Tiles impossible to craft.
## [1.3.0] - 2019-03-23
### Changed
@ -72,7 +99,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Initial versioned release.
[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.3.0...HEAD
[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v2.0.0...HEAD
[2.0.0]: https://github.com/minetest-mods/moreblocks/compare/v1.3.0...v2.0.0
[1.3.0]: https://github.com/minetest-mods/moreblocks/compare/v1.2.0...v1.3.0
[1.2.0]: https://github.com/minetest-mods/moreblocks/compare/v1.1.0...v1.2.0
[1.1.0]: https://github.com/minetest-mods/moreblocks/compare/v1.0.0...v1.1.0

View File

@ -1,6 +1,6 @@
# zlib license
Copyright © 2011-2019 Hugo Locurcio and contributors
Copyright © 2011-2020 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.**

View File

@ -18,9 +18,7 @@ git clone https://github.com/minetest-mods/moreblocks.git
You can also
[download a ZIP archive](https://github.com/minetest-mods/moreblocks/archive/master.zip)
of More Blocks. If you do so, you will need to extract the archive then rename
the resulting folder from `moreblocks-master` to `moreblocks` this is
**absolutely** required, as the mod won't work otherwise.
of More Blocks.
### Enable the mod
@ -60,13 +58,13 @@ on that line.
## Version compatibility
More Blocks is currently primarily tested with Minetest 0.4.17.
More Blocks is currently primarily tested with Minetest 5.1.0.
It may or may not work with newer or older versions. Issues arising in older
versions than 0.4.17 will generally not be fixed.
versions than 5.0.0 will generally not be fixed.
## License
Copyright © 2011-2019 Hugo Locurcio and contributors
Copyright © 2011-2020 Hugo Locurcio and contributors
- More Blocks code is licensed under the zlib license, see
[`LICENSE.md`](LICENSE.md) for details.

View File

@ -1,7 +1,7 @@
--[[
More Blocks: alias definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: circular saw
Copyright © 2011-2019 Hugo Locurcio, Sokomine and contributors.
Copyright © 2011-2020 Hugo Locurcio, Sokomine and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
@ -152,7 +152,7 @@ function circular_saw:update_inventory(pos, amount)
amount = meta:get_int("anz") + amount
-- The material is recycled automaticly.
-- The material is recycled automatically.
inv:set_list("recycle", {})
if amount < 1 then -- If the last block is taken out.
@ -246,7 +246,7 @@ function circular_saw.allow_metadata_inventory_put(
local stackname = stack:get_name()
local count = stack:get_count()
-- Only alow those items that are offered in the output inventory to be recycled:
-- Only allow those items that are offered in the output inventory to be recycled:
if listname == "recycle" then
if not inv:contains_item("output", stackname) then
return 0
@ -345,7 +345,7 @@ function circular_saw.on_metadata_inventory_take(
end
-- If it is one of the offered stairs: find out how many
-- microblocks have to be substracted:
-- microblocks have to be subtracted:
if listname == "output" then
-- We do know how much each block at each position costs:
local cost = circular_saw.cost_in_microblocks[index]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: configuration handling
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: crafting recipes
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
@ -35,15 +35,6 @@ minetest.register_craft({
recipe = {"default:junglegrass", "default:cobble"},
})
minetest.register_craft({
output = "moreblocks:wood_tile_center 9",
recipe = {
{"group:wood", "group:wood", "group:wood"},
{"group:wood", "moreblocks:wood_tile", "group:wood"},
{"group:wood", "group:wood", "group:wood"},
}
})
minetest.register_craft({
output = "moreblocks:wood_tile 9",
recipe = {
@ -53,6 +44,17 @@ minetest.register_craft({
}
})
-- This must be registered after `moreblocks:wood_tile` to avoid recipe conflicts,
-- since `moreblocks:wood_tile` is part of `group:wood`
minetest.register_craft({
output = "moreblocks:wood_tile_center 9",
recipe = {
{"group:wood", "group:wood", "group:wood"},
{"group:wood", "moreblocks:wood_tile", "group:wood"},
{"group:wood", "group:wood", "group:wood"},
}
})
minetest.register_craft({
type = "shapeless",
output = "moreblocks:wood_tile",
@ -510,6 +512,22 @@ minetest.register_craft({
}
})
minetest.register_craft({
output = "moreblocks:desert_cobble_compressed",
recipe = {
{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
}
})
minetest.register_craft({
output = "default:desert_cobble 9",
recipe = {
{"moreblocks:desert_cobble_compressed"},
}
})
minetest.register_craft({
type = "cooking", output = "moreblocks:tar", recipe = "default:pine_tree",
})

View File

@ -1,6 +0,0 @@
default
intllib?
stairs?
farming?
wool?
basic_materials?

View File

@ -1 +0,0 @@
Adds various miscellaneous blocks to the game.

View File

@ -3,7 +3,7 @@
** More Blocks **
By Calinou, with the help of ShadowNinja and VanessaE.
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
=====================================================================
--]]
@ -20,10 +20,7 @@ dofile(modpath .. "/config.lua")
dofile(modpath .. "/circular_saw.lua")
dofile(modpath .. "/stairsplus/init.lua")
dofile(modpath .. "/nodes.lua")
dofile(modpath .. "/redefinitions.lua")
dofile(modpath .. "/crafting.lua")
dofile(modpath .. "/aliases.lua")
if minetest.settings:get_bool("log_mods") then
minetest.log("action", S("[moreblocks] loaded."))
end
minetest.log("action", "[moreblocks] loaded.")

View File

@ -1,5 +1,5 @@
# German translation for More Blocks.
# Copyright © 2011-2019 Hugo Locurcio and contributors
# Copyright © 2011-2020 Hugo Locurcio and contributors
# This file is distributed under the same license as the More Blocks package.
# Xanthin, 2014.
# CodeXP <codexp@gmx.net>, 2018.
@ -132,6 +132,10 @@ msgstr "Kohlesteinziegel"
msgid "Compressed Cobblestone"
msgstr "Gepresster Kopfsteinpflaster"
#: nodes.lua
msgid "Compressed Desert Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Dirt"
msgstr "Gepresste Erde"

View File

@ -1,5 +1,5 @@
# Spanish translation for More Blocks.
# Copyright © 2011-2019 Hugo Locurcio and contributors
# Copyright © 2011-2020 Hugo Locurcio and contributors
# This file is distributed under the same license as the More Blocks package.
# kaeza, 2013.
# CodeXP <codexp@gmx.net>, 2018.
@ -128,6 +128,10 @@ msgstr ""
msgid "Compressed Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Desert Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Dirt"
msgstr ""

View File

@ -1,5 +1,5 @@
# French translation for More Blocks.
# Copyright © 2011-2019 Hugo Locurcio and contributors
# Copyright © 2011-2020 Hugo Locurcio and contributors
# This file is distributed under the same license as the More Blocks package.
# Hugo Locurcio <hugo.locurcio@hugo.pro>, 2013-2019.
# Jat15, 2013.
@ -133,6 +133,10 @@ msgstr "Briques en pierre de charbon"
msgid "Compressed Cobblestone"
msgstr "Pierre taillée compressée"
#: nodes.lua
msgid "Compressed Desert Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Dirt"
msgstr "Terre compressée"

View File

@ -1,5 +1,5 @@
# Italian translation for More Blocks.
# Copyright © 2011-2019 Hugo Locurcio and contributors
# Copyright © 2011-2020 Hugo Locurcio and contributors
# This file is distributed under the same license as the More Blocks package.
# Emon, 2016.
# CodeXP <codexp@gmx.net>, 2018.
@ -132,6 +132,10 @@ msgstr "Mattoni di pietra in carbone"
msgid "Compressed Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Desert Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Dirt"
msgstr ""

293
locale/pl.po Normal file
View File

@ -0,0 +1,293 @@
# Polish translation for More Blocks.
# Copyright © 2011-2020 Hugo Locurcio and contributors
# This file is distributed under the same license as the More Blocks package.
# mat9117, 2019
# CodeXP <codexp@gmx.net>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: More Blocks\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-13 12:37+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: CodeXP <codexp@gmx.net>\n"
"Language-Team: \n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: circular_saw.lua
msgid "Circular Saw"
msgstr "Piła tarczowa"
#: circular_saw.lua
msgid ""
"Input\n"
"material"
msgstr ""
"wejście\n"
"materiał"
#: circular_saw.lua
msgid "Left-over"
msgstr "Resztki"
#: circular_saw.lua
msgid "Max"
msgstr "Maks"
#: circular_saw.lua
msgid ""
"Recycle\n"
"output"
msgstr ""
"Przetwarzanie\n"
"Wyjście"
#: circular_saw.lua
msgid "Set"
msgstr "Ustaw"
#: circular_saw.lua
msgid "owned by @1"
msgstr "Należy do @1"
#: circular_saw.lua
msgid "Circular Saw is empty"
msgstr "Piła tarczowa jest pusta"
#: circular_saw.lua
msgid "Circular Saw is working on @1"
msgstr "Piła tarczowa pracuje na @1"
#: init.lua
msgid "[moreblocks] loaded."
msgstr "[moreblocks] załadowane."
#: nodes.lua
msgid "Deprecated"
msgstr "Przestarzałe"
#: nodes.lua
msgid "All-faces Acacia Tree"
msgstr "Wielostronna tekstura akacji"
#: nodes.lua
msgid "All-faces Aspen Tree"
msgstr "Wielostronna tekstura osiki"
#: nodes.lua
msgid "All-faces Jungle Tree"
msgstr "Wielostronna tekstura drzewa dżunglowego"
#: nodes.lua
msgid "All-faces Pine Tree"
msgstr "Wielostronna tekstura sosny"
#: nodes.lua
msgid "All-faces Tree"
msgstr "Wielostronna tekstura drzewa"
#: nodes.lua
msgid "Cactus Brick"
msgstr "Kaktusowa cegła"
#: nodes.lua
msgid "Cactus Checker"
msgstr "Kaktusowa szachownica"
#: nodes.lua
msgid "Centered Wooden Tile"
msgstr "Wyśrodkowany drewniany kafelek"
#: nodes.lua
msgid "Checker Stone Tile"
msgstr "Kamienna szachownica"
#: nodes.lua
msgid "Circle Stone Bricks"
msgstr "Okrągłe kamienne cegły"
#: nodes.lua
msgid "Clean Glass"
msgstr "Czyste szkło"
#: nodes.lua
msgid "Coal Checker"
msgstr "Węglowa szachownica"
#: nodes.lua
msgid "Coal Glass"
msgstr "Szkło węglowe"
#: nodes.lua
msgid "Coal Stone"
msgstr "Kamień węglowy"
#: nodes.lua
msgid "Coal Stone Bricks"
msgstr "Węglowe kamienne cegły"
#: nodes.lua
msgid "Compressed Cobblestone"
msgstr "Skompresowany bruk"
#: nodes.lua
msgid "Compressed Desert Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Dirt"
msgstr "Skompresowana ziemia"
#: nodes.lua
msgid "Copper Patina Block"
msgstr "Blok patynowanej miedzi"
#: nodes.lua
msgid "Empty Shelf"
msgstr "Pusta półka"
#: nodes.lua
msgid "Full Wooden Tile"
msgstr "Pełny drewniany kafelek"
#: nodes.lua
msgid "Glow Glass"
msgstr "Świecące szkło"
#: nodes.lua
msgid "Iron Checker"
msgstr "Żelazna szachownica"
#: nodes.lua
msgid "Iron Glass"
msgstr "Żelazne szkło"
#: nodes.lua
msgid "Iron Stone"
msgstr "Żelazny kamień"
#: nodes.lua
msgid "Iron Stone Bricks"
msgstr "Żelazne kamienne cegły"
#: nodes.lua
msgid "Plankstone"
msgstr "Deskokamień"
#: nodes.lua
msgid "Rope"
msgstr "Lina"
#: nodes.lua
msgid "Split Stone Tile"
msgstr "Kamienny blok kafelkowy"
#: nodes.lua
msgid "Stone Bricks"
msgstr "Kamienne cegły"
#: nodes.lua
msgid "Stone Tile"
msgstr "Kamienny kafelek"
#: nodes.lua
msgid "Super Glow Glass"
msgstr "Super świecące szkło"
#: nodes.lua
msgid "Sweeper"
msgstr "Miotła"
#: nodes.lua
msgid "Tar"
msgstr "Smoła"
#: nodes.lua
msgid "Trap Desert Stone"
msgstr "Pułapka z pustynnego kamienia"
#: nodes.lua
msgid "Trap Glass"
msgstr "Szklana pułapka"
#: nodes.lua
msgid "Trap Glow Glass"
msgstr "Pułapka ze świecącego szkłą"
#: nodes.lua
msgid "Trap Obsidian"
msgstr "Obsydianowa pułapka"
#: nodes.lua
msgid "Trap Obsidian Glass"
msgstr "Pułapka z obsydianowego szkła"
#: nodes.lua
msgid "Trap Sandstone"
msgstr "Pułapka z piaskowca"
#: nodes.lua
msgid "Trap Stone"
msgstr "Kamienna pułapka"
#: nodes.lua
msgid "Trap Super Glow Glass"
msgstr "Pułapka z super świecącego szkła"
#: nodes.lua
msgid "Wooden Tile"
msgstr "Drewniany kafelek"
#: nodes.lua
msgid "Offset Wooden Tile"
msgstr ""
# @deprecated
#: nodes.lua
msgid "Downwards Wooden Tile"
msgstr "Dolny drewniany kafelek"
# @deprecated
#: nodes.lua
msgid "Leftwards Wooden Tile"
msgstr "Lewy drewniany kafelek"
# @deprecated
#: nodes.lua
msgid "Rightwards Wooden Tile"
msgstr "Prawy drewniany kafelek"
#: ownership.lua
msgid "Sorry, @1 owns that spot."
msgstr "Przykro mi, to miejsce należy do @1"
#: ownership.lua
msgid "someone"
msgstr "ktoś"
#: stairsplus/common.lua
#, lua-format
msgid "%s Microblock"
msgstr "%s Mikroblok"
#: stairsplus/common.lua stairsplus/slabs.lua
#, lua-format
msgid "%s Slab"
msgstr "%s Płyta"
#: stairsplus/common.lua
#, lua-format
msgid "%s Slope"
msgstr "%s Spad"
#: stairsplus/common.lua
#, lua-format
msgid "%s Panel"
msgstr "%s Panel"
#: stairsplus/common.lua
#, lua-format
msgid "%s Stairs"
msgstr "%s Schody"

View File

@ -133,6 +133,10 @@ msgstr "угольно-каменный кирпич"
msgid "Compressed Cobblestone"
msgstr "прессованный булыжник"
#: nodes.lua
msgid "Compressed Desert Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Dirt"
msgstr "прессованная земля"

View File

@ -1,5 +1,5 @@
# Template translation for More Blocks.
# Copyright © 2011-2019 Hugo Locurcio and contributors
# Copyright © 2011-2020 Hugo Locurcio and contributors
# This file is distributed under the same license as the More Blocks package.
# CodeXP <codexp@gmx.net>, 2018.
msgid ""
@ -127,6 +127,10 @@ msgstr ""
msgid "Compressed Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Desert Cobblestone"
msgstr ""
#: nodes.lua
msgid "Compressed Dirt"
msgstr ""

View File

@ -1 +1,5 @@
name = moreblocks
description = Adds various miscellaneous blocks to the game.
depends = default
optional_depends = intllib,stairs,farming,wool,basic_materials
min_minetest_version = 5.0.0

View File

@ -1,7 +1,7 @@
--[[
More Blocks: node definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
@ -175,6 +175,12 @@ local nodes = {
is_ground_content = false,
sounds = sound_stone,
},
["desert_cobble_compressed"] = {
description = S("Compressed Desert Cobblestone"),
groups = {cracky = 1},
is_ground_content = false,
sounds = sound_stone,
},
["plankstone"] = {
description = S("Plankstone"),
paramtype2 = "facedir",

View File

@ -1,7 +1,7 @@
--[[
More Blocks: ownership handling
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,52 +0,0 @@
--[[
More Blocks: redefinitions of default stuff
Copyright © 2011-2019 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
-- Redefinitions of some default crafting recipes:
minetest.register_craft({
output = "default:sign_wall 4",
recipe = {
{"default:wood", "default:wood", "default:wood"},
{"default:wood", "default:wood", "default:wood"},
{"", "default:stick", ""},
}
})
minetest.register_craft({
output = "default:ladder 4",
recipe = {
{"default:stick", "", "default:stick"},
{"default:stick", "default:stick", "default:stick"},
{"default:stick", "", "default:stick"},
}
})
minetest.clear_craft({
recipe = {
{"default:papyrus", "default:papyrus", "default:papyrus"}
}
})
minetest.register_craft({
output = "default:paper 4",
recipe = {
{"default:papyrus", "default:papyrus", "default:papyrus"},
}
})
minetest.register_craft({
output = "default:rail 24",
recipe = {
{"default:steel_ingot", "", "default:steel_ingot"},
{"default:steel_ingot", "default:stick", "default:steel_ingot"},
{"default:steel_ingot", "", "default:steel_ingot"},
}
})
minetest.register_craft({
type = "toolrepair",
additional_wear = -0.10, -- Tool repair buff (10% bonus instead of 2%).
})

3
settingtypes.txt Normal file
View File

@ -0,0 +1,3 @@
# If enabled, Stairs+ nodes will be displayed in the inventory when playing in creative mode.
# Disabling this can speed up loading times for clients as fewer nodes need to be registered in the creative inventory.
moreblocks.stairsplus_in_creative_inventory (Display Stairs+ nodes in creative inventory) bool true

View File

@ -6,7 +6,7 @@
This also registers the node with the circular saw.
Example:
```lua
stairsplus:register_all("moreblocks", "wood", "defaut:wood", {
stairsplus:register_all("moreblocks", "wood", "default:wood", {
description = "Wooden",
tiles = {"default_wood.png"},
groups = {oddly_breakabe_by_hand=1},

View File

@ -1,70 +0,0 @@
--[[
More Blocks: alias definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
local function register_stairsplus_alias(modname, origname, newname)
minetest.register_alias(modname.. ":slab_" ..origname, "moreblocks:slab_" ..newname)
minetest.register_alias(modname.. ":slab_" ..origname.. "_inverted", "moreblocks:slab_" ..newname.. "_inverted")
minetest.register_alias(modname.. ":slab_" ..origname.. "_wall", "moreblocks:slab_" ..newname.. "_wall")
minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter", "moreblocks:slab_" ..newname.. "_quarter")
minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter_inverted", "moreblocks:slab_" ..newname.. "_quarter_inverted")
minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter_wall", "moreblocks:slab_" ..newname.. "_quarter_wall")
minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter", "moreblocks:slab_" ..newname.. "_three_quarter")
minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter_inverted", "moreblocks:slab_" ..newname.. "_three_quarter_inverted")
minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter_wall", "moreblocks:slab_" ..newname.. "_three_quarter_wall")
minetest.register_alias(modname.. ":stair_" ..origname, "moreblocks:stair_" ..newname)
minetest.register_alias(modname.. ":stair_" ..origname.. "_inverted", "moreblocks:stair_" ..newname.. "_inverted")
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall", "moreblocks:stair_" ..newname.. "_wall")
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half", "moreblocks:stair_" ..newname.. "_wall_half")
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half_inverted", "moreblocks:stair_" ..newname.. "_wall_half_inverted")
minetest.register_alias(modname.. ":stair_" ..origname.. "_half", "moreblocks:stair_" ..newname.. "_half")
minetest.register_alias(modname.. ":stair_" ..origname.. "_half_inverted", "moreblocks:stair_" ..newname.. "_half_inverted")
minetest.register_alias(modname.. ":stair_" ..origname.. "_right_half", "moreblocks:stair_" ..newname.. "_right_half")
minetest.register_alias(modname.. ":stair_" ..origname.. "_right_half_inverted", "moreblocks:stair_" ..newname.. "_right_half_inverted")
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half", "moreblocks:stair_" ..newname.. "_wall_half")
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half_inverted", "moreblocks:stair_" ..newname.. "_wall_half_inverted")
minetest.register_alias(modname.. ":stair_" ..origname.. "_inner", "moreblocks:stair_" ..newname.. "_inner")
minetest.register_alias(modname.. ":stair_" ..origname.. "_inner_inverted", "moreblocks:stair_" ..newname.. "_inner_inverted")
minetest.register_alias(modname.. ":stair_" ..origname.. "_outer", "moreblocks:stair_" ..newname.. "_outer")
minetest.register_alias(modname.. ":stair_" ..origname.. "_outer_inverted", "moreblocks:stair_" ..newname.. "_outer_inverted")
minetest.register_alias(modname.. ":panel_" ..origname.. "_bottom", "moreblocks:panel_" ..newname.. "_bottom")
minetest.register_alias(modname.. ":panel_" ..origname.. "_top", "moreblocks:panel_" ..newname.. "_top")
minetest.register_alias(modname.. ":panel_" ..origname.. "_vertical", "moreblocks:panel_" ..newname.. "_vertical")
minetest.register_alias(modname.. ":micro_" ..origname.. "_bottom", "moreblocks:micro_" ..newname.. "_bottom")
minetest.register_alias(modname.. ":micro_" ..origname.. "_top", "moreblocks:micro_" ..newname.. "_top")
end
register_stairsplus_alias("stairsplus", "stone", "stone")
register_stairsplus_alias("stairsplus", "wood", "wood")
register_stairsplus_alias("stairsplus", "pinewood", "pinewood")
register_stairsplus_alias("stairsplus", "cobble", "cobble")
register_stairsplus_alias("stairsplus", "brick", "brick")
register_stairsplus_alias("stairsplus", "sandstone", "sandstone")
register_stairsplus_alias("stairsplus", "glass", "glass")
register_stairsplus_alias("stairsplus", "tree", "tree")
register_stairsplus_alias("stairsplus", "jungletree", "jungletree")
register_stairsplus_alias("stairsplus", "pinetree", "pinetree")
register_stairsplus_alias("stairsplus", "desert_stone", "desert_stone")
register_stairsplus_alias("stairsplus", "steelblock", "steelblock")
register_stairsplus_alias("stairsplus", "mossycobble", "mossycobble")
register_stairsplus_alias("moreblocks", "coalstone", "coal_stone")
register_stairsplus_alias("moreblocks", "junglewood", "jungle_wood")
register_stairsplus_alias("moreblocks", "circlestonebrick", "circle_stone_bricks")
register_stairsplus_alias("moreblocks", "ironstone", "iron_stone")
register_stairsplus_alias("moreblocks", "coalglass", "coal_glass")
register_stairsplus_alias("moreblocks", "ironglass", "iron_glass")
register_stairsplus_alias("moreblocks", "glowglass", "glow_glass")
register_stairsplus_alias("moreblocks", "superglowglass", "super_glow_glass")
register_stairsplus_alias("moreblocks", "coalchecker", "coal_checker")
register_stairsplus_alias("moreblocks", "ironchecker", "iron_checker")
register_stairsplus_alias("moreblocks", "cactuschecker", "cactus_checker")
register_stairsplus_alias("moreblocks", "ironstonebrick", "iron_stone_bricks")
register_stairsplus_alias("moreblocks", "stonesquare", "stone_tile")
register_stairsplus_alias("moreblocks", "splitstonesquare", "split_stone_tile")
register_stairsplus_alias("moreblocks", "woodtile", "wood_tile")
register_stairsplus_alias("moreblocks", "woodtile_centered", "wood_tile_centered")
register_stairsplus_alias("moreblocks", "woodtile_full", "wood_tile_full")

View File

@ -1,7 +1,7 @@
--[[
More Blocks: registrations
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
@ -35,6 +35,9 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
-- This makes node rotation work on placement
def.place_param2 = nil
-- Darken light sources slightly to make up for their smaller visual size
def.light_source = math.max(0, (def.light_source or 0) - 1)
def.on_place = minetest.rotate_node
def.groups = stairsplus:prepare_groups(fields.groups)

View File

@ -1,139 +0,0 @@
--[[
More Blocks: conversion
Copyright © 2011-2019 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
-- Function to convert all stairs/slabs/etc nodes from
-- inverted, wall, etc to regular + 6d facedir
local dirs1 = {21, 20, 23, 22, 21}
local dirs2 = {15, 8, 17, 6, 15}
local dirs3 = {14, 11, 16, 5, 14}
function stairsplus:register_6dfacedir_conversion(modname, material)
--print("Register stairsplus 6d facedir conversion")
--print('ABM for '..modname..' "'..material..'"')
local objects_list1 = {
modname.. ":slab_" ..material.. "_inverted",
modname.. ":slab_" ..material.. "_quarter_inverted",
modname.. ":slab_" ..material.. "_three_quarter_inverted",
modname.. ":stair_" ..material.. "_inverted",
modname.. ":stair_" ..material.. "_wall",
modname.. ":stair_" ..material.. "_wall_half",
modname.. ":stair_" ..material.. "_wall_half_inverted",
modname.. ":stair_" ..material.. "_half_inverted",
modname.. ":stair_" ..material.. "_right_half_inverted",
modname.. ":panel_" ..material.. "_vertical",
modname.. ":panel_" ..material.. "_top",
}
local objects_list2 = {
modname.. ":slab_" ..material.. "_wall",
modname.. ":slab_" ..material.. "_quarter_wall",
modname.. ":slab_" ..material.. "_three_quarter_wall",
modname.. ":stair_" ..material.. "_inner_inverted",
modname.. ":stair_" ..material.. "_outer_inverted",
modname.. ":micro_" ..material.. "_top"
}
for _, object in pairs(objects_list1) do
local flip_upside_down = false
local flip_to_wall = false
local dest_object = object
if string.find(dest_object, "_inverted") then
flip_upside_down = true
dest_object = string.gsub(dest_object, "_inverted", "")
end
if string.find(object, "_top") then
flip_upside_down = true
dest_object = string.gsub(dest_object, "_top", "")
end
if string.find(dest_object, "_wall") then
flip_to_wall = true
dest_object = string.gsub(dest_object, "_wall", "")
end
if string.find(dest_object, "_vertical") then
flip_to_wall = true
dest_object = string.gsub(dest_object, "_vertical", "")
end
if string.find(dest_object, "_half") and not string.find(dest_object, "_right_half") then
dest_object = string.gsub(dest_object, "_half", "_right_half")
elseif string.find(dest_object, "_right_half") then
dest_object = string.gsub(dest_object, "_right_half", "_half")
end
--print(" +---> convert " ..object)
--print(" | to " ..dest_object)
minetest.register_abm({
nodenames = {object},
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
local fdir = node.param2 or 0
local nfdir
if flip_upside_down and not flip_to_wall then
nfdir = dirs1[fdir + 2]
elseif flip_to_wall and not flip_upside_down then
nfdir = dirs2[fdir + 1]
elseif flip_to_wall and flip_upside_down then
nfdir = dirs3[fdir + 2]
end
minetest.set_node(pos, {name = dest_object, param2 = nfdir})
end
})
end
for _, object in pairs(objects_list2) do
local flip_upside_down = false
local flip_to_wall = false
local dest_object = object
if string.find(dest_object, "_inverted") then
flip_upside_down = true
dest_object = string.gsub(dest_object, "_inverted", "")
end
if string.find(dest_object, "_top") then
flip_upside_down = true
dest_object = string.gsub(dest_object, "_top", "")
end
if string.find(dest_object, "_wall") then
flip_to_wall = true
dest_object = string.gsub(dest_object, "_wall", "")
end
--print(" +---> convert " ..object)
--print(" | to " ..dest_object)
minetest.register_abm({
nodenames = {object},
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
local fdir = node.param2
local nfdir = 20
if flip_upside_down and not flip_to_wall then
nfdir = dirs1[fdir + 1]
elseif flip_to_wall and not flip_upside_down then
nfdir = dirs2[fdir + 2]
end
minetest.set_node(pos, {name = dest_object, param2 = nfdir})
end
})
end
end

View File

@ -1,7 +1,7 @@
--[[
More Blocks: microblock definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: registrations
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: Stairs+
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
@ -14,8 +14,10 @@ stairsplus.expect_infinite_stacks = false
stairsplus.shapes_list = {}
if not minetest.get_modpath("unified_inventory")
and minetest.settings:get_bool("creative_mode") then
if
not minetest.get_modpath("unified_inventory")
and minetest.settings:get_bool("creative_mode")
then
stairsplus.expect_infinite_stacks = true
end
@ -36,11 +38,10 @@ end
function stairsplus:register_all(modname, subname, recipeitem, fields)
self:register_stair(modname, subname, recipeitem, fields)
self:register_slab (modname, subname, recipeitem, fields)
self:register_slab(modname, subname, recipeitem, fields)
self:register_slope(modname, subname, recipeitem, fields)
self:register_panel(modname, subname, recipeitem, fields)
self:register_micro(modname, subname, recipeitem, fields)
-- self:register_6dfacedir_conversion(modname, subname) -- Not needed as of Q3 2013, uncomment to fix old maps.
end
function stairsplus:register_alias_all(modname_old, subname_old, modname_new, subname_new)
@ -69,8 +70,6 @@ local function register_stair_slab_panel_micro(modname, subname, recipeitem, gro
})
end
-- dofile(modpath.. "/aliases.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
-- dofile(modpath.. "/conversion.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
dofile(modpath .. "/defs.lua")
dofile(modpath .. "/recipes.lua")
dofile(modpath .. "/common.lua")

View File

@ -1,7 +1,7 @@
--[[
More Blocks: microblock definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: panel definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: Stairs+
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: registrations
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
@ -49,6 +49,7 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
"desert_sandstone_block",
"sandstone_block",
"coral_skeleton",
"ice",
}
for _, name in pairs(default_nodes) do

View File

@ -1,7 +1,7 @@
--[[
More Blocks: slab definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: slope definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

View File

@ -1,7 +1,7 @@
--[[
More Blocks: stair definitions
Copyright © 2011-2019 Hugo Locurcio and contributors.
Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 850 B

After

Width:  |  Height:  |  Size: 739 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 B

After

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 352 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 88 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 153 B

After

Width:  |  Height:  |  Size: 117 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 282 B