Update in-game gui, new cow model by @stujones11, code tidying and remove unused resources

.gitignore

@@ -26,6 +26,7 @@ gtags.files
 .idea/*
 # Codelite
 *.project
+desktop.ini
 
 ## Files related to minetest development cycle
 /*.patch

games/default/files/bluestone/mesecons/oldwires.lua

@@ -22,7 +22,6 @@ minetest.register_node("mesecons:mesecon_on", {
     drawtype = "raillike",
     tiles = {"jeija_mesecon_on.png", "jeija_mesecon_curved_on.png", "jeija_mesecon_t_junction_on.png", "jeija_mesecon_crossing_on.png"},
     paramtype = "light",
-    is_ground_content = true,
     walkable = false,
     selection_box = {
         type = "fixed",

games/default/files/bluestone/mesecons/wires.lua

@@ -116,7 +116,6 @@ for zmy=0, 1 do
         },
         groups = groups,
         walkable = false,
-        stack_max = 64,
         drop = "mesecons:wire_00000000_off",
         mesecons = {conductor={
             state = mesecon.state.off,
@@ -145,7 +144,6 @@ for zmy=0, 1 do
         },
         groups = {dig_immediate = 3, mesecon = 2, not_in_creative_inventory = 1},
         walkable = false,
-        stack_max = 64,
         drop = "mesecons:wire_00000000_off",
         mesecons = {conductor={
             state = mesecon.state.on,

games/default/files/bluestone/mesecons_delayer/init.lua

@@ -113,7 +113,6 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
     paramtype = "light",
     paramtype2 = "facedir",
     sunlight_propagates = true,
-    is_ground_content = true,
     drop = 'mesecons_delayer:delayer_off_1',
     on_punch = function (pos, node)
         if node.name=="mesecons_delayer:delayer_off_1" then
@@ -168,7 +167,6 @@ minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
     paramtype = "light",
     paramtype2 = "facedir",
     sunlight_propagates = true,
-    is_ground_content = true,
     drop = 'mesecons_delayer:delayer_off_1',
     on_punch = function (pos, node)
         if node.name=="mesecons_delayer:delayer_on_1" then

games/default/files/bluestone/mesecons_solarpanel/init.lua

@@ -10,7 +10,6 @@ minetest.register_node("mesecons_solarpanel:solar_panel_on", {
     wield_image = "jeija_solar_panel.png",
     paramtype = "light",
     walkable = false,
-    is_ground_content = true,
     selection_box = {
         type = "fixed",
         fixed = boxes
@@ -35,7 +34,6 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", {
     wield_image = "jeija_solar_panel.png",
     paramtype = "light",
     walkable = false,
-    is_ground_content = true,
         selection_box = {
         type = "fixed",
         fixed = boxes
@@ -99,7 +97,6 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_on", {
     wield_image = "jeija_solar_panel_inverted.png",
     paramtype = "light",
     walkable = false,
-    is_ground_content = true,
     selection_box = {
         type = "fixed",
         fixed = boxes
@@ -124,7 +121,6 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_off", {
     wield_image = "jeija_solar_panel_inverted.png",
     paramtype = "light",
     walkable = false,
-    is_ground_content = true,
         selection_box = {
         type = "fixed",
         fixed = boxes

games/default/files/bluestone/mesecons_torch/init.lua

@@ -72,7 +72,6 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
     tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"},
     inventory_image = "jeija_torches_on.png",
     wield_image = "jeija_torches_on.png",
-    stack_max = 64,
     paramtype = "light",
     sunlight_propagates = true,
     walkable = false,
@@ -90,7 +89,6 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
 minetest.register_node("mesecons_torch:bluestoneblock", {
     description = "Bluestone Block",
     tiles = {"default_bluestone_block.png"},
-    stack_max = 64,
     groups = {cracky=1, mese = 1},
     sounds = default.node_sound_stone_defaults(),
     mesecons = {receptor = {

games/default/files/bucket/init.lua

@@ -108,7 +108,6 @@ end
 minetest.register_craftitem("bucket:bucket_empty", {
 	description = "Empty Bucket",
 	inventory_image = "bucket.png",
-	stack_max = 99,
 	liquids_pointable = true,
 	on_use = function(itemstack, user, pointed_thing)
 		-- Must be pointing to node

games/default/files/crafting/creative.lua

@@ -214,16 +214,16 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page,
     bg[name] = "crafting_creative_bg.png"
     if name == "inv" then
         main_list = "image[-0.2,1.7;11.35,2.33;crafting_creative_bg.png]"..
-            "image[-0.3,0.15;3,4;crafting_inventory_armor2.png]"..
+            "image[-0.3,0.15;3,4.3;crafting_inventory_armor2.png]"..
             "list[current_player;main;0,3.75;9,3;9]"..
 
-            "list[detached:"..player_name.."_armor;armor;0,1.55;1,1;]"..
-            "list[detached:"..player_name.."_armor;armor;0,2.55;1,1;1]"..
-            "list[detached:"..player_name.."_armor;armor;1,1.55;1,1;2]"..
-            "list[detached:"..player_name.."_armor;armor;1,2.55;1,1;3]"
+            "list[detached:"..player_name.."_armor;armor;0.02,1.7;1,1;]"..
+            "list[detached:"..player_name.."_armor;armor;0.02,2.7;1,1;1]"..
+            "list[detached:"..player_name.."_armor;armor;0.98,1.7;1,1;2]"..
+            "list[detached:"..player_name.."_armor;armor;0.98,2.7;1,1;3]"
     end
     formspec = "size[10,9.3]"..
-        "image_button_exit[10,0;1,1;;exit;X;true;true;]"..
+        "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
         "background[-0.19,-0.25;10.5,9.87;crafting_inventory_creative.png]"..
         "bgcolor[#080808BB;true]"..
         "listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..

games/default/files/crafting/formspecs.lua

@@ -1,6 +1,6 @@
 default.chest_formspec = 
 	"size[9,9.75]"..
-    "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+    "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
 	"background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]"..
 	"bgcolor[#080808BB;true]"..
 	"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
@@ -22,7 +22,7 @@ function default.get_locked_chest_formspec(pos)
 	local spos = pos.x .. "," .. pos.y .. "," ..pos.z
 	local formspec = 
 		"size[9,9.75]"..
-        "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+        "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
 		"background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]"..
 		"bgcolor[#080808BB;true]"..
 		"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..

games/default/files/crafting/init.lua

@@ -79,7 +79,7 @@ local function set_inventory(player)
     end
 
     local form = "size[9,8.75]"..
-    "image_button_exit[8.15,-0.15;1,1;;exit;X;true;true;]"..
+    "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
     "background[-0.19,-0.25;9.41,9.49;crafting_formspec_inv.png]"..
     "bgcolor[#080808BB;true]"..
     "listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
@@ -102,42 +102,19 @@ local function set_inventory(player)
     end
 	local split_form = ""
         split_form = 
-        "list[detached:split;main;7.98,3.14;1,1;]"
+        "list[detached:split;main;7.99,3.15;1,1;]"
     form = form ..
     "list[current_player;main;0,4.5;9,3;9]"..
     "list[current_player;main;0,7.74;9,1;]"..
     "list[current_player;craft;4,1;2,1;1]"..
     "list[current_player;craft;4,2;2,1;4]"..
-    "list[current_player;craftpreview;7,1.5;1,1;]"..
+    "list[current_player;craftpreview;7.05,1.54;1,1;]"..
     split_form..
     "inv"
 
     player:set_inventory_formspec(form)
     end
 
-local function set_workbench(player)
-    player:get_inventory():set_width("craft", 3)
-    player:get_inventory():set_size("craft", 9)
-    player:get_inventory():set_size("main", 9*4)
-
-    local split_form = ""
-        split_form = 
-        "list[detached:split;main;7.98,3.14;1,1;]"
-    local form = "size[9,8.75]"..
-    "image_button_exit[8.15,-0.15;1,1;;exit;X;true;true;]" ..
-    "background[-0.19,-0.25;9.41,9.49;crafting_formspec_workbench.png]"..
-    "bgcolor[#080808BB;true]"..
-    "listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
-    "list[current_player;main;0,4.5;9,3;9]"..
-    "list[current_player;main;0,7.74;9,1;]"..
-    "list[current_player;craft;1.75,0.5;3,3;]"..
-    "list[current_player;craftpreview;5.75,1.5;1,1;]"..
-    split_form..
-    "wob"
-
-    minetest.show_formspec(player:get_player_name(), "main", form)
-end
-
 --drop craf items and reset inventory on closing
 minetest.register_on_player_receive_fields(function(player, formname, fields)
     if fields.quit then
@@ -185,26 +162,6 @@ minetest.register_on_joinplayer(function(player)
 	end)
 end)
 
-minetest.register_node("crafting:workbench", {
-    description = "Workbench",
-    tiles = {"crafting_workbench_top.png", "default_wood.png", "crafting_workbench_side.png",
-        "crafting_workbench_side.png", "crafting_workbench_front.png", "crafting_workbench_front.png"},
-    paramtype2 = "facedir",
-    paramtype = "light",
-    groups = {choppy=2,oddly_breakable_by_hand=2,flammable=2, decorative = 1},
-    on_rightclick = function(pos, node, clicker, itemstack)
-        set_workbench(clicker)
-    end
-})
-
-minetest.register_craft({
-	output = "crafting:workbench",
-	recipe = {
-		{"group:wood", "group:wood"},
-		{"group:wood", "group:wood"}
-	}
-})
-
 local split_inv = minetest.create_detached_inventory("split", {
     allow_move = function(_, _, _, _, _, count, _)
         return count

games/default/files/creative/init.lua

@@ -15,7 +15,7 @@ if minetest.setting_getbool("creative_mode") then
 				choppy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
 				oddly_breakable_by_hand = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
 			},
-			damage_groups = {fleshy = 10},
+			damage_groups = {fleshy = 5},
 		}
 	})
 

games/default/files/default/aliases.lua

@@ -72,3 +72,6 @@ minetest.register_alias("default:pinewood", "default:pine_wood")
 minetest.register_alias("default:gold_nugget", "default:gold_ingot")
 -- Sandstone Carved
 minetest.register_alias("default:sandstonecarved", "default:sandstonesmooth")
+
+-- Workbench
+minetest.register_alias("crafting:workbench", "default:workbench")

games/default/files/default/craftitems.lua

@@ -7,7 +7,6 @@
 minetest.register_craftitem("default:stick", {
     description = "Stick",
     inventory_image = "default_stick.png",
-    stack_max = 64,
     groups = {materials = 1},
 
 })
@@ -15,91 +14,78 @@ minetest.register_craftitem("default:stick", {
 minetest.register_craftitem("default:paper", {
     description = "Paper",
     inventory_image = "default_paper.png",
-    stack_max = 64,
     groups = {misc = 1},
 })
 
 minetest.register_craftitem("default:book", {
     description = "Book",
     inventory_image = "default_book.png",
-    stack_max = 64,
     groups = {misc = 1},
 })
 
 minetest.register_craftitem("default:coal_lump", {
     description = "Coal Lump",
     inventory_image = "default_coal_lump.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:charcoal_lump", {
     description = "Charcoal Lump",
     inventory_image = "default_charcoal_lump.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:diamond", {
     description = "Diamond",
     inventory_image = "default_diamond.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:clay_lump", {
     description = "Clay Lump",
     inventory_image = "default_clay_lump.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:steel_ingot", {
     description = "Steel Ingot",
     inventory_image = "default_steel_ingot.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:gold_ingot", {
     description = "Gold Ingot",
     inventory_image = "default_gold_ingot.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:emerald", {
     description = "Emerald",
     inventory_image = "default_emerald.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:clay_brick", {
     description = "Clay Brick",
     inventory_image = "default_clay_brick.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:gunpowder", {
     description = "Gunpowder",
     inventory_image = "default_gunpowder.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:bone", {
     description = "Bone",
     inventory_image = "default_bone.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:glowstone_dust", {
     description = "Glowstone Dust",
     inventory_image = "default_glowstone_dust.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
@@ -108,7 +94,6 @@ minetest.register_craftitem("default:fish_raw", {
     groups = {},
     inventory_image = "default_fish.png",
     on_use = minetest.item_eat(2),
-    stack_max = 64,
     groups = {foodstuffs = 1},
 })
 
@@ -117,21 +102,18 @@ minetest.register_craftitem("default:fish", {
     groups = {},
     inventory_image = "default_fish_cooked.png",
     on_use = minetest.item_eat(4),
-    stack_max = 64,
     groups = {foodstuffs = 1},
 })
 
 minetest.register_craftitem("default:sugar", {
     description = "Sugar",
     inventory_image = "default_sugar.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
 minetest.register_craftitem("default:string",{
     description = "String",
     inventory_image = "default_string.png",
-    stack_max = 64,
     groups = {materials = 1},
 })
 
@@ -139,6 +121,5 @@ minetest.register_craftitem("default:string",{
 minetest.register_craftitem("default:quartz_crystal", {
     description = "Quartz Crystal",
     inventory_image = "default_quartz_crystal.png",
-    stack_max = 64,
     groups = {materials = 1},
 })

games/default/files/default/functions.lua

@@ -425,7 +425,6 @@ function AddGlass(desc, recipeitem, color)
         tiles = {"xpanes_pane_glass"..color..".png"},
         paramtype = "light",
         use_texture_alpha = true,
-        stack_max = 64,
         groups = {cracky=3, oddly_breakable_by_hand = 3, building = 1},
         sounds = default.node_sound_glass_defaults(),
         drop = "",

games/default/files/default/furnace.lua

@@ -6,31 +6,31 @@
 local function active_formspec(fuel_percent, item_percent)
 	local formspec =
 	"size[9,8.75]"..
-	"image_button_exit[8.15,-0.15;1,1;;exit;X;true;true;]"..
-	"background[-0.19,-0.25;9.41,9.49;crafting_formspec_furnace.png]"..
+	"image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
+	"background[-0.19,-0.25;9.41,9.49;formspec_furnace.png]"..
 	"bgcolor[#080808BB;true]"..
 	"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
 	"list[current_player;main;0,4.5;9,3;9]"..
 	"list[current_player;main;0,7.74;9,1;]"..
-	"list[current_name;src;2.75,0.5;1,1;]"..
-	"list[current_name;fuel;2.75,2.5;1,1;]"..
-	"list[current_name;dst;5.75,1.5;1,1;]"..
-	"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
+	"list[current_name;src;3,0.5;1,1;]"..
+	"list[current_name;fuel;3,2.5;1,1;]"..
+	"list[current_name;dst;5,1.5;1,1;]"..
+	"image[3,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
 	(100-fuel_percent)..":default_furnace_fire_fg.png]"
 	return formspec
 end
 
 local inactive_formspec =
 	"size[9,8.75]"..
-    "image_button_exit[8.15,-0.15;1,1;;exit;X;true;true;]"..
-	"background[-0.19,-0.25;9.41,9.49;crafting_formspec_furnace.png]"..
+	"image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
+	"background[-0.19,-0.25;9.41,9.49;formspec_furnace.png]"..
 	"bgcolor[#080808BB;true]"..
 	"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
 	"list[current_player;main;0,4.5;9,3;9]"..
 	"list[current_player;main;0,7.74;9,1;]"..
-	"list[current_name;src;2.75,0.5;1,1;]"..
-	"list[current_name;fuel;2.75,2.5;1,1;]"..
-	"list[current_name;dst;5.75,1.5;1,1;]"
+	"list[current_name;src;3,0.5;1,1;]"..
+	"list[current_name;fuel;3,2.5;1,1;]"..
+	"list[current_name;dst;5,1.5;1,1;]"
 
 --
 -- Node callback functions that are the same for active and inactive furnace

games/default/files/default/init.lua

@@ -19,3 +19,4 @@ dofile(minetest.get_modpath("default").."/player.lua")
 dofile(minetest.get_modpath("default").."/trees.lua")
 dofile(minetest.get_modpath("default").."/aliases.lua")
 dofile(minetest.get_modpath("default").."/furnace.lua")
+dofile(minetest.get_modpath("default").."/workbench.lua")

games/default/files/default/nodes.lua

@@ -4,137 +4,9 @@
 -- Node definitions
 --
 
-minetest.register_node("default:dirt_with_snow", {
-	description = "Dirt with Snow",
-	stack_max = 64,
-	tiles = {"default_snow.png", "default_dirt.png",
-		{name = "default_snow_side.png",
-			tileable_vertical = false}},
-	groups = {crumbly = 3, soil = 1},
-	drop = 'default:dirt',
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name = "default_snow_footstep", gain = 0.25},
-	}),
-})
-
-minetest.register_node("default:snow", {
-	description = "Snow",
-	stack_max = 64,
-	tiles = {"default_snow.png"},
-	inventory_image = "default_snowball.png",
-	wield_image = "default_snowball.png",
-	paramtype = "light",
-	buildable_to = true,
-	drawtype = "nodebox",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, -0.25, 0.5},
-		},
-	},
-	groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1},
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name = "default_snow_footstep", gain = 0.25},
-		dug = {name = "default_snow_footstep", gain = 0.75},
-	}),
-
-	on_construct = function(pos)
-		pos.y = pos.y - 1
-		if minetest.get_node(pos).name == "default:dirt_with_grass" then
-			minetest.set_node(pos, {name = "default:dirt_with_snow"})
-		end
-	end,
-})
-
-minetest.register_node("default:snowblock", {
-	description = "Snow Block",
-	stack_max = 64,
-	tiles = {"default_snow.png"},
-	groups = {crumbly = 3, puts_out_fire = 1},
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name = "default_snow_footstep", gain = 0.25},
-		dug = {name = "default_snow_footstep", gain = 0.75},
-	}),
-})
-
-
-minetest.register_node("default:ice", {
-	description = "Ice",
-	tiles = {"default_ice.png"},
-	is_ground_content = false,
-	paramtype = "light",
-	groups = {cracky = 3, puts_out_fire = 1},
-	sounds = default.node_sound_glass_defaults(),
-})
-
-minetest.register_node("default:pine_tree", {
-	description = "Pine Tree",
-	stack_max = 64,
-	tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png",
-		"default_pine_tree.png"},
-	paramtype2 = "facedir",
-	is_ground_content = false,
-	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
-	sounds = default.node_sound_wood_defaults(),
-	on_place = minetest.rotate_node
-})
-
-minetest.register_node("default:pine_wood", {
-	description = "Pine Wood Planks",
-	stack_max = 64,
-	tiles = {"default_pine_wood.png"},
-	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
-	sounds = default.node_sound_wood_defaults(),
-})
-
-minetest.register_node("default:pine_needles",{
-	description = "Pine Needles",
-	stack_max = 64,
-	drawtype = "allfaces_optional",
-	visual_scale = 1.3,
-	tiles = {"default_pine_needles.png"},
-	waving = 1,
-	paramtype = "light",
-	is_ground_content = false,
-	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:pine_sapling"}, rarity = 20},
-			{items = {"default:pine_needles"}}
-		}
-	},
-	sounds = default.node_sound_leaves_defaults(),
-
-	after_place_node = default.after_place_leaves,
-})
-
-minetest.register_node("default:pine_sapling", {
-	description = "Pine Sapling",
-	stack_max = 64,
-	drawtype = "plantlike",
-	visual_scale = 1.0,
-	tiles = {"default_pine_sapling.png"},
-	inventory_image = "default_pine_sapling.png",
-	wield_image = "default_pine_sapling.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
-	},
-	groups = {snappy = 2, dig_immediate = 3, flammable = 2,
-		attached_node = 1, sapling = 1},
-	sounds = default.node_sound_leaves_defaults(),
-})
-
 minetest.register_node("default:stone", {
     description = "Stone",
     tiles = {"default_stone.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=3, stone=1, building = 1, decorative = 1},
     drop = 'default:cobble',
     legacy_mineral = true,
@@ -144,8 +16,6 @@ minetest.register_node("default:stone", {
 minetest.register_node("default:stone_with_coal", {
     description = "Coal Ore",
     tiles = {"default_stone.png^default_mineral_coal.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=3, building = 1},
     drop = 'default:coal_lump',
     sounds = default.node_sound_stone_defaults(),
@@ -154,8 +24,6 @@ minetest.register_node("default:stone_with_coal", {
 minetest.register_node("default:stone_with_iron", {
     description = "Iron Ore",
     tiles = {"default_stone.png^default_mineral_iron.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=2, building = 1},
     drop = 'default:stone_with_iron',
     sounds = default.node_sound_stone_defaults(),
@@ -165,8 +33,6 @@ minetest.register_node("default:stone_with_iron", {
 minetest.register_node("default:stone_with_gold", {
     description = "Gold Ore",
     tiles = {"default_stone.png^default_mineral_gold.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=2, building = 1},
     drop = "default:stone_with_gold",
     sounds = default.node_sound_stone_defaults(),
@@ -176,8 +42,6 @@ minetest.register_node("default:stone_with_gold", {
 minetest.register_node("default:stone_with_bluestone", {
     description = "Bluestone Ore",
     tiles = {"default_stone.png^default_mineral_bluestone.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=2, building = 1},
     drop = "mesecons:wire_00000000_off 5",
     sounds = default.node_sound_stone_defaults(),
@@ -186,8 +50,6 @@ minetest.register_node("default:stone_with_bluestone", {
 minetest.register_node("default:stone_with_lapis", {
     description = "Lapis Lazuli Ore",
     tiles = {"default_stone.png^default_mineral_lapis.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=2, building = 1},
     drop = {
         max_items = 2,
@@ -205,8 +67,6 @@ minetest.register_node("default:stone_with_lapis", {
 minetest.register_node("default:stone_with_emerald", {
     description = "Emerald Ore",
     tiles = {"default_stone.png^default_mineral_emerald.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=2, building = 1},
     drop = "default:emerald",
 --  drop = {
@@ -222,8 +82,6 @@ minetest.register_node("default:stone_with_emerald", {
 minetest.register_node("default:stone_with_diamond", {
     description = "Diamonds in Stone",
     tiles = {"default_stone.png^default_mineral_diamond.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=1, building = 1},
     drop = "default:diamond",
     sounds = default.node_sound_stone_defaults(),
@@ -232,7 +90,6 @@ minetest.register_node("default:stone_with_diamond", {
 minetest.register_node("default:stonebrick", {
     description = "Stone Brick",
     tiles = {"default_stone_brick.png"},
-    stack_max = 64,
     groups = {cracky=3, stone=1, building = 1, decorative = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -240,7 +97,6 @@ minetest.register_node("default:stonebrick", {
 minetest.register_node("default:stonebrickcarved", {
     description = "Stone Brick Carved",
     tiles = {"default_stonebrick_carved.png"},
-    stack_max = 64,
     groups = {cracky=3, stone=1, building = 1, decorative = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -248,7 +104,6 @@ minetest.register_node("default:stonebrickcarved", {
 minetest.register_node("default:stonebrickcracked", {
     description = "Stone Brick Cracked",
     tiles = {"default_stonebrick_cracked.png"},
-    stack_max = 64,
     groups = {cracky=3, stone=1, building = 1, decorative = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -256,7 +111,6 @@ minetest.register_node("default:stonebrickcracked", {
 minetest.register_node("default:stonebrickmossy", {
     description = "Mossy Stone Brick",
     tiles = {"default_stonebrick_mossy.png"},
-    stack_max = 64,
     groups = {cracky=3, stone=1, building = 1, decorative = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -264,8 +118,6 @@ minetest.register_node("default:stonebrickmossy", {
 minetest.register_node("default:dirt_with_grass", {
     description = "Dirt with Grass",
     tiles = {"default_grass.png", "default_dirt.png", "default_grass_side.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, soil=1, building = 1},
     drop = 'default:dirt',
     sounds = default.node_sound_dirt_defaults({
@@ -277,8 +129,6 @@ minetest.register_node("default:dirt_with_dry_grass", {
     description = "Dirt with Dry Grass",
     tiles = {"default_dry_grass.png", "default_dirt.png",
 		"default_dry_grass_side.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, soil=1, building = 1},
     drop = "default:dirt",
     sounds = default.node_sound_dirt_defaults({
@@ -289,8 +139,6 @@ minetest.register_node("default:dirt_with_dry_grass", {
 minetest.register_node("default:dirt_with_grass_footsteps", {
     description = "Dirt with Grass and Footsteps",
     tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, not_in_creative_inventory=1, soil=1},
     drop = 'default:dirt',
     sounds = default.node_sound_dirt_defaults({
@@ -300,21 +148,19 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 
 minetest.register_node("default:dirt_with_snow", {
 	description = "Dirt with Snow",
-    tiles = {"default_snow.png", "default_dirt.png", "default_dirt.png^default_snow_side.png"},
-    is_ground_content = true,
-    stack_max = 64,
-    groups = {crumbly=3, building = 1},
+	tiles = {"default_snow.png", "default_dirt.png",
+		{name = "default_snow_side.png",
+			tileable_vertical = false}},
+	groups = {crumbly = 3, soil = 1, building = 1},
 	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
-        footstep = {name="default_grass_footstep", gain=0.4},
+		footstep = {name = "default_snow_footstep", gain = 0.4},
 	}),
 })
 
 minetest.register_node("default:dirt", {
     description = "Dirt",
     tiles = {"default_dirt.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, soil=1, building = 1},
     sounds = default.node_sound_dirt_defaults(),
 })
@@ -323,8 +169,6 @@ minetest.register_node("default:dirt", {
 minetest.register_node("default:gravel", {
     description = "Gravel",
     tiles = {"default_gravel.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 2, falling_node = 1, building = 1},
     drop = {
         max_items = 1,
@@ -342,8 +186,6 @@ minetest.register_node("default:gravel", {
 minetest.register_node("default:sand", {
     description = "Sand",
     tiles = {"default_sand.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, falling_node = 1, sand=1, building = 1},
     sounds = default.node_sound_sand_defaults(),
 })
@@ -351,8 +193,6 @@ minetest.register_node("default:sand", {
 minetest.register_node("default:sandstone", {
     description = "Sandstone",
     tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_normal.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 2,cracky=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -360,8 +200,6 @@ minetest.register_node("default:sandstone", {
 minetest.register_node("default:sandstonesmooth", {
     description = "Sandstone Smooth",
     tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_smooth.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 2,cracky=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -371,8 +209,6 @@ minetest.register_node("default:sandstonesmooth", {
 minetest.register_node("default:redsand", {
     description = "Red Sand",
     tiles = {"default_red_sand.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, falling_node = 1, redsand=1, building = 1},
     sounds = default.node_sound_sand_defaults(),
 })
@@ -380,8 +216,6 @@ minetest.register_node("default:redsand", {
 minetest.register_node("default:redsandstone", {
     description = "Red SandStone",
     tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 2,cracky=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -389,8 +223,6 @@ minetest.register_node("default:redsandstone", {
 minetest.register_node("default:redsandstonesmooth", {
     description = "Red SandStone Smooth",
     tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_smooth.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 2,cracky=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -398,8 +230,6 @@ minetest.register_node("default:redsandstonesmooth", {
 minetest.register_node("default:redsandstonecarved", {
     description = "Red SandStone Carved",
     tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_carved.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 2,cracky=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -409,8 +239,6 @@ minetest.register_node("default:redsandstonecarved", {
 minetest.register_node("default:clay", {
     description = "Clay",
     tiles = {"default_clay.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, building = 1},
     drop = 'default:clay_lump 4',
     sounds = default.node_sound_dirt_defaults({
@@ -421,7 +249,6 @@ minetest.register_node("default:clay", {
 minetest.register_node("default:brick", {
     description = "Brick Block",
     tiles = {"default_brick.png"},
-    stack_max = 64,
     groups = {cracky=3, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -429,7 +256,6 @@ minetest.register_node("default:brick", {
 minetest.register_node("default:haybale", {
     description = "Hay Bale",
     tiles = {"default_hayblock_top.png", "default_hayblock_top.png", "default_hayblock_side.png"},
-    stack_max = 64,
     paramtype2 = "facedir",
     is_ground_content = false,
     on_place = minetest.rotate_node,
@@ -444,7 +270,6 @@ minetest.register_node("default:haybale", {
 
 minetest.register_node("default:tree", {
 	description = "Tree",
-	stack_max = 64,
 	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -456,7 +281,6 @@ minetest.register_node("default:tree", {
 
 minetest.register_node("default:wood", {
 	description = "Wooden Planks",
-	stack_max = 64,
 	tiles = {"default_wood.png"},
 	is_ground_content = false,
 	material = "default:wood",
@@ -466,7 +290,6 @@ minetest.register_node("default:wood", {
 
 minetest.register_node("default:sapling", {
 	description = "Sapling",
-	stack_max = 64,
 	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"default_sapling.png"},
@@ -486,7 +309,6 @@ minetest.register_node("default:sapling", {
 
 minetest.register_node("default:leaves", {
 	description = "Leaves",
-	stack_max = 64,
 	drawtype = "allfaces_optional",
 	waving = 1,
 	visual_scale = 1.3,
@@ -514,37 +336,8 @@ minetest.register_node("default:leaves", {
 	after_place_node = default.after_place_leaves,
 })
 
-minetest.register_node("default:apple", {
-	description = "Apple",
-	stack_max = 64,
-	drawtype = "plantlike",
-	visual_scale = 1.0,
-	tiles = {"default_apple.png"},
-	inventory_image = "default_apple.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	is_ground_content = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
-	},
-	groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
-		leafdecay = 3, leafdecay_drop = 1},
-	on_use = minetest.item_eat(2),
-	sounds = default.node_sound_leaves_defaults(),
-
-	after_place_node = function(pos, placer, itemstack)
-		if placer:is_player() then
-			minetest.set_node(pos, {name = "default:apple", param2 = 1})
-		end
-	end,
-})
-
-
 minetest.register_node("default:jungletree", {
 	description = "Jungle Tree",
-	stack_max = 64,
 	tiles = {"default_jungletree_top.png", "default_jungletree_top.png",
 		"default_jungletree.png"},
 	paramtype2 = "facedir",
@@ -557,7 +350,6 @@ minetest.register_node("default:jungletree", {
 
 minetest.register_node("default:junglewood", {
 	description = "Junglewood Planks",
-	stack_max = 64,
 	tiles = {"default_junglewood.png"},
 	is_ground_content = false,
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
@@ -566,7 +358,6 @@ minetest.register_node("default:junglewood", {
 
 minetest.register_node("default:jungleleaves", {
 	description = "Jungle Leaves",
-	stack_max = 64,
 	drawtype = "allfaces_optional",
 	waving = 1,
 	visual_scale = 1.3,
@@ -588,7 +379,6 @@ minetest.register_node("default:jungleleaves", {
 
 minetest.register_node("default:junglesapling", {
 	description = "Jungle Sapling",
-	stack_max = 64,
 	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"default_junglesapling.png"},
@@ -606,10 +396,8 @@ minetest.register_node("default:junglesapling", {
 	sounds = default.node_sound_leaves_defaults(),
 })
 
-
 minetest.register_node("default:pine_tree", {
 	description = "Pine Tree",
-	stack_max = 64,
 	tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png",
 		"default_pine_tree.png"},
 	paramtype2 = "facedir",
@@ -622,16 +410,15 @@ minetest.register_node("default:pine_tree", {
 
 minetest.register_node("default:pine_wood", {
 	description = "Pine Wood Planks",
-	stack_max = 64,
 	tiles = {"default_pine_wood.png"},
 	is_ground_content = false,
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
 	sounds = default.node_sound_wood_defaults(),
 })
 
+
 minetest.register_node("default:pine_needles",{
 	description = "Pine Needles",
-	stack_max = 64,
 	drawtype = "allfaces_optional",
 	visual_scale = 1.3,
 	tiles = {"default_pine_needles.png"},
@@ -653,7 +440,6 @@ minetest.register_node("default:pine_needles",{
 
 minetest.register_node("default:pine_sapling", {
 	description = "Pine Sapling",
-	stack_max = 64,
 	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"default_pine_sapling.png"},
@@ -671,10 +457,8 @@ minetest.register_node("default:pine_sapling", {
 	sounds = default.node_sound_leaves_defaults(),
 })
 
-
 minetest.register_node("default:acacia_tree", {
 	description = "Acacia Tree",
-	stack_max = 64,
 	tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png",
 		"default_acacia_tree.png"},
 	paramtype2 = "facedir",
@@ -687,7 +471,6 @@ minetest.register_node("default:acacia_tree", {
 
 minetest.register_node("default:acacia_wood", {
 	description = "Acacia Wood Planks",
-	stack_max = 64,
 	tiles = {"default_acacia_wood.png"},
 	is_ground_content = false,
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
@@ -696,7 +479,6 @@ minetest.register_node("default:acacia_wood", {
 
 minetest.register_node("default:acacia_leaves", {
 	description = "Acacia Leaves",
-	stack_max = 64,
 	drawtype = "allfaces_optional",
 	visual_scale = 1.3,
 	tiles = {"default_acacia_leaves.png"},
@@ -718,7 +500,6 @@ minetest.register_node("default:acacia_leaves", {
 
 minetest.register_node("default:acacia_sapling", {
 	description = "Acacia Tree Sapling",
-	stack_max = 64,
 	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"default_acacia_sapling.png"},
@@ -740,7 +521,6 @@ minetest.register_node("default:acacia_sapling", {
 
 minetest.register_node("default:junglegrass", {
 	description = "Jungle Grass",
-	stack_max = 64,
 	drawtype = "plantlike",
 	waving = 1,
 	visual_scale = 1.3,
@@ -763,8 +543,6 @@ minetest.register_node("default:cactus", {
     description = "Cactus",
     drawtype = "nodebox",
     tiles = {"default_cactus_top.png", "default_cactus_bottom.png", "default_cactus_side.png","default_cactus_side.png","default_cactus_side.png","default_cactus_side.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {snappy = 1, choppy = 3, flammable = 2, decorative = 1},
     sounds = default.node_sound_wood_defaults(),
     paramtype = "light",
@@ -817,7 +595,6 @@ minetest.register_node("default:reeds", {
     wield_image = "default_sugar_cane.png",
     paramtype = "light",
     walkable = false,
-    is_ground_content = true,
     node_box = {
         type = "fixed",
         fixed = {
@@ -834,7 +611,6 @@ minetest.register_node("default:reeds", {
             {-7/16, -8/16, -7/16, 7/16, 8/16, 7/16},
         },
     },
-    stack_max = 64,
     groups = {snappy = 3, flammable = 2, materials=1},
     sounds = default.node_sound_leaves_defaults(),
 })
@@ -842,7 +618,6 @@ minetest.register_node("default:reeds", {
 
 minetest.register_node("default:quartz_ore", {
     description = "Quartz Ore",
-    stack_max = 64,
     tiles = {"default_quartz_ore.png"},
     groups = {cracky=3, stone=1, building = 1},
     drop = 'default:quartz_crystal',
@@ -851,7 +626,6 @@ minetest.register_node("default:quartz_ore", {
 
 minetest.register_node("default:quartz_block", {
     description = "Quartz Block",
-    stack_max = 64,
     tiles = {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"},
     groups = {snappy = 1,bendy=2,cracky=1,level=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
@@ -859,7 +633,6 @@ minetest.register_node("default:quartz_block", {
 
 minetest.register_node("default:quartz_chiseled", {
     description = "Chiseled Quartz",
-    stack_max = 64,
     tiles = {"default_quartz_chiseled_top.png", "default_quartz_chiseled_top.png", "default_quartz_chiseled_side.png"},
     groups = {snappy = 1,bendy=2,cracky=1,level=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
@@ -867,7 +640,6 @@ minetest.register_node("default:quartz_chiseled", {
 
 minetest.register_node("default:quartz_pillar", {
     description = "Quartz Pillar",
-    stack_max = 64,
     paramtype2 = "facedir",
     on_place = minetest.rotate_node,
     tiles = {"default_quartz_pillar_top.png", "default_quartz_pillar_top.png", "default_quartz_pillar_side.png"},
@@ -878,7 +650,6 @@ minetest.register_node("default:quartz_pillar", {
 minetest.register_node("default:bedrock", {
     description = "Bedrock",
     tiles = {"default_bedrock.png"},
-    stack_max = 64,
     groups = {oddly_breakable_by_hand = 5, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -886,7 +657,6 @@ minetest.register_node("default:bedrock", {
 minetest.register_node("default:bookshelf", {
     description = "Bookshelf",
     tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
-    stack_max = 64,
     groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3, building = 1},
     sounds = default.node_sound_wood_defaults(),
 })
@@ -906,7 +676,6 @@ minetest.register_node("default:slimeblock", {
     paramtype = "light",
     use_texture_alpha = true,
     sunlight_propagates = true,
-    stack_max = 64,
     groups = {oddly_breakable_by_hand = 3,dig_immediate=2,bouncy=70,disable_jump=1, fall_damage_add_percent=-100, building = 1},
 })
 
@@ -916,7 +685,6 @@ minetest.register_node("default:glass", {
     tiles = {"default_glass.png"},
     paramtype = "light",
     sunlight_propagates = true,
-    stack_max = 64,
     groups = {cracky=3, oddly_breakable_by_hand = 3, building = 1},
     sounds = default.node_sound_glass_defaults(),
     drop = "",
@@ -955,7 +723,6 @@ minetest.register_node("default:ladder", {
         --wall_bottom = = <default>
         --wall_side = = <default>
     },
-    stack_max = 64,
     groups = {choppy = 2, oddly_breakable_by_hand = 3, flammable = 2, decorative = 1},
     legacy_wallmounted = true,
     sounds = default.node_sound_wood_defaults(),
@@ -974,7 +741,6 @@ minetest.register_node("default:vine", {
     selection_box = {
         type = "wallmounted",
     },
-    stack_max = 64,
     groups = {choppy = 2, oddly_breakable_by_hand = 3, flammable = 2, decorative = 1},
     legacy_wallmounted = true,
     sounds = default.node_sound_leaves_defaults(),
@@ -1002,7 +768,7 @@ minetest.register_node("default:vine", {
 minetest.register_node("default:cloud", {
 	description = "Cloud",
 	tiles = {"default_cloud.png"},
-    stack_max = 64,
+	is_ground_content = false,
 	sounds = default.node_sound_defaults(),
 	groups = {not_in_creative_inventory = 1},
 })
@@ -1370,7 +1136,6 @@ minetest.register_node("default:chest", {
     tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
         "default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
     paramtype2 = "facedir",
-    stack_max = 64,
     groups = {choppy = 2, oddly_breakable_by_hand = 2, decorative = 1},
     legacy_facedir_simple = true,
     sounds = default.node_sound_wood_defaults(),
@@ -1382,7 +1147,7 @@ minetest.register_node("default:chest", {
             local p = get_chest_neighborpos(pos, param2, "right")
             meta:set_string("formspec",
                     "size[9,11.5]"..
-                    "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+                    "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
                     "list[nodemeta:"..p.x..","..p.y..","..p.z..";main;0,0;9,3;]"..
                     "list[current_name;main;0,3;9,3;]"..
                     "list[current_player;main;0,7;9,3;9]"..
@@ -1392,7 +1157,7 @@ minetest.register_node("default:chest", {
             local m = minetest.env:get_meta(p)
             m:set_string("formspec",
                     "size[9,11.5]"..
-                    "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+                    "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
                     "list[current_name;main;0,0;9,3;]"..
                     "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,3;9,3;]"..
                     "list[current_player;main;0,7;9,3;9]"..
@@ -1403,7 +1168,7 @@ minetest.register_node("default:chest", {
             local p = get_chest_neighborpos(pos, param2, "left")
             meta:set_string("formspec",
                     "size[9,11.5]"..
-                    "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+                    "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
                     "list[current_name;main;0,0;9,3;]"..
                     "list[nodemeta:"..p.x..","..p.y..","..p.z..";main;0,3;9,3;]"..
                     "list[current_player;main;0,7;9,3;9]"..
@@ -1413,7 +1178,7 @@ minetest.register_node("default:chest", {
             local m = minetest.env:get_meta(p)
             m:set_string("formspec",
                     "size[9,11.5]"..
-                    "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+                    "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
                     "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0;9,3;]"..
                     "list[current_name;main;0,3;9,3;]"..
                     "list[current_player;main;0,7;9,3;9]"..
@@ -1422,7 +1187,7 @@ minetest.register_node("default:chest", {
         else
             meta:set_string("formspec",
                     "size[9,8.5]"..
-                    "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+                    "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
                     "list[current_name;main;0,0;9,3;]"..
                     "list[current_player;main;0,4;9,3;9]"..
                     "list[current_player;main;0,7.5.5;9,1;]")
@@ -1486,7 +1251,7 @@ minetest.register_node("default:chest_left", {
         local meta = minetest.env:get_meta(p)
         meta:set_string("formspec",
                 "size[9,8.5]"..
-                "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+                "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
                 "list[current_name;main;0,0;9,3;]"..
                 "list[current_player;main;0,4;9,3;9]"..
                 "list[current_player;main;0,7.5.5;9,1;]")
@@ -1541,7 +1306,7 @@ minetest.register_node("default:chest_right", {
         local meta = minetest.env:get_meta(p)
         meta:set_string("formspec",
                 "size[9,8.5]"..
-                "image_button_exit[9,0;1,1;;exit;X;true;true;]"..
+                "image_button_exit[9,0;1,1;close.png;exit;;true;true;]"..
                 "list[current_name;main;0,0;9,3;]"..
                 "list[current_player;main;0,4;9,3;9]"..
                 "list[current_player;main;0,7.5.5;9,1;]")
@@ -1580,8 +1345,6 @@ minetest.register_node("default:chest_right", {
 minetest.register_node("default:cobble", {
     description = "Cobblestone",
     tiles = {"default_cobble.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=3, stone=2, building = 1, decorative = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -1589,8 +1352,6 @@ minetest.register_node("default:cobble", {
 minetest.register_node("default:mossycobble", {
     description = "Mossy Cobblestone",
     tiles = {"default_mossycobble.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=3, building = 1, decorative = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -1598,8 +1359,6 @@ minetest.register_node("default:mossycobble", {
 minetest.register_node("default:steelblock", {
     description = "Steel Block",
     tiles = {"default_steel_block.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=1,level=2, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -1607,8 +1366,6 @@ minetest.register_node("default:steelblock", {
 minetest.register_node("default:goldblock", {
     description = "Gold Block",
     tiles = {"default_gold_block.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=1, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -1616,8 +1373,6 @@ minetest.register_node("default:goldblock", {
 minetest.register_node("default:diamondblock", {
     description = "Diamond Block",
     tiles = {"default_diamond_block.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=1, level=3, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -1625,7 +1380,6 @@ minetest.register_node("default:diamondblock", {
 minetest.register_node("default:lapisblock", {
     description = "Lapis Lazul Block",
     tiles = {"default_lapis_block.png"},
-    stack_max = 64,
     groups = {cracky=1, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -1633,7 +1387,6 @@ minetest.register_node("default:lapisblock", {
 minetest.register_node("default:emeraldblock", {
     description = "Emerald Block",
     tiles = {"default_emerald_block.png"},
-    stack_max = 64,
     groups = {cracky=1, building = 1},
     sounds = default.node_sound_stone_defaults(),
 })
@@ -1641,29 +1394,32 @@ minetest.register_node("default:emeraldblock", {
 minetest.register_node("default:obsidian", {
     description = "Obsidian",
     tiles = {"default_obsidian.png"},
-    is_ground_content = true,
     sounds = default.node_sound_stone_defaults(),
-    stack_max = 64,
     groups = {cracky=4, level=2, oddly_breakable_by_hand = 4, building = 1},
 })
 
 minetest.register_node("default:apple", {
 	description = "Apple",
 	drawtype = "plantlike",
-    visual_scale = 1.0,
+	visual_scale = 0.75,
 	tiles = {"default_apple.png"},
 	inventory_image = "default_apple.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
+	is_ground_content = false,
 	selection_box = {
 		type = "fixed",
-        fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
+		fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16}
 	},
-    stack_max = 64,
-    groups = {fleshy=3,dig_immediate=3,flammable=2, foodstuffs = 1},
-    on_use = minetest.item_eat(4),
-    sounds = default.node_sound_defaults(),
+	groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
+		leafdecay = 3, leafdecay_drop = 1, foodstuffs = 1},
+	on_use = minetest.item_eat(2),
+	sounds = default.node_sound_leaves_defaults(),
+
+	after_place_node = function(pos, placer, itemstack)
+		minetest.set_node(pos, {name = "default:apple", param2 = 1})
+	end,
 })
 
 minetest.register_node("default:apple_gold", {
@@ -1679,7 +1435,6 @@ minetest.register_node("default:apple_gold", {
         type = "fixed",
         fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
     },
-    stack_max = 64,
     groups = {fleshy=3,dig_immediate=3, flammable = 2, foodstuffs = 1},
     on_use = minetest.item_eat(8),
     sounds = default.node_sound_defaults(),
@@ -1694,7 +1449,6 @@ minetest.register_node("default:dry_shrub", {
     wield_image = "default_dry_shrub.png",
     paramtype = "light",
     walkable = false,
-    stack_max = 64,
     groups = {snappy = 3, flammable = 3,attached_node=1, decorative = 1},
     sounds = default.node_sound_leaves_defaults(),
     selection_box = {
@@ -1727,7 +1481,6 @@ minetest.register_node("default:grass", {
        -- }
     --},
     paramtype = "light",
-    is_ground_content = true,
     groups = {snappy = 3, flammable = 3,attached_node=1,dig_immediate=3, decorative=1, grass=1},
     sounds = default.node_sound_leaves_defaults(),
     after_dig_node = function(pos, oldnode, oldmetadata, user)
@@ -1747,7 +1500,6 @@ minetest.register_node("default:dry_grass", {
     walkable = false,
     buildable_to = true,
     paramtype = "light",
-    is_ground_content = true,
     groups = {snappy = 3, flammable = 3, attached_node=1, dig_immediate=3, decorative=1, grass=1},
     sounds = default.node_sound_leaves_defaults(),
     after_dig_node = function(pos, oldnode, oldmetadata, user)
@@ -1761,8 +1513,6 @@ minetest.register_node("default:dry_grass", {
 minetest.register_node("default:glowstone", {
     description = "Glowstone",
     tiles = {"default_glowstone.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {cracky=3, building = 1},
     drop = {
     max_items = 1,
@@ -1786,7 +1536,6 @@ minetest.register_node("default:sponge", {
     pointable = true,
     diggable = true,
     buildable_to = false,
-    stack_max = 64,
     groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, flammable = 3, building = 1},
         on_place = function(itemstack, placer, pointed_thing)
         local pn = placer:get_player_name()
@@ -1865,20 +1614,17 @@ minetest.register_node("default:sponge_wet", {
     pointable = true,
     diggable = true,
     buildable_to = false,
-    stack_max = 64,
     groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1},
 })
 
-
 minetest.register_node("default:ice", {
     description = "Ice",
     drawtype = "glasslike",
     tiles = {"default_ice.png"},
-    is_ground_content = true,
+	is_ground_content = false,
     paramtype = "light",
     use_texture_alpha = true,
-    stack_max = 64,
-    groups = {cracky=3,oddly_breakable_by_hand=2, building = 1},
+    groups = {cracky = 3, puts_out_fire = 1, oddly_breakable_by_hand = 2, building = 1},
     sounds = default.node_sound_glass_defaults(),
 })
 
@@ -1886,10 +1632,8 @@ minetest.register_node("default:packedice", {
     description = "Packed Ice",
     drawtype = "glasslike",
     tiles = {"default_ice_packed.png"},
-    is_ground_content = true,
     paramtype = "light",
     use_texture_alpha = true,
-    stack_max = 64,
     groups = {cracky=2, building = 1},
     sounds = default.node_sound_glass_defaults(),
 })
@@ -1899,7 +1643,6 @@ minetest.register_node("default:snow", {
     tiles = {"default_snow.png"},
     inventory_image = "default_snowball.png",
     wield_image = "default_snowball.png",
-    is_ground_content = true,
     paramtype = "light",
     buildable_to = true,
     drawtype = "nodebox",
@@ -1910,9 +1653,10 @@ minetest.register_node("default:snow", {
             {-0.5, -0.5, -0.5,  0.5, -0.5+2/16, 0.5},
         },
     },
-    groups = {crumbly=3,falling_node=1, misc = 1},
+    groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1, misc = 1},
     sounds = default.node_sound_dirt_defaults({
         footstep = {name="default_grass_footstep", gain=0.4},
+		dug = {name = "default_snow_footstep", gain = 0.75},
     }),
     on_use = snow_shoot_snowball,
     on_construct = function(pos)
@@ -1926,11 +1670,10 @@ minetest.register_node("default:snow", {
 minetest.register_node("default:snowblock", {
     description = "Snow Block",
     tiles = {"default_snow.png"},
-    is_ground_content = true,
-    stack_max = 64,
     groups = {crumbly = 3, building = 1},
     sounds = default.node_sound_dirt_defaults({
-        footstep = {name="default_grass_footstep", gain=0.4},
+        footstep = {name = "default_snow_footstep", gain = 0.4},
+		dug = {name = "default_snow_footstep", gain = 0.75},
     }),
     drop = "default:snow 4",
 })

games/default/files/default/workbench.lua

@@ -0,0 +1,56 @@
+
+--
+-- Workbench
+--
+
+local function set_workbench(player)
+
+	local split_form = ""
+	local workbench = "size[9,8.75]" ..
+	"image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
+	"background[-0.19,-0.25;9.41,9.49;formspec_workbench.png]" ..
+	"bgcolor[#080808BB;true]" ..
+	"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]" ..
+	"list[detached:split;main;8,3.15;1,1;]"..
+	"list[current_player;main;0,4.5;9,3;9]" ..
+	"list[current_player;main;0,7.74;9,1;]" ..
+	"list[current_player;craft;2,0.5;3,3;]" ..
+	"list[current_player;craftpreview;6.05,1.5;1,1;]" ..
+	split_form..
+	"wob"
+
+	minetest.show_formspec(player:get_player_name(), "main", workbench)
+end
+
+minetest.register_node("default:workbench", {
+		description = "Workbench",
+		tiles = {"workbench_top.png", "workbench_top.png", "workbench_side.png",
+			"workbench_side.png", "workbench_front.png", "workbench_front.png"},
+		paramtype2 = "facedir",
+		paramtype = "light",
+		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+		on_rightclick = function (pos, node, clicker, itemstack)
+			set_workbench(clicker)
+		end
+	})
+
+minetest.register_craft({
+		output = 'default:workbench',
+		recipe = {
+			{'group:wood', 'group:wood'},
+			{'group:wood', 'group:wood'}
+		}
+	})
+
+local split_inv = minetest.create_detached_inventory("split", {
+    allow_move = function(_, _, _, _, _, count, _)
+        return count
+    end,
+    allow_put = function(_, _, _, stack, _)
+        return stack:get_count() / 2
+    end,
+    allow_take = function(_, _, _, stack, _)
+        return stack:get_count()
+    end,
+})
+split_inv:set_size("main", 1)

games/default/files/fences/init.lua

@@ -101,7 +101,6 @@ minetest.register_node("fences:fence_wood", {
     paramtype = "light",
     groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2,fences=1, decorative = 1},
     drop = 'fences:fence_wood',
-    stack_max = 64,
     sunlight_propagates = true,
     drawtype = "nodebox",
     node_box = {

games/default/files/flowers/init.lua

@@ -47,7 +47,6 @@ local function add_simple_flower(name, desc, box, f_groups)
 		paramtype = "light",
 		walkable = false,
 		buildable_to = true,
-		stack_max = 99,
 		groups = f_groups,
 		sounds = default.node_sound_leaves_defaults(),
 		selection_box = {

games/default/files/hardened_clay/init.lua

@@ -21,7 +21,6 @@ clay.dyes = {
 minetest.register_node("hardened_clay:hardened_clay", {
     description = "Hardened Clay",
     tiles = {"hardened_clay.png"},
-    stack_max = 64,
     groups = {cracky = 3},
     legacy_mineral = true,
     groups = {buliding = 1},
@@ -43,7 +42,6 @@ for _, row in ipairs(clay.dyes) do
             description = desc.." Hardened Clay",
             tiles = {"hardened_clay_stained_"..name..".png"},
             groups = {cracky = 3,hardened_clay=1, buliding = 1},
-            stack_max = 64,
             sounds = default.node_sound_defaults(),
         })
     if craft_color_group then

games/default/files/mobs_animal/bear.lua

@@ -1,9 +1,7 @@
--- Bear
-
 	mobs:register_mob("mobs_animal:bear", {
 		type = "npc",
 		visual = "mesh",
-		mesh = "mobs_bear.x",
+		mesh = "mobs_bear.b3d",
 		rotate = 0,
 		collisionbox = {-0.5, -0.01, -0.5, 0.5, 1.49, 0.5},
 		animation = {
@@ -79,7 +77,17 @@
 					return
 				end
 				mobs:capture_mob(self, clicker, 0, 0, 80, false, nil)
+			end,
+		after_activate = function(self, staticdata, def, dtime)
+			-- replace bear using the old directx model
+			if self.mesh == "mobs_bear.x" then
+				local pos = self.object:get_pos()
+				if pos then
+					minetest.add_entity(pos, self.name)
+					self.object:remove()
 				end
+			end
+		end,
 	})
 
 mobs:spawn({

games/default/files/mobs_animal/bunny.lua

@@ -1,4 +1,3 @@
-
 -- Bunny by ExeterDad
 
 mobs:register_mob("mobs_animal:bunny", {

games/default/files/mobs_animal/chicken.lua

@@ -1,4 +1,3 @@
-
 -- Chicken by JK Murray
 
 mobs:register_mob("mobs_animal:chicken", {
@@ -217,7 +216,6 @@ minetest.register_node(":mobs:egg", {
 	wield_image = "mobs_chicken_egg.png",
 	paramtype = "light",
 	walkable = false,
-	is_ground_content = true,
 	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",

games/default/files/mobs_animal/cow.lua

@@ -1,6 +1,3 @@
-
--- Cow by Krupnovpavel
-
 mobs:register_mob("mobs_animal:cow", {
 	type = "animal",
 	passive = false,
@@ -10,12 +7,13 @@ mobs:register_mob("mobs_animal:cow", {
 	hp_min = 8,
 	hp_max = 12,
 	armor = 100,
-	collisionbox = {-0.8, -0.01, -0.8, 0.8, 1.3, 0.8},
+	collisionbox = {-0.9, -0.01, -0.9, 0.9, 1.65, 0.9},
 	visual = "mesh",
-	mesh = "mobs_cow.x",
+	mesh = "mobs_cow.b3d",
 	textures = {
 		{"mobs_cow.png"},
 		{"mobs_cow2.png"},
+		{"mobs_cow3.png"},
 	},
 	makes_footstep_sound = true,
 	sounds = {
@@ -97,6 +95,16 @@ mobs:register_mob("mobs_animal:cow", {
 			return
 		end
 	end,
+		after_activate = function(self, staticdata, def, dtime)
+			-- replace cow using the old directx model
+			if self.mesh == "mobs_cow.x" then
+				local pos = self.object:get_pos()
+				if pos then
+					minetest.add_entity(pos, self.name)
+					self.object:remove()
+				end
+			end
+		end,
 	})
 
 mobs:spawn({

games/default/files/mobs_animal/dog.lua

@@ -1,5 +1,3 @@
-
--- Wolf
 	mobs:register_mob("mobs_animal:wolf", {
 		type = "animal",
 		visual = "mesh",

games/default/files/mobs_animal/kitten.lua

@@ -1,4 +1,3 @@
-
 -- Kitten by Jordach / BFD
 
 mobs:register_mob("mobs_animal:kitten", {

games/default/files/mobs_animal/pig.lua

@@ -1,5 +1,6 @@
 -- Warthog(Boar) by KrupnoPavel (MIT)
 -- Changed to Boar and tweaked by Kaadmy (WTFPL) and MoNTE48 (LGPLv3)
+
 mobs:register_mob("mobs_animal:pig", {
 		type = "animal",
 		passive = false,

games/default/files/mobs_monster/skeleton.lua

@@ -1,7 +1,7 @@
 mobs:register_mob("mobs_monster:skeleton", {
 		type = "monster",
 		visual = "mesh",
-		mesh = "mobs_zombie.x",
+		mesh = "mobs_zombie.b3d",
 		textures = {
 			{"mobs_skeleton.png"},
 		},
@@ -39,6 +39,16 @@ mobs:register_mob("mobs_monster:skeleton", {
 			{name = "default:bone", chance = 2, min = 1, max = 1},
 			{name = "default:bone", chance = 2, min = 1, max = 1}
 		},
+		after_activate = function(self, staticdata, def, dtime)
+			-- replace skeleton using the old directx model
+			if self.mesh == "mobs_zombie.x" then
+				local pos = self.object:get_pos()
+				if pos then
+					minetest.add_entity(pos, self.name)
+					self.object:remove()
+				end
+			end
+		end,
 	})
 
 mobs:spawn({