Merge branch 'tt'

mods/ENTITIES/mcl_boats/init.lua

@@ -279,7 +279,7 @@ local images = { "oak", "spruce", "birch", "jungle", "acacia", "dark_oak" }
 for b=1, #boat_ids do
 	local itemstring = "mcl_boats:"..boat_ids[b]
 
-	local longdesc, usagehelp, help, helpname
+	local longdesc, usagehelp, tt_help, help, helpname
 	help = false
 	-- Only create one help entry for all boats
 	if b == 1 then
@@ -288,9 +288,11 @@ for b=1, #boat_ids do
 		usagehelp = S("Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.")
 		helpname = S("Boat")
 	end
+	tt_help = S("Water vehicle")
 
 	minetest.register_craftitem(itemstring, {
 		description = names[b],
+		_tt_help = tt_help,
 		_doc_items_create_entry = help,
 		_doc_items_entry_name = helpname,
 		_doc_items_longdesc = longdesc,

mods/ENTITIES/mcl_minecarts/init.lua

@@ -526,7 +526,7 @@ mcl_minecarts.place_minecart = function(itemstack, pointed_thing)
 end
 
 
-local register_craftitem = function(itemstring, entity_id, description, longdesc, usagehelp, icon, creative)
+local register_craftitem = function(itemstring, entity_id, description, tt_help, longdesc, usagehelp, icon, creative)
 	entity_mapping[itemstring] = entity_id
 
 	local groups = { minecart = 1, transport = 1 }
@@ -566,6 +566,7 @@ local register_craftitem = function(itemstring, entity_id, description, longdesc
 		groups = groups,
 	}
 	def.description = description
+	def._tt_help = tt_help
 	def._doc_items_longdesc = longdesc
 	def._doc_items_usagehelp = usagehelp
 	def.inventory_image = icon
@@ -588,9 +589,9 @@ Register a minecart
 * on_activate_by_rail: Called when above activator rail
 * creative: If false, don't show in Creative Inventory
 ]]
-local function register_minecart(itemstring, entity_id, description, longdesc, usagehelp, mesh, textures, icon, drop, on_rightclick, on_activate_by_rail, creative)
+local function register_minecart(itemstring, entity_id, description, tt_help, longdesc, usagehelp, mesh, textures, icon, drop, on_rightclick, on_activate_by_rail, creative)
 	register_entity(entity_id, mesh, textures, drop, on_rightclick, on_activate_by_rail)
-	register_craftitem(itemstring, entity_id, description, longdesc, usagehelp, icon, creative)
+	register_craftitem(itemstring, entity_id, description, tt_help, longdesc, usagehelp, icon, creative)
 	if minetest.get_modpath("doc_identifier") ~= nil then
 		doc.sub.identifier.register_object(entity_id, "craftitems", itemstring)
 	end
