Updated maptools mod : not running yet

mods/maptools/config.lua

@@ -26,8 +26,4 @@ local function setting(settingtype, name, default)
 end
 
 -- Show Map Tools stuff in creative inventory (1 or 0):
-<<<<<<< HEAD
 setting("integer", "hide_from_creative_inventory", 0)
-=======
-setting("integer", "hide_from_creative_inventory", 1)
->>>>>>> Maptool's update

mods/maptools/default_nodes.lua

@@ -360,7 +360,7 @@ minetest.register_node("maptools:diamondblock", {
 	description = S("Unbreakable Diamond Block"),
 	range = 12,
 	stack_max = 10000,
-	tiles = {"default_steel_block.png"},
+	tiles = {"default_diamond_block.png"},
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),

mods/maptools/init.lua

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 --[[
 =====================================================================
 ** Map Tools **
@@ -96,37 +95,3 @@ end)
 if minetest.setting_getbool("log_mods") then
 	minetest.log("action", S("[maptools] loaded."))
 end
-=======
---[[
-=====================================================================
-** Map Tools **
-By Calinou.
-
-Copyright (c) 2012-2015 Calinou and contributors.
-Licensed under the zlib license. See LICENSE.md for more information.
-=====================================================================
---]]
-
-maptools = {}
-
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
-maptools.intllib = S
-
-local modpath = minetest.get_modpath("maptools")
-
-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")
-
-if minetest.setting_getbool("log_mods") then
-	minetest.log("action", S("[maptools] loaded."))
-end
->>>>>>> Maptool's update