Merge branch 'master' of yunohost.local:minetest-mods/maptools into nalc-1.2-dev

.pre-commit-config.yaml

@@ -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

.travis.yml

@@ -1,15 +1,15 @@
-language: generic
+dist: bionic
+language: python
 
-addons:
+python:
-  apt:
+  - 3.7.1
-    packages:
-    - luarocks
 
 install:
-  - pyenv global 3.6.3
+  - sudo apt-get update -qq
-  - pip3 install --user pre-commit
+  - 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 .

CHANGELOG.md

@@ -7,9 +7,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.0] - 2019-11-25
+
 ### Changed
 
 - The minimum supported Minetest version is now 5.0.0.
+- Map Tools nodes/items can no longer be dropped to prevent them from falling
+  into bad hands.
+
+### Fixed
+
+- The inventory images of `no_interact`, `no_build`, `ignore_like_no_clip`
+  and `ignore_like_no_point` now use textures that are available in
+  Minetest Game 5.0.0.
 
 ## [1.1.0] - 2019-03-23
 
@@ -22,5 +32,6 @@ 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/v1.1.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.0.0...HEAD
+[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

NODES_ITEMS.md

@@ -9,8 +9,8 @@ use `-1` as the amount.
 ## Nodes
 
 :warning: denotes an unpointable, unbreakable block; be very careful with them,
-as they cannot be removed by hand (they can only be removed with WorldEdit or
+as they cannot be removed by hand (they can only be removed with
-similar).
+[WorldEdit](https://github.com/Uberi/Minetest-WorldEdit) or similar).
 
 | Item code               | Description                                                                                                                                                            |
 | ----------------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

README.md

@@ -63,9 +63,9 @@ on that line.
 
 ## Version compatibility
 
-Map Tools is currently primarily tested with Minetest 0.4.17.
+Map Tools 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
 

init.lua

@@ -16,14 +16,14 @@ local S, NS = dofile(modpath .. "/intllib.lua")
 maptools.S = S
 maptools.NS = NS
 
+maptools.drop_msg = function(itemstack, player)
+	local name = player:get_player_name()
+	minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!"))
+end
+
 dofile(modpath .. "/config.lua")
 dofile(modpath .. "/aliases.lua")
 dofile(modpath .. "/craftitems.lua")
 dofile(modpath .. "/default_nodes.lua")
 dofile(modpath .. "/nodes.lua")
 dofile(modpath .. "/tools.lua")
-
-maptools.drop_msg = function(itemstack, player)
-	local name = player:get_player_name()
-	minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!"))
-end

nodes.lua

@@ -283,7 +283,7 @@ minetest.register_node("maptools:nobuild", {
 	description = S("Build Prevention"),
 	range = 12,
 	stack_max = 10000,
-	inventory_image = "default_steel_block.png^bones_bones.png",
+	inventory_image = "default_steel_block.png^default_flint.png",
 	drawtype = "airlike",
 	walkable = false,
 	pointable = false,
@@ -298,7 +298,7 @@ minetest.register_node("maptools:nointeract", {
 	description = S("Interact Prevention"),
 	range = 12,
 	stack_max = 10000,
-	inventory_image = "default_steel_block.png^default_scorched_stuff.png",
+	inventory_image = "default_steel_block.png^default_bush_stem.png",
 	drawtype = "airlike",
 	walkable = false,
 	paramtype = "light",