1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-24 17:50:37 +01:00

Finished maptool's update's rebase

This commit is contained in:
LeMagnesium 2015-01-24 19:13:58 +01:00
parent f70d47ccaf
commit 6dc3e7d3ad
5 changed files with 58 additions and 3 deletions

View File

@ -74,8 +74,6 @@ minetest.register_alias("fake_fire", "maptools:fake_fire")
minetest.register_alias("ffire", "maptools:fake_fire")
minetest.register_alias("igniter", "maptools:igniter")
-- Unbreakable block aliases
minetest.register_alias("stone_u", "maptools:stone")
minetest.register_alias("tree_u", "maptools:tree")
minetest.register_alias("cobble_u", "maptools:cobble")

View File

@ -26,4 +26,8 @@ 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

View File

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

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
--[[
=====================================================================
** Map Tools **
@ -95,3 +96,37 @@ 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

View File

@ -411,6 +411,7 @@ minetest.register_node("maptools:igniter", {
minetest.register_node("maptools:superapple", {
description = S("Super Apple"),
range = 12,
<<<<<<< HEAD
stack_max = 99,
drawtype = "nodebox",
visual_scale = 1.0,
@ -441,4 +442,21 @@ minetest.register_node("maptools:superapple", {
minetest.set_node(pos, {name = "maptools:superapple", param2= 1})
end
end,
=======
stack_max = 10000,
drawtype = "plantlike",
visual_scale = 1.0,
tiles = {"maptools_superapple.png"},
inventory_image = "maptools_superapple.png",
paramtype = "light",
sunlight_propagates = true,
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
},
walkable = false,
groups = {fleshy=3, dig_immediate=3, not_in_creative_inventory = maptools.creative},
on_use = minetest.item_eat(20),
sounds = default.node_sound_defaults(),
>>>>>>> Maptool's update
})