Merge branch 'master' into lean-inventory

Conflicts:
	stairsplus/init.lua
	stairsplus/microblocks.lua
	stairsplus/panels.lua
	stairsplus/slabs.lua
	stairsplus/slopes.lua
	stairsplus/stairs.lua
This commit is contained in:
Isidor Zeuner
2019-01-19 14:02:49 +01:00
26 changed files with 1192 additions and 1012 deletions

View File

@ -1,7 +1,7 @@
--[[
More Blocks: configuration handling
Copyright (c) 2011-2017 Hugo Locurcio and contributors.
Copyright (c) 2011-2018 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]