From 925a9d8373b13b51ae8e7721384f34e836355fad Mon Sep 17 00:00:00 2001
From: Maksim Gamarnik <MoNTE48@mail.ua>
Date: Tue, 9 Feb 2016 00:00:25 +0200
Subject: [PATCH] Merge latest builtin

---
 builtin/game/item.lua    | 2 +-
 builtin/init.lua         | 6 +++++-
 builtin/settingtypes.txt | 9 ++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 9dc84f571..c168bf096 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -642,4 +642,4 @@ core.noneitemdef_default = {  -- This is used for the hand and unknown items
 	on_secondary_use = redef_wrapper(core, 'item_secondary_use'),
 	on_drop = nil,
 	on_use = nil,
-}
\ No newline at end of file
+}
diff --git a/builtin/init.lua b/builtin/init.lua
index b3004468e..6b27cf76e 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -12,7 +12,11 @@ if core.print then
 	-- Override native print and use
 	-- terminal if that's turned on
 	function print(...)
-		core_print(table.concat({...}, "\t"))
+		local n, t = select("#", ...), { ... }
+		for i = 1, n do
+			t[i] = tostring(t[i])
+		end
+		core_print(table.concat(t, "\t"))
 	end
 	core.print = nil -- don't pollute our namespace
 end
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index dd8529990..79a64c2db 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -279,6 +279,9 @@ enable_clouds (Clouds) bool true
 #    Use 3D cloud look instead of flat.
 enable_3d_clouds (3D clouds) bool true
 
+#    Method used to highlight selected object.
+node_highlighting (Node highlighting) enum box box,halo
+
 [***Filtering]
 
 #    Use mip mapping to scale textures. May slightly increase performance.
@@ -482,9 +485,6 @@ desynchronize_mapblock_texture_animation (Desynchronize block animation) bool tr
 #    Useful if there's something to be displayed right or left of hotbar.
 hud_hotbar_max_width (Maximum hotbar width) float 1.0
 
-#    Enable selection highlighting for nodes (disables selectionbox).
-enable_node_highlighting (Node highlighting) bool false
-
 #    Enables caching of facedir rotated meshes.
 enable_mesh_cache (Mesh cache) bool false
 
@@ -508,6 +508,9 @@ directional_colored_fog (Colored fog) bool true
 #    set to the nearest valid value.
 ambient_occlusion_gamma (Ambient occlusion gamma) float 2.2 0.25 4.0
 
+#    Enables animation of inventory items.
+inventory_items_animations (Inventory items animations) bool false
+
 [**Menus]
 
 #    Use a cloud animation for the main menu background.