Compare commits
1 Commits
v2.0.0
...
c13321142b
Author | SHA1 | Date | |
---|---|---|---|
c13321142b |
@ -1,6 +1,6 @@
|
|||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v2.3.0
|
rev: v2.1.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
|
16
.travis.yml
@ -1,15 +1,15 @@
|
|||||||
dist: bionic
|
language: generic
|
||||||
language: python
|
|
||||||
|
|
||||||
python:
|
addons:
|
||||||
- 3.7.1
|
apt:
|
||||||
|
packages:
|
||||||
|
- luarocks
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- sudo apt-get update -qq
|
- pyenv global 3.6.3
|
||||||
- sudo apt-get install -qqq luarocks
|
- pip3 install --user pre-commit
|
||||||
- pip3 install pre-commit
|
|
||||||
- luarocks install --local luacheck
|
- luarocks install --local luacheck
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- pre-commit run --all-files
|
- $HOME/.local/bin/pre-commit run --all-files
|
||||||
- $HOME/.luarocks/bin/luacheck .
|
- $HOME/.luarocks/bin/luacheck .
|
||||||
|
12
CHANGELOG.md
@ -7,23 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
## [2.0.0] - 2019-11-25
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Stairs+ nodes for ice.
|
|
||||||
- `settingtypes.txt` file to allow configuring settings in the main menu.
|
- `settingtypes.txt` file to allow configuring settings in the main menu.
|
||||||
- Polish translation.
|
- Polish translation.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- The minimum supported Minetest version is now 5.0.0.
|
- 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
|
## [1.3.0] - 2019-03-23
|
||||||
|
|
||||||
@ -90,8 +81,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|||||||
|
|
||||||
- Initial versioned release.
|
- Initial versioned release.
|
||||||
|
|
||||||
[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v2.0.0...HEAD
|
[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.3.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.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.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
|
[1.1.0]: https://github.com/minetest-mods/moreblocks/compare/v1.0.0...v1.1.0
|
||||||
|
@ -60,9 +60,9 @@ on that line.
|
|||||||
|
|
||||||
## Version compatibility
|
## Version compatibility
|
||||||
|
|
||||||
More Blocks is currently primarily tested with Minetest 5.1.0.
|
More Blocks is currently primarily tested with Minetest 0.4.17.
|
||||||
It may or may not work with newer or older versions. Issues arising in older
|
It may or may not work with newer or older versions. Issues arising in older
|
||||||
versions than 5.0.0 will generally not be fixed.
|
versions than 0.4.17 will generally not be fixed.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
20
crafting.lua
@ -35,17 +35,6 @@ minetest.register_craft({
|
|||||||
recipe = {"default:junglegrass", "default:cobble"},
|
recipe = {"default:junglegrass", "default:cobble"},
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
|
||||||
output = "moreblocks:wood_tile 9",
|
|
||||||
recipe = {
|
|
||||||
{"group:wood", "group:wood", "group:wood"},
|
|
||||||
{"group:wood", "group:wood", "group:wood"},
|
|
||||||
{"group:wood", "group:wood", "group:wood"},
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
-- This must be registered after `moreblocks:wood_tile` to avoid recipe conflicts,
|
|
||||||
-- since `moreblocks:wood_tile` is part of `group:wood`
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = "moreblocks:wood_tile_center 9",
|
output = "moreblocks:wood_tile_center 9",
|
||||||
recipe = {
|
recipe = {
|
||||||
@ -55,6 +44,15 @@ minetest.register_craft({
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
minetest.register_craft({
|
||||||
|
output = "moreblocks:wood_tile 9",
|
||||||
|
recipe = {
|
||||||
|
{"group:wood", "group:wood", "group:wood"},
|
||||||
|
{"group:wood", "group:wood", "group:wood"},
|
||||||
|
{"group:wood", "group:wood", "group:wood"},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "shapeless",
|
type = "shapeless",
|
||||||
output = "moreblocks:wood_tile",
|
output = "moreblocks:wood_tile",
|
||||||
|
2
init.lua
@ -23,3 +23,5 @@ dofile(modpath .. "/nodes.lua")
|
|||||||
dofile(modpath .. "/redefinitions.lua")
|
dofile(modpath .. "/redefinitions.lua")
|
||||||
dofile(modpath .. "/crafting.lua")
|
dofile(modpath .. "/crafting.lua")
|
||||||
dofile(modpath .. "/aliases.lua")
|
dofile(modpath .. "/aliases.lua")
|
||||||
|
|
||||||
|
minetest.log("action", "[moreblocks] loaded.")
|
||||||
|
@ -286,4 +286,4 @@ msgstr "%s Panel"
|
|||||||
#: stairsplus/common.lua
|
#: stairsplus/common.lua
|
||||||
#, lua-format
|
#, lua-format
|
||||||
msgid "%s Stairs"
|
msgid "%s Stairs"
|
||||||
msgstr "%s Schody"
|
msgstr "% Schody"
|
||||||
|
@ -35,9 +35,6 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
|
|||||||
-- This makes node rotation work on placement
|
-- This makes node rotation work on placement
|
||||||
def.place_param2 = nil
|
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.on_place = minetest.rotate_node
|
||||||
def.groups = stairsplus:prepare_groups(fields.groups)
|
def.groups = stairsplus:prepare_groups(fields.groups)
|
||||||
|
|
||||||
|
@ -14,10 +14,8 @@ stairsplus.expect_infinite_stacks = false
|
|||||||
|
|
||||||
stairsplus.shapes_list = {}
|
stairsplus.shapes_list = {}
|
||||||
|
|
||||||
if
|
if not minetest.get_modpath("unified_inventory")
|
||||||
not minetest.get_modpath("unified_inventory")
|
and minetest.settings:get_bool("creative_mode") then
|
||||||
and minetest.settings:get_bool("creative_mode")
|
|
||||||
then
|
|
||||||
stairsplus.expect_infinite_stacks = true
|
stairsplus.expect_infinite_stacks = true
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -38,7 +36,7 @@ end
|
|||||||
|
|
||||||
function stairsplus:register_all(modname, subname, recipeitem, fields)
|
function stairsplus:register_all(modname, subname, recipeitem, fields)
|
||||||
self:register_stair(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_slope(modname, subname, recipeitem, fields)
|
||||||
self:register_panel(modname, subname, recipeitem, fields)
|
self:register_panel(modname, subname, recipeitem, fields)
|
||||||
self:register_micro(modname, subname, recipeitem, fields)
|
self:register_micro(modname, subname, recipeitem, fields)
|
||||||
|
@ -49,7 +49,6 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
|
|||||||
"desert_sandstone_block",
|
"desert_sandstone_block",
|
||||||
"sandstone_block",
|
"sandstone_block",
|
||||||
"coral_skeleton",
|
"coral_skeleton",
|
||||||
"ice",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, name in pairs(default_nodes) do
|
for _, name in pairs(default_nodes) do
|
||||||
|
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 176 B |
Before Width: | Height: | Size: 163 B After Width: | Height: | Size: 165 B |
Before Width: | Height: | Size: 258 B After Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 269 B After Width: | Height: | Size: 292 B |
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 219 B |
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 170 B |
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 850 B |
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 115 B After Width: | Height: | Size: 121 B |
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 356 B |
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 170 B |
Before Width: | Height: | Size: 88 B After Width: | Height: | Size: 135 B |
Before Width: | Height: | Size: 117 B After Width: | Height: | Size: 153 B |
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 389 B |
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 284 B |