Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-07-03 17:27:54 +02:00
commit 176ca6ea8b
4 changed files with 39 additions and 2 deletions

View File

@ -26,4 +26,6 @@ local function setting(settingtype, name, default)
end
-- Show Map Tools stuff in creative inventory (1 or 0):
setting("integer", "hide_from_creative_inventory", 0)
setting("integer", "hide_from_creative_inventory", 1)
-- Enable crafting recipes for coins (true or false):
setting("bool", "enable_coin_crafting", false)

View File

@ -16,6 +16,14 @@ minetest.register_craftitem("maptools:copper_coin", {
stack_max = 10000,
})
if maptools.config and maptools.config.enable_coin_crafting then
minetest.register_craft({
output = "maptools:copper_coin 10",
type = "shapeless",
recipe = { "default:copper_ingot", "default:copper_ingot" }
})
end
minetest.register_craftitem("maptools:silver_coin", {
description = S("Silver Coin"),
inventory_image = "maptools_silver_coin.png",
@ -23,6 +31,16 @@ minetest.register_craftitem("maptools:silver_coin", {
stack_max = 10000,
})
if maptools.config and maptools.config.enable_coin_crafting then
if minetest.get_modpath("moreores") then
minetest.register_craft({
output = "maptools:silver_coin 10",
type = "shapeless",
recipe = { "moreores:silver_ingot", "moreores:silver_ingot" }
})
end
end
minetest.register_craftitem("maptools:gold_coin", {
description = S("Gold Coin"),
inventory_image = "maptools_gold_coin.png",
@ -30,6 +48,14 @@ minetest.register_craftitem("maptools:gold_coin", {
stack_max = 10000,
})
if maptools.config and maptools.config.enable_coin_crafting then
minetest.register_craft({
output = "maptools:gold_coin 10",
type = "shapeless",
recipe = { "default:gold_ingot", "default:gold_ingot" }
})
end
minetest.register_craftitem("maptools:infinitefuel", {
description = S("Infinite Fuel"),
inventory_image = "maptools_infinitefuel.png",

View File

@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
## [2.2.0] - 2021-06-28
### Changed
- [Disabled crafting recipes for coins by default.](https://github.com/minetest-mods/maptools/pull/29)
- They can be enabled again by setting `maptools.enable_coin_crafting = true`
in `minetest.conf`.
- Map Tools nodes can no longer be exploded by TNT.
- Switched from Travis CI to GitHub Actions for continuous integration.
@ -48,7 +53,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Initial versioned release.
[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.1.0...HEAD
[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.2.0...HEAD
[2.2.0]: https://github.com/minetest-mods/maptools/compare/v2.1.0...v2.2.0
[2.1.0]: https://github.com/minetest-mods/maptools/compare/v2.0.0...v2.1.0
[2.0.0]: https://github.com/minetest-mods/maptools/compare/v1.1.0...v2.0.0
[1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0

3
settingtypes.txt Normal file
View File

@ -0,0 +1,3 @@
# If `true`, enables coin crafting recipes. If `false`, disables coin crafting recipes.
# Takes effect only at load-time; runtime changes to this setting are ignored.
maptools.enable_coin_crafting (Enable crafting recipes for coins) bool false