From a5eef1c5de77fa7770877802e66c3e1c53f9a0da Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 24 Apr 2019 18:59:36 -0400 Subject: update castles, areas, homedecor, plantlife, gloopblocks, hotbar, inspector, maptools, mesecons, moreblocks, moreores, technic, teleport_request, and worldedit switched to caverealms_lite (with minor fixes by me) switched to CWz's fork of player_textures The homedecor update brings in the big split, and will require you to re-enable all modpack components in order to avoid loss of content. --- moreblocks/CHANGELOG.md | 5 +++++ moreblocks/circular_saw.lua | 6 +++--- moreblocks/depends.txt | 6 ------ moreblocks/description.txt | 1 - moreblocks/init.lua | 4 ---- moreblocks/mod.conf | 3 +++ moreblocks/settingtypes.txt | 1 + moreblocks/stairsplus/API.md | 2 +- 8 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 moreblocks/depends.txt delete mode 100644 moreblocks/description.txt create mode 100644 moreblocks/settingtypes.txt (limited to 'moreblocks') diff --git a/moreblocks/CHANGELOG.md b/moreblocks/CHANGELOG.md index 154f885..9c69a0a 100644 --- a/moreblocks/CHANGELOG.md +++ b/moreblocks/CHANGELOG.md @@ -9,8 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added +- `settingtypes.txt` file to allow configuring settings in the main menu. - Polish translation. +### Changed + +- The minimum supported Minetest version is now 5.0.0. + ## [1.3.0] - 2019-03-23 ### Changed diff --git a/moreblocks/circular_saw.lua b/moreblocks/circular_saw.lua index 9395a2e..7fd9016 100644 --- a/moreblocks/circular_saw.lua +++ b/moreblocks/circular_saw.lua @@ -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] diff --git a/moreblocks/depends.txt b/moreblocks/depends.txt deleted file mode 100644 index d27d8a5..0000000 --- a/moreblocks/depends.txt +++ /dev/null @@ -1,6 +0,0 @@ -default -intllib? -stairs? -farming? -wool? -basic_materials? diff --git a/moreblocks/description.txt b/moreblocks/description.txt deleted file mode 100644 index 95d7a92..0000000 --- a/moreblocks/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds various miscellaneous blocks to the game. diff --git a/moreblocks/init.lua b/moreblocks/init.lua index 7627f7d..2416a03 100644 --- a/moreblocks/init.lua +++ b/moreblocks/init.lua @@ -23,7 +23,3 @@ 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 diff --git a/moreblocks/mod.conf b/moreblocks/mod.conf index b634ba9..31f7f79 100644 --- a/moreblocks/mod.conf +++ b/moreblocks/mod.conf @@ -1 +1,4 @@ name = moreblocks +description = Adds various miscellaneous blocks to the game. +depends = default +optional_depends = intllib,stairs,farming,wool,basic_materials diff --git a/moreblocks/settingtypes.txt b/moreblocks/settingtypes.txt new file mode 100644 index 0000000..e60f394 --- /dev/null +++ b/moreblocks/settingtypes.txt @@ -0,0 +1 @@ +moreblocks.stairsplus_in_creative_inventory (Display Stairs+ nodes in creative inventory) bool false diff --git a/moreblocks/stairsplus/API.md b/moreblocks/stairsplus/API.md index b5cb0c1..c0fea32 100644 --- a/moreblocks/stairsplus/API.md +++ b/moreblocks/stairsplus/API.md @@ -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}, -- cgit v1.2.3