@@ -601,6 +602,7 @@ register_minecart(
 	"mcl_minecarts:minecart",
 	"mcl_minecarts:minecart",
 	S("Minecart"),
+	S("Vehicle for fast travel on rails"),
 	S("Minecarts can be used for a quick transportion on rails.") .. "\n" ..
 	S("Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type."),
 	S("You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.") .. "\n" ..
@@ -640,7 +642,7 @@ register_minecart(
 	"mcl_minecarts:chest_minecart",
 	"mcl_minecarts:chest_minecart",
 	S("Minecart with Chest"),
-	nil, nil,
+	nil, nil, nil,
 	"mcl_minecarts_minecart_chest.b3d",
 	{ "mcl_chests_normal.png", "mcl_minecarts_minecart.png" },
 	"mcl_minecarts_minecart_chest.png",
@@ -652,6 +654,7 @@ register_minecart(
 	"mcl_minecarts:furnace_minecart",
 	"mcl_minecarts:furnace_minecart",
 	S("Minecart with Furnace"),
+	nil,
 	S("A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel."),
 	S("Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.") .. "\n" ..
 	S("To obtain the minecart and furnace, punch them while holding down the sneak key."),
@@ -705,7 +708,7 @@ register_minecart(
 	"mcl_minecarts:command_block_minecart",
 	"mcl_minecarts:command_block_minecart",
 	S("Minecart with Command Block"),
-	nil, nil,
+	nil, nil, nil,
 	"mcl_minecarts_minecart_block.b3d",
 	{
 		"jeija_commandblock_off.png^[verticalframe:2:0",
@@ -726,7 +729,7 @@ register_minecart(
 	"mcl_minecarts:hopper_minecart",
 	"mcl_minecarts:hopper_minecart",
 	S("Minecart with Hopper"),
-	nil, nil,
+	nil, nil, nil,
 	"mcl_minecarts_minecart_hopper.b3d",
 	{
 		"mcl_hoppers_hopper_inside.png",
@@ -744,6 +747,7 @@ register_minecart(
 	"mcl_minecarts:tnt_minecart",
 	"mcl_minecarts:tnt_minecart",
 	S("Minecart with TNT"),
+	S("Vehicle for fast travel on rails").."\n"..S("Can be ignited by tools or powered activator rail"),
 	S("A minecart with TNT is an explosive vehicle that travels on rail."),
 	S("Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.") .. "\n" ..
 	S("To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited."),

mods/ENTITIES/mcl_minecarts/rails.lua

@@ -73,6 +73,7 @@ register_rail("mcl_minecarts:rail",
 	{"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
 	{
 		description = S("Rail"),
+		_tt_help = S("Track for minecarts"),
 		_doc_items_longdesc = S("Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction."),
 		_doc_items_usagehelp = railuse,
 	}
@@ -83,6 +84,7 @@ register_rail("mcl_minecarts:golden_rail",
 	{"mcl_minecarts_rail_golden.png", "mcl_minecarts_rail_golden_curved.png", "mcl_minecarts_rail_golden_t_junction.png", "mcl_minecarts_rail_golden_crossing.png"},
 	{
 		description = S("Powered Rail"),
+		_tt_help = S("Track for minecarts").."\n"..S("Speed up when powered, slow down when not powered"),
 		_doc_items_longdesc = S("Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts."),
 		_doc_items_usagehelp = railuse .. "\n" .. S("Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power."),
 		_rail_acceleration = -3,
@@ -121,6 +123,7 @@ register_rail("mcl_minecarts:activator_rail",
 	{"mcl_minecarts_rail_activator.png", "mcl_minecarts_rail_activator_curved.png", "mcl_minecarts_rail_activator_t_junction.png", "mcl_minecarts_rail_activator_crossing.png"},
 	{
 		description = S("Activator Rail"),
+		_tt_help = S("Track for minecarts").."\n"..S("Activates minecarts when powered"),
 		_doc_items_longdesc = S("Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts."),
 		_doc_items_usagehelp = railuse .. "\n" .. S("To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail."),
 		mesecons = {
@@ -172,6 +175,7 @@ register_rail("mcl_minecarts:detector_rail",
 	{"mcl_minecarts_rail_detector.png", "mcl_minecarts_rail_detector_curved.png", "mcl_minecarts_rail_detector_t_junction.png", "mcl_minecarts_rail_detector_crossing.png"},
 	{
 		description = S("Detector Rail"),
+		_tt_help = S("Track for minecarts").."\n"..S("Emits redstone power when a minecart is detected"),
 		_doc_items_longdesc = S("Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms."),
 		_doc_items_usagehelp = railuse .. "\n" .. S("To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail."),
 		mesecons = {

mods/ENTITIES/mcl_mobs/crafts.lua

@@ -4,6 +4,7 @@ local S = minetest.get_translator("mcl_mobs")
 -- name tag
 minetest.register_craftitem("mcl_mobs:nametag", {
 	description = S("Name Tag"),
+	_tt_help = S("Give names to mobs").."\n"..S("Set name at anvil"),
 	_doc_items_longdesc = S("A name tag is an item to name a mob."),
 	_doc_items_usagehelp = S("Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag."),
 	inventory_image = "mobs_nametag.png",

mods/ENTITIES/mobs_mc/1_items_default.lua

@@ -532,6 +532,7 @@ if c("totem") then
 	-- Totem of Undying
 	minetest.register_craftitem("mobs_mc:totem", {
 		description = S("Totem of Undying"),
+		_tt_help = S("Protects you from death while wielding it"),
 		_doc_items_longdesc = S("A totem of undying is a rare artifact which may safe you from certain death."),
 		_doc_items_usagehelp = S("The totem only works while you hold it in your hand. If you receive fatal damage, you are saved from death and you get a second chance with 1 HP. The totem is destroyed in the process, however."),
 		inventory_image = "mcl_totems_totem.png",