fix mergeconflict

Replace deprecated methods

.gitignore

@@ -0,0 +1,2 @@
+# Eclipse project files
+.project

inventory_plus/init.lua

@@ -17,7 +17,7 @@ inventory_plus = {}
 inventory_plus.buttons = {}
 
 -- default inventory page
-inventory_plus.default = minetest.setting_get("inventory_default") or "craft"
+inventory_plus.default = minetest.settings:get("inventory_default") or "craft"
 
 -- register_button
 inventory_plus.register_button = function(player, name, label)
@@ -39,7 +39,7 @@ inventory_plus.set_inventory_formspec = function(player, formspec)
 		return
 	end
 
-	if minetest.setting_getbool("creative_mode") then
+	if minetest.settings:get_bool("creative_mode") then
 
 		-- if creative mode is on then wait a bit
 		minetest.after(0.01,function()
@@ -71,8 +71,9 @@ inventory_plus.get_formspec = function(player, page)
 	local formspec = "size[8,7.5]"
 		.. default.gui_bg
 		.. default.gui_bg_img
-		.. default.gui_slots
-		.. "list[current_player;main;0,3.5;8,4;]"
+        .. default.gui_slots
+        .. "list[current_player;main;0,3.5;8,4;]" ..
+        default.get_hotbar_bg(0,3.509)
 
 	-- craft page
 	if page == "craft" then
@@ -93,6 +94,7 @@ inventory_plus.get_formspec = function(player, page)
 			-- trash icon
 			.. "list[detached:trash;main;1,2;1,1;]"
 			.. "image[1.1,2.1;0.8,0.8;creative_trash_icon.png]"
+            .. "image[5.998,1;1,1;gui_furnace_arrow_bg.png^[transformR270]"
 	end
 
 	-- creative page
@@ -129,8 +131,10 @@ end
 minetest.register_on_joinplayer(function(player)
 
 	inventory_plus.register_button(player,"craft", "Craft")
-
-	if minetest.setting_getbool("creative_mode") then
+    inventory_plus.register_button(player,"character_creator", "Charakter")
+    inventory_plus.register_button(player,"volume", "Sounds")
+	
+	if minetest.settings:get_bool("creative_mode") then
 		inventory_plus.register_button(player, "creative_prev", "Creative")
 	end