diff --git a/data/textures/stone.png b/data/textures/stone.png
index 7e87645..6ac883a 100644
Binary files a/data/textures/stone.png and b/data/textures/stone.png differ
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 3e6ac7c..0db76ed 100644
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -224,7 +224,7 @@ void content_mapnode_init(bool repeat)
 	f->often_contains_mineral = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_ROUGHSTONE)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	content_list_add("creative",i,1,0);
 	content_list_add("decrafting",i,1,0);
 
@@ -241,7 +241,7 @@ void content_mapnode_init(bool repeat)
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_MARBLE)+" 1";
 	f->cook_type = COOK_FURNACE;
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	content_list_add("creative",i,1,0);
 	content_list_add("cooking",i,1,0);
 	content_list_add("decrafting",i,1,0);
@@ -257,7 +257,7 @@ void content_mapnode_init(bool repeat)
 	f->often_contains_mineral = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.1;
+	f->dig_time = 1.1;
 
 	i = CONTENT_MARBLE;
 	f = &content_features(i);
@@ -267,7 +267,7 @@ void content_mapnode_init(bool repeat)
 	f->draw_type = CDT_CUBELIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	content_list_add("creative",i,1,0);
 
 	i = CONTENT_ROCK;
@@ -276,7 +276,7 @@ void content_mapnode_init(bool repeat)
 	f->setAllTextures("stone.png");
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 0.01;
+	f->dig_time = 0.01;
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->light_propagates = true;
@@ -303,7 +303,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->warmth_per_second = 10;
 	content_list_add("creative",i,1,0);
 
@@ -318,7 +318,7 @@ void content_mapnode_init(bool repeat)
 	f->fuel_time = 400;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_COAL,CONTENT_COAL);
 	crafting::setUncraftHardBlockRecipe(CONTENT_COAL,CONTENT_CRAFTITEM_COAL);
 	content_list_add("craftguide",i,1,0);
@@ -335,7 +335,7 @@ void content_mapnode_init(bool repeat)
 	f->fuel_time = 400;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_CHARCOAL,CONTENT_CHARCOAL);
 	crafting::setUncraftHardBlockRecipe(CONTENT_CHARCOAL,CONTENT_CRAFTITEM_CHARCOAL);
 	content_list_add("craftguide",i,1,0);
@@ -350,7 +350,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBrickRecipe(CONTENT_STONE,CONTENT_STONEBRICK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -364,7 +364,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBlockRecipe(CONTENT_STONE,CONTENT_STONEBLOCK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -380,7 +380,7 @@ void content_mapnode_init(bool repeat)
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_STONEBRICK)+" 1";
 	f->cook_type = COOK_FURNACE;
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBrickRecipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONEBRICK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("player-creative",i,1,0);
@@ -398,7 +398,7 @@ void content_mapnode_init(bool repeat)
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_STONEBLOCK)+" 1";
 	f->cook_type = COOK_FURNACE;
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBlockRecipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONEBLOCK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -418,7 +418,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item_rarity = 10;
 	f->sound_step = "grass-step";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->farm_ploughable = true;
 	content_list_add("decrafting",i,1,0);
 
@@ -434,7 +434,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
 	f->special_alternate_node = CONTENT_GRASS;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->farm_ploughable = true;
 
 	i = CONTENT_GRASS_FOOTSTEPS;
@@ -448,7 +448,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
 	f->sound_step = "grass-step";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->farm_ploughable = true;
 
 	i = CONTENT_GRASS_AUTUMN;
@@ -465,7 +465,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item_rarity = 10;
 	f->sound_step = "grass-step";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->farm_ploughable = true;
 	content_list_add("decrafting",i,1,0);
 
@@ -481,7 +481,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
 	f->special_alternate_node = CONTENT_GRASS_AUTUMN;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->farm_ploughable = true;
 
 	i = CONTENT_GRASS_FOOTSTEPS_AUTUMN;
@@ -495,7 +495,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
 	f->sound_step = "grass-step";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->farm_ploughable = true;
 
 	i = CONTENT_MUDSNOW;
@@ -511,7 +511,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_SNOW_BALL)+" 1";
 	f->extra_dug_item_rarity = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	content_list_add("decrafting",i,1,0);
 
 	i = CONTENT_MUD;
@@ -529,7 +529,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item_rarity = 3;
 	f->extra_dug_item_max_level = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->farm_ploughable = true;
 	content_list_add("creative",i,1,0);
 
@@ -542,7 +542,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 9";
 	f->type = CMT_DIRT;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_ASH,CONTENT_ASH);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -563,7 +563,7 @@ void content_mapnode_init(bool repeat)
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_GLASS)+" 1";
 	f->cook_type = COOK_FURNACE;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	content_list_add("creative",i,1,0);
 	content_list_add("cooking",i,1,0);
 	content_list_add("decrafting",i,1,0);
@@ -583,7 +583,7 @@ void content_mapnode_init(bool repeat)
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_GLASS)+" 1";
 	f->cook_type = COOK_FURNACE;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	content_list_add("creative",i,1,0);
 	content_list_add("cooking",i,1,0);
 	content_list_add("decrafting",i,1,0);
@@ -601,7 +601,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item_rarity = 10;
 	f->extra_dug_item_min_level = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.75;
+	f->dig_time = 1.75;
 	content_list_add("creative",i,1,0);
 	content_list_add("decrafting",i,1,0);
 
@@ -614,7 +614,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setSoftBlockRecipe(CONTENT_SAND,CONTENT_SANDSTONE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -629,7 +629,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBrickRecipe(CONTENT_SANDSTONE,CONTENT_SANDSTONE_BRICK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -644,7 +644,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBlockRecipe(CONTENT_SANDSTONE,CONTENT_SANDSTONE_BLOCK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -663,7 +663,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_TERRACOTTA)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_CLAY,CONTENT_CLAY);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -681,7 +681,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_BLUE)+" 1";
 	f->extra_dug_item_rarity = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_CLAY,CONTENT_CLAY_BLUE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -698,7 +698,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_GREEN)+" 1";
 	f->extra_dug_item_rarity = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_CLAY,CONTENT_CLAY_GREEN);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -715,7 +715,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_ORANGE)+" 1";
 	f->extra_dug_item_rarity = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_CLAY,CONTENT_CLAY_ORANGE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -732,7 +732,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_PURPLE)+" 1";
 	f->extra_dug_item_rarity = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_CLAY,CONTENT_CLAY_PURPLE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -750,7 +750,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_RED)+" 1";
 	f->extra_dug_item_rarity = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_RED,CONTENT_CLAY,CONTENT_CLAY_RED);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -767,7 +767,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_YELLOW)+" 1";
 	f->extra_dug_item_rarity = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_CLAY,CONTENT_CLAY_YELLOW);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -784,7 +784,7 @@ void content_mapnode_init(bool repeat)
 	f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_BLACK)+" 1";
 	f->extra_dug_item_rarity = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_CLAY,CONTENT_CLAY_BLACK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -803,7 +803,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_CLAY_BRICK,CONTENT_BRICK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -818,7 +818,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	content_list_add("creative",i,1,0);
 
 	i = CONTENT_TERRACOTTA_BRICK;
@@ -830,7 +830,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBrickRecipe(CONTENT_TERRACOTTA,CONTENT_TERRACOTTA_BRICK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -844,7 +844,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	crafting::setBlockRecipe(CONTENT_TERRACOTTA,CONTENT_TERRACOTTA_BLOCK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -855,7 +855,7 @@ void content_mapnode_init(bool repeat)
 	f->setAllTextures("terracotta_tile.png");
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->is_ground_content = true;
@@ -883,7 +883,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png", "glass.png", "glass.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	content_list_add("creative",i,1,0);
 
 	i = CONTENT_GLASS_BLUE;
@@ -901,7 +901,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png^glass_pane_blue_side.png", "glass.png^glass_pane_blue_side.png", "glass.png^glass_pane_blue_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_GLASS,CONTENT_GLASS_BLUE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -921,7 +921,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png^glass_pane_green_side.png", "glass.png^glass_pane_green_side.png", "glass.png^glass_pane_green_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_GLASS,CONTENT_GLASS_GREEN);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -941,7 +941,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png^glass_pane_orange_side.png", "glass.png^glass_pane_orange_side.png", "glass.png^glass_pane_orange_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_GLASS,CONTENT_GLASS_ORANGE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -961,7 +961,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png^glass_pane_purple_side.png", "glass.png^glass_pane_purple_side.png", "glass.png^glass_pane_purple_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_GLASS,CONTENT_GLASS_PURPLE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -981,7 +981,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png^glass_pane_red_side.png", "glass.png^glass_pane_red_side.png", "glass.png^glass_pane_red_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_RED,CONTENT_GLASS,CONTENT_GLASS_RED);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -1001,7 +1001,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png^glass_pane_yellow_side.png", "glass.png^glass_pane_yellow_side.png", "glass.png^glass_pane_yellow_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_GLASS,CONTENT_GLASS_YELLOW);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -1021,7 +1021,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glass.png^glass_pane_black_side.png", "glass.png^glass_pane_black_side.png", "glass.png^glass_pane_black_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_GLASS,CONTENT_GLASS_BLACK);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -1052,7 +1052,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_side.png", "glass.png", "glass_pane_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS,CONTENT_GLASS_PANE);
@@ -1085,7 +1085,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_blue_side.png", "glass.png^glass_pane_blue_side.png", "glass_pane_blue_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS_BLUE,CONTENT_GLASS_PANE_BLUE);
@@ -1119,7 +1119,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_green_side.png", "glass.png^glass_pane_green_side.png", "glass_pane_green_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS_GREEN,CONTENT_GLASS_PANE_GREEN);
@@ -1153,7 +1153,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_orange_side.png", "glass.png^glass_pane_orange_side.png", "glass_pane_orange_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS_ORANGE,CONTENT_GLASS_PANE_ORANGE);
@@ -1187,7 +1187,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_purple_side.png", "glass.png^glass_pane_purple_side.png", "glass_pane_purple_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS_PURPLE,CONTENT_GLASS_PANE_PURPLE);
@@ -1221,7 +1221,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_red_side.png", "glass.png^glass_pane_red_side.png", "glass_pane_red_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS_RED,CONTENT_GLASS_PANE_RED);
@@ -1255,7 +1255,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_yellow_side.png", "glass.png^glass_pane_yellow_side.png", "glass_pane_yellow_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS_YELLOW,CONTENT_GLASS_PANE_YELLOW);
@@ -1289,7 +1289,7 @@ void content_mapnode_init(bool repeat)
 	));
 	f->setInventoryTextureNodeBox(i,"glass_pane_black_side.png", "glass.png^glass_pane_black_side.png", "glass_pane_black_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol3Recipe(CONTENT_GLASS_BLACK,CONTENT_GLASS_PANE_BLACK);
@@ -1312,7 +1312,7 @@ void content_mapnode_init(bool repeat)
 #endif
 	f->setInventoryTextureCube("glasslight.png", "glasslight.png", "glasslight.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->light_source = LIGHT_MAX-1;
 	crafting::setSurroundRecipe(CONTENT_GLASS,CONTENT_CRAFTITEM_FIREFLY,CONTENT_GLASSLIGHT);
 	content_list_add("craftguide",i,1,0);
@@ -1329,7 +1329,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	crafting::set1To4Recipe(CONTENT_TREE,CONTENT_WOOD);
 	crafting::set1To4Recipe(CONTENT_APPLE_TREE,CONTENT_WOOD);
 	//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_WOOD);
@@ -1355,7 +1355,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	crafting::set1To4Recipe(CONTENT_TREE,CONTENT_WOOD);
 	crafting::set1To4Recipe(CONTENT_APPLE_TREE,CONTENT_WOOD);
 	//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_WOOD);
@@ -1381,7 +1381,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	crafting::set1To4Recipe(CONTENT_JUNGLETREE,CONTENT_JUNGLEWOOD);
 	//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_JUNGLE_PLANK,CONTENT_JUNGLEWOOD);
 	{
@@ -1406,7 +1406,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/16;
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	crafting::set1To4Recipe(CONTENT_CONIFER_TREE,CONTENT_WOOD_PINE);
 	//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_PINE_PLANK,CONTENT_WOOD_PINE);
 	{
@@ -1431,7 +1431,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 1;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	content_list_add("creative",i,1,0);
 
@@ -1447,7 +1447,7 @@ void content_mapnode_init(bool repeat)
 	f->ondig_special_tool = TT_BUCKET;
 	f->ondig_special_tool_append = std::string("_water");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 
 	i = CONTENT_HAY;
@@ -1461,7 +1461,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1;
 	f->fuel_time = 20;
 	f->type = CMT_PLANT;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->pressure_type = CST_CRUSHABLE;
 	crafting::setSoftBlockRecipe(CONTENT_DEADGRASS,CONTENT_HAY);
 	content_list_add("craftguide",i,1,0);
@@ -1487,7 +1487,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_pie(f);
 	f->setInventoryTextureNodeBox(i, "apple_pie_raw.png", "apple_pie_raw.png", "apple_pie_raw.png");
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set1over1Recipe(CONTENT_CRAFTITEM_APPLE,CONTENT_CRAFTITEM_DOUGH,CONTENT_APPLE_PIE_RAW);
@@ -1515,7 +1515,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
 	f->ondig_replace_node = CONTENT_APPLE_PIE_3;
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1539,7 +1539,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
 	f->ondig_replace_node=CONTENT_APPLE_PIE_2;
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1561,7 +1561,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
 	f->ondig_replace_node=CONTENT_APPLE_PIE_1;
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1582,7 +1582,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_pie_1(f);
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1606,7 +1606,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_pie(f);
 	f->setInventoryTextureNodeBox(i, "pumpkin_pie_raw.png", "pumpkin_pie_raw.png", "pumpkin_pie_raw.png");
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set1over1Recipe(CONTENT_CRAFTITEM_PUMPKINSLICE,CONTENT_CRAFTITEM_DOUGH,CONTENT_PUMPKIN_PIE_RAW);
@@ -1634,7 +1634,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
 	f->ondig_replace_node=CONTENT_PUMPKIN_PIE_3;
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1658,7 +1658,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
 	f->ondig_replace_node=CONTENT_PUMPKIN_PIE_2;
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1680,7 +1680,7 @@ void content_mapnode_init(bool repeat)
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
 	f->ondig_replace_node=CONTENT_PUMPKIN_PIE_1;
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1701,7 +1701,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_pie_1(f);
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1714,7 +1714,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_SNOW_BALL)+" 9";
 	f->type = CMT_DIRT;
-	f->hardness = 0.3;
+	f->dig_time = 0.3;
 	f->warmth_per_second = 10;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_SNOW_BALL,CONTENT_SNOW_BLOCK);
 	content_list_add("craftguide",i,1,0);
@@ -1737,7 +1737,7 @@ void content_mapnode_init(bool repeat)
 	f->rotate_tile_with_nodebox = true;
 	f->type = CMT_DIRT;
 	f->pressure_type = CST_CRUSHABLE;
-	f->hardness = 0.3;
+	f->dig_time = 0.3;
 	f->setNodeBox(core::aabbox3d<f32>(
 		-0.3125*BS,
 		-0.5*BS,
@@ -1799,7 +1799,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_carpet(f);
 	f->setInventoryTextureNodeBox(i,"snow.png", "snow.png", "snow.png");
 	f->type = CMT_DIRT;
-	f->hardness = 0.3;
+	f->dig_time = 0.3;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->warmth_per_second = 10;
@@ -1817,7 +1817,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_WHITE,CONTENT_COTTON_BLUE,CONTENT_COTTON);
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_WHITE,CONTENT_COTTON_GREEN,CONTENT_COTTON);
@@ -1848,7 +1848,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_COTTON,CONTENT_COTTON_BLUE);
 	content_list_add("craftguide",i,1,0);
@@ -1865,7 +1865,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_COTTON,CONTENT_COTTON_GREEN);
 	content_list_add("craftguide",i,1,0);
@@ -1882,7 +1882,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_COTTON,CONTENT_COTTON_ORANGE);
 	content_list_add("craftguide",i,1,0);
@@ -1899,7 +1899,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_COTTON,CONTENT_COTTON_PURPLE);
 	content_list_add("craftguide",i,1,0);
@@ -1916,7 +1916,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_RED,CONTENT_COTTON,CONTENT_COTTON_RED);
 	content_list_add("craftguide",i,1,0);
@@ -1933,7 +1933,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_COTTON,CONTENT_COTTON_YELLOW);
 	content_list_add("craftguide",i,1,0);
@@ -1950,7 +1950,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_DROPABLE;
 	crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_COTTON,CONTENT_COTTON_BLACK);
 	content_list_add("craftguide",i,1,0);
@@ -1971,7 +1971,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_COTTON,CONTENT_CARPET);
@@ -1993,7 +1993,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_COTTON_BLUE,CONTENT_CARPET_BLUE);
@@ -2016,7 +2016,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_COTTON_GREEN,CONTENT_CARPET_GREEN);
@@ -2039,7 +2039,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_COTTON_ORANGE,CONTENT_CARPET_ORANGE);
@@ -2062,7 +2062,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_COTTON_PURPLE,CONTENT_CARPET_PURPLE);
@@ -2085,7 +2085,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_COTTON_RED,CONTENT_CARPET_RED);
@@ -2108,7 +2108,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	f->pressure_type = CST_CRUSHABLE;
 	crafting::setTileRecipe(CONTENT_COTTON_YELLOW,CONTENT_CARPET_YELLOW);
@@ -2131,7 +2131,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_COTTON_BLACK,CONTENT_CARPET_BLACK);
@@ -2227,7 +2227,7 @@ void content_mapnode_init(bool repeat)
 	f->setAllTextures("water_source.png");
 #endif
 	f->type = CMT_LIQUID;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 10;
 
@@ -2290,7 +2290,7 @@ void content_mapnode_init(bool repeat)
 	f->setAllTextures("lava_source.png");
 #endif
 	f->type = CMT_LIQUID;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->pressure_type = CST_CRUSHABLE;
 
 	i = CONTENT_ROUGHSTONE;
@@ -2305,7 +2305,7 @@ void content_mapnode_init(bool repeat)
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_STONE)+" 1";
 	f->cook_type = COOK_FURNACE;
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	crafting::setBlockRecipe(CONTENT_COBBLE,CONTENT_ROUGHSTONE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -2321,7 +2321,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	crafting::set5Recipe(CONTENT_ROUGHSTONE,CONTENT_COBBLE);
 	crafting::setHardBlockRecipe(CONTENT_ROCK,CONTENT_COBBLE);
 	content_list_add("craftguide",i,1,0);
@@ -2337,7 +2337,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	content_list_add("creative",i,1,0);
 
 	i = CONTENT_STEEL;
@@ -2350,7 +2350,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 5.0;
 	f->destructive_mob_safe = true;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_STEEL);
 	crafting::setUncraftHardBlockRecipe(CONTENT_STEEL,CONTENT_CRAFTITEM_STEEL_INGOT);
@@ -2367,7 +2367,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 10.0;
+	f->dig_time = 10.0;
 	f->destructive_mob_safe = true;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_MITHRIL_UNBOUND,CONTENT_MITHRIL_BLOCK);
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_MITHRIL,CONTENT_MITHRIL_BLOCK);
@@ -2392,7 +2392,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 5.0;
 	f->destructive_mob_safe = true;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_COPPER_INGOT,CONTENT_COPPER);
 	crafting::setUncraftHardBlockRecipe(CONTENT_COPPER,CONTENT_CRAFTITEM_COPPER_INGOT);
@@ -2409,7 +2409,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 5.0;
 	f->destructive_mob_safe = true;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_GOLD_INGOT,CONTENT_GOLD);
 	crafting::setUncraftHardBlockRecipe(CONTENT_GOLD,CONTENT_CRAFTITEM_GOLD_INGOT);
@@ -2426,7 +2426,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 5.0;
 	f->destructive_mob_safe = true;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_SILVER_INGOT,CONTENT_SILVER);
 	crafting::setUncraftHardBlockRecipe(CONTENT_SILVER,CONTENT_CRAFTITEM_SILVER_INGOT);
@@ -2443,7 +2443,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 5.0;
 	f->destructive_mob_safe = true;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_TIN_INGOT,CONTENT_TIN);
 	crafting::setUncraftHardBlockRecipe(CONTENT_TIN,CONTENT_CRAFTITEM_TIN_INGOT);
@@ -2460,7 +2460,7 @@ void content_mapnode_init(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 5.0;
 	f->destructive_mob_safe = true;
 	crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_QUARTZ,CONTENT_QUARTZ);
 	crafting::setUncraftHardBlockRecipe(CONTENT_QUARTZ,CONTENT_CRAFTITEM_QUARTZ);
@@ -2480,7 +2480,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_carpet(f);
 	f->setInventoryTextureNodeBox(i,"stone_tile.png", "stone_tile.png", "stone_tile.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_STONE,CONTENT_STONE_TILE);
@@ -2502,7 +2502,7 @@ void content_mapnode_init(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 5;
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setTileRecipe(CONTENT_WOOD,CONTENT_WOOD_TILE);
@@ -2525,7 +2525,7 @@ void content_mapnode_init(bool repeat)
 									"stone.png",
 									"stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setCol3Recipe(CONTENT_STONE,
@@ -2545,7 +2545,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_COLUMN_SQUARE_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2562,7 +2562,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_COLUMN_CROSS;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2582,7 +2582,7 @@ void content_mapnode_init(bool repeat)
 									"limestone.png",
 									"limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setCol3Recipe(CONTENT_LIMESTONE,
@@ -2602,7 +2602,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_COLUMN_SQUARE_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2619,7 +2619,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_COLUMN_CROSS;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2639,7 +2639,7 @@ void content_mapnode_init(bool repeat)
 									"marble.png",
 									"marble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_MARBLE_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setCol3Recipe(CONTENT_MARBLE,
@@ -2659,7 +2659,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_MARBLE_COLUMN_SQUARE_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2676,7 +2676,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_MARBLE_COLUMN_CROSS;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2697,7 +2697,7 @@ void content_mapnode_init(bool repeat)
 									"sandstone.png",
 									"sandstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setCol3Recipe(CONTENT_SANDSTONE,
@@ -2717,7 +2717,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_COLUMN_SQUARE_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2734,7 +2734,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_COLUMN_CROSS;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2754,7 +2754,7 @@ void content_mapnode_init(bool repeat)
 									"brick.png",
 									"brick.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setCol3Recipe(CONTENT_BRICK,
@@ -2773,7 +2773,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_COLUMN_SQUARE_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2789,7 +2789,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_COLUMN_CROSS;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -2807,7 +2807,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_column_square(f);
 	f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_WOOD_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	f->flammable = 1; // can be replaced by fire if the node under
@@ -2830,7 +2830,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_COLUMN_SQUARE_TOP;
@@ -2848,7 +2848,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_COLUMN_CROSS;
@@ -2868,7 +2868,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_column_square(f);
 	f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_JUNGLEWOOD_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	f->flammable = 1; // can be replaced by fire if the node under
@@ -2891,7 +2891,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_JUNGLEWOOD_COLUMN_SQUARE_TOP;
@@ -2909,7 +2909,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_JUNGLEWOOD_COLUMN_CROSS;
@@ -2929,7 +2929,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_column_square(f);
 	f->setInventoryTextureNodeBox(i,"pine.jpg","pine.jpg","pine.jpg");
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	f->flammable = 1; // can be replaced by fire if the node under
@@ -2952,7 +2952,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_SQUARE_TOP;
@@ -2970,7 +2970,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_CROSS;
@@ -2990,7 +2990,7 @@ void content_mapnode_init(bool repeat)
 	content_nodebox_column_square(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_COLUMN_SQUARE_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setCol3Recipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONE_COLUMN_SQUARE);
@@ -3008,7 +3008,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_COLUMN_SQUARE_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3024,7 +3024,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_square_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_COLUMN_CROSS;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3040,7 +3040,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_COLUMN_CROSS_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3055,7 +3055,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_COLUMN_CROSS_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3071,7 +3071,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_COLUMN_SQUARE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3087,7 +3087,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_COLUMN_CROSS_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3102,7 +3102,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_COLUMN_CROSS_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3118,7 +3118,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_COLUMN_SQUARE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3134,7 +3134,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_MARBLE_COLUMN_CROSS_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3149,7 +3149,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_MARBLE_COLUMN_CROSS_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3165,7 +3165,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.6;
+	f->dig_time = 0.6;
 	f->onpunch_replace_node = CONTENT_MARBLE_COLUMN_SQUARE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3181,7 +3181,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_COLUMN_CROSS_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3196,7 +3196,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_COLUMN_CROSS_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3212,7 +3212,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_COLUMN_SQUARE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3228,7 +3228,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_COLUMN_CROSS_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3243,7 +3243,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_COLUMN_CROSS_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3259,7 +3259,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_COLUMN_SQUARE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3275,7 +3275,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_COLUMN_CROSS_BASE;
@@ -3292,7 +3292,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_COLUMN_CROSS_TOP;
@@ -3310,7 +3310,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_COLUMN_SQUARE;
@@ -3328,7 +3328,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_JUNGLEWOOD_COLUMN_CROSS_BASE;
@@ -3345,7 +3345,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_JUNGLEWOOD_COLUMN_CROSS_TOP;
@@ -3363,7 +3363,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_JUNGLEWOOD_COLUMN_SQUARE;
@@ -3381,7 +3381,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_CROSS_BASE;
@@ -3398,7 +3398,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_CROSS_TOP;
@@ -3416,7 +3416,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->flammable = 1; // can be replaced by fire if the node under
 					  // it is set on fire
 	f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_SQUARE;
@@ -3434,7 +3434,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_COLUMN_CROSS_BASE;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3449,7 +3449,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_base(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_COLUMN_CROSS_TOP;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -3465,7 +3465,7 @@ void content_mapnode_init(bool repeat)
 	f->sunlight_propagates = true;
 	content_nodebox_column_cross_top(f);
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_COLUMN_SQUARE;
 	f->onpunch_replace_respects_borderstone = true;
 }
diff --git a/src/content_mapnode_circuit.cpp b/src/content_mapnode_circuit.cpp
index 80c0015..12f75e0 100644
--- a/src/content_mapnode_circuit.cpp
+++ b/src/content_mapnode_circuit.cpp
@@ -45,7 +45,7 @@ void content_mapnode_circuit(bool repeat)
 	f->air_equivalent = true; // grass grows underneath
 	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_MITHRILDUST)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_carpet(f);
@@ -68,7 +68,7 @@ void content_mapnode_circuit(bool repeat)
 	f->air_equivalent = true; // grass grows underneath
 	f->dug_item = std::string("MaterialItem2 ") + itos(i)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_carpet(f);
@@ -97,7 +97,7 @@ void content_mapnode_circuit(bool repeat)
 	f->light_source = 10;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_WOOD;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->suffocation_per_second = 0;
 	content_nodebox_battery(f);
 	f->setInventoryTextureNodeBox(i,"circuit_reactor_top.png","circuit_reactor.png","circuit_reactor.png");
@@ -120,7 +120,7 @@ void content_mapnode_circuit(bool repeat)
 	f->sunlight_propagates = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_WOOD;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->suffocation_per_second = 0;
 	content_nodebox_carpet(f);
 	f->setInventoryTextureNodeBox(i,"circuit_solarpanel_top.png","wood.png","wood.png");
@@ -153,7 +153,7 @@ void content_mapnode_circuit(bool repeat)
 	f->rotate_tile_with_nodebox = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_WOOD;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	content_nodebox_waterwheel(f);
 	f->setInventoryTextureNodeBox(i,"circuit_waterwheel.png","circuit_waterwheel.png","circuit_waterwheel_side.png");
 	if (f->initial_metadata == NULL)
@@ -187,7 +187,7 @@ void content_mapnode_circuit(bool repeat)
 	f->energy_drop = 0;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_nodebox_switch(f);
 	f->setInventoryTextureNodeBox(i,"stone.png","circuit_switch_front.png","stone.png");
@@ -218,7 +218,7 @@ void content_mapnode_circuit(bool repeat)
 	f->energy_drop = 0;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_nodebox_button(f);
 	f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
@@ -246,7 +246,7 @@ void content_mapnode_circuit(bool repeat)
 	f->energy_drop = 0;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_nodebox_carpet(f);
 	f->setInventoryTextureNodeBox(i,"pressureplate_stone_top.png","stone.png","stone.png");
@@ -274,7 +274,7 @@ void content_mapnode_circuit(bool repeat)
 	f->energy_drop = 0;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_nodebox_carpet(f);
 	f->setInventoryTextureNodeBox(i,"pressureplate_wood_top.png","stone.png","stone.png");
@@ -305,7 +305,7 @@ void content_mapnode_circuit(bool repeat)
 	f->light_propagates = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_nodebox_logicgate(f);
 	f->setInventoryTextureNodeBox(i,"circuit_gate_top.png","circuit_gate.png","circuit_gate.png");
@@ -336,7 +336,7 @@ void content_mapnode_circuit(bool repeat)
 	f->light_propagates = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_nodebox_logicgate(f);
 	f->setInventoryTextureNodeBox(i,"circuit_repeater_top.png","circuit_repeater.png","circuit_repeater.png");
@@ -368,7 +368,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setAllTextures("circuit_lamp_on.png");
 	f->setInventoryTextureCube("circuit_lamp.png", "circuit_lamp.png", "circuit_lamp.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new CircuitNodeMetadata();
 
@@ -389,7 +389,7 @@ void content_mapnode_circuit(bool repeat)
 #endif
 	f->setInventoryTextureCube("circuit_lamp.png", "circuit_lamp.png", "circuit_lamp.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new CircuitNodeMetadata();
 	{
@@ -424,7 +424,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setTexture(5,"circuit_piston_arm_top.png");
 	f->setInventoryTextureCube("circuit_piston.png^[transformR90", "circuit_piston_arm_top.png", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
 	{
@@ -458,7 +458,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_piston(f);
 	f->setInventoryTextureCube("circuit_piston.png^[transformR90", "circuit_piston_top.png", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
@@ -483,7 +483,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_pistonarm(f);
 	f->setInventoryTextureCube("circuit_piston_arm.png", "circuit_piston_arm_top.png", "circuit_piston_arm.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -504,7 +504,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setTexture(1,"circuit_piston_bottom.png");
 	f->setInventoryTextureCube("circuit_piston_arm_top.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
 
@@ -524,7 +524,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_piston_up(f);
 	f->setInventoryTextureCube("circuit_piston_top.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
@@ -544,7 +544,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_pistonarm_up(f);
 	f->setInventoryTextureCube("circuit_piston_arm_top.png", "circuit_piston_arm.png", "circuit_piston_arm.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -565,7 +565,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setTexture(1,"circuit_piston_arm_top.png");
 	f->setInventoryTextureCube("circuit_piston_arm_bottom.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
 
@@ -585,7 +585,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_piston_down(f);
 	f->setInventoryTextureCube("circuit_piston_top.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
@@ -605,7 +605,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_pistonarm_down(f);
 	f->setInventoryTextureCube("circuit_piston_arm.png", "circuit_piston_arm_top.png", "circuit_piston_arm.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -630,7 +630,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setTexture(5,"circuit_stickypiston_arm_top.png");
 	f->setInventoryTextureCube("circuit_piston.png^[transformR90", "circuit_stickypiston_arm_top.png", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
 	crafting::set1over1Recipe(CONTENT_CRAFTITEM_RESIN,CONTENT_CIRCUIT_PISTON_OFF,CONTENT_CIRCUIT_STICKYPISTON_OFF);
@@ -657,7 +657,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_piston(f);
 	f->setInventoryTextureCube("circuit_piston.png^[transformR90", "circuit_piston_top.png", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
@@ -682,7 +682,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_pistonarm(f);
 	f->setInventoryTextureCube("circuit_piston_arm.png", "circuit_stickypiston_arm_top.png", "circuit_piston_arm.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -703,7 +703,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setTexture(1,"circuit_piston_bottom.png");
 	f->setInventoryTextureCube("circuit_stickypiston_arm_top.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
 
@@ -723,7 +723,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_piston_up(f);
 	f->setInventoryTextureCube("circuit_piston_top.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
@@ -743,7 +743,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_pistonarm_up(f);
 	f->setInventoryTextureCube("circuit_stickypiston_arm_top.png", "circuit_piston_arm.png", "circuit_piston_arm.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -764,7 +764,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setTexture(1,"circuit_stickypiston_arm_top.png");
 	f->setInventoryTextureCube("circuit_piston_arm_bottom.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
 
@@ -784,7 +784,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_piston_down(f);
 	f->setInventoryTextureCube("circuit_piston_top.png", "circuit_piston.png^[transformR90", "circuit_piston.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new PistonNodeMetadata();
@@ -804,7 +804,7 @@ void content_mapnode_circuit(bool repeat)
 	content_nodebox_pistonarm_down(f);
 	f->setInventoryTextureCube("circuit_piston_arm.png", "circuit_stickypiston_arm_top.png", "circuit_piston_arm.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 }
diff --git a/src/content_mapnode_door.cpp b/src/content_mapnode_door.cpp
index 93c952b..3e6687e 100644
--- a/src/content_mapnode_door.cpp
+++ b/src/content_mapnode_door.cpp
@@ -55,7 +55,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_DOOR_LT;
@@ -82,7 +82,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	crafting::set1over1Recipe(CONTENT_WOOD_HATCH,CONTENT_WOOD_HATCH,CONTENT_WOOD_DOOR_LT);
@@ -110,7 +110,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -138,7 +138,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -173,7 +173,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_GLASS_DOOR_LT;
@@ -202,7 +202,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	crafting::set1over1Recipe(CONTENT_GLASS_PANE,CONTENT_GLASS_PANE,CONTENT_GLASS_DOOR_LT);
@@ -233,7 +233,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_W_DOOR_LT;
@@ -261,7 +261,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorw(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	crafting::set1over1Recipe(CONTENT_WOOD_W_HATCH,CONTENT_WOOD_HATCH,CONTENT_WOOD_W_DOOR_LT);
@@ -291,7 +291,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -320,7 +320,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_doorw(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -355,7 +355,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_DOOR_RT;
@@ -382,7 +382,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -413,7 +413,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_GLASS_DOOR_RT;
@@ -443,7 +443,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -469,7 +469,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -497,7 +497,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -529,7 +529,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_door(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_W_DOOR_RT;
@@ -557,7 +557,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorw(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -584,7 +584,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_door(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -613,7 +613,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_doorw(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -647,7 +647,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorol(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_DOOR_LT_OPEN;
@@ -672,7 +672,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorol(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -700,7 +700,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorol(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_GLASS_DOOR_LT_OPEN;
@@ -727,7 +727,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorol(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -751,7 +751,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_doorol(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -777,7 +777,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_doorol(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -806,7 +806,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorol(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_W_DOOR_LT_OPEN;
@@ -831,7 +831,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorwol(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -855,7 +855,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_doorol(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -881,7 +881,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_doorwol(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -913,7 +913,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_dooror(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_DOOR_RT_OPEN;
@@ -940,7 +940,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_dooror(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -970,7 +970,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_dooror(f);
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_GLASS_DOOR_RT_OPEN;
@@ -998,7 +998,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_dooror(f);
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1024,7 +1024,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_dooror(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1052,7 +1052,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_dooror(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1083,7 +1083,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_dooror(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	i = CONTENT_WOOD_W_DOOR_RT_OPEN;
@@ -1110,7 +1110,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_doorwor(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1136,7 +1136,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_dooror(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1164,7 +1164,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_doorwor(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1190,7 +1190,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_hatch(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_WOOD_HATCH);
@@ -1214,7 +1214,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_hatch(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1245,7 +1245,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_hatchw(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	crafting::set1over1Recipe(CONTENT_GLASS,CONTENT_WOOD_HATCH,CONTENT_WOOD_W_HATCH);
@@ -1271,7 +1271,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_hatchw(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1302,7 +1302,7 @@ void content_mapnode_door(bool repeat)
 	content_nodebox_gate(f);
 	f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	crafting::setGateRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_WOOD,CONTENT_WOOD_GATE);
@@ -1332,7 +1332,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-dooropen";
 	content_nodebox_gate(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1366,7 +1366,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_hatcho(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1391,7 +1391,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_hatcho(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1421,7 +1421,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_hatchwo(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1446,7 +1446,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_hatchwo(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
@@ -1474,7 +1474,7 @@ void content_mapnode_door(bool repeat)
 	f->fuel_time = 30;
 	content_nodebox_gateo(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1497,7 +1497,7 @@ void content_mapnode_door(bool repeat)
 	f->sound_punch = "env-doorclose";
 	content_nodebox_gateo(f);
 	f->type = CMT_STONE;
-	f->hardness = 5.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->energy_type = CET_DEVICE;
diff --git a/src/content_mapnode_farm.cpp b/src/content_mapnode_farm.cpp
index 6317bb3..5d3c8e8 100644
--- a/src/content_mapnode_farm.cpp
+++ b/src/content_mapnode_farm.cpp
@@ -41,7 +41,7 @@ void content_mapnode_farm(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	content_list_add("decrafting",i,1,0);
 
 	i = CONTENT_FERTILIZER;
@@ -57,7 +57,7 @@ void content_mapnode_farm(bool repeat)
 	content_nodebox_carpet(f);
 	f->setInventoryTextureNodeBox(i,"fertilizer.png", "fertilizer.png", "fertilizer.png");
 	f->type = CMT_DIRT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -75,7 +75,7 @@ void content_mapnode_farm(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set5Recipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_TRELLIS);
@@ -97,7 +97,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_WHEAT;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -117,7 +117,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_MELON;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -139,7 +139,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_PUMPKIN;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -161,7 +161,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_POTATO;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -183,7 +183,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_CARROT;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -205,7 +205,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_BEETROOT;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -227,7 +227,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_GRAPEVINE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -249,7 +249,7 @@ void content_mapnode_farm(bool repeat)
 	f->special_alternate_node = CONTENT_FARM_COTTON;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->fuel_time = 2;
 	f->suffocation_per_second = 0;
@@ -273,7 +273,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_large_dug_node = CONTENT_CRAFTITEM_WHEAT;
 	f->plantgrowth_large_gives_small = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -291,7 +291,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_large_dug_node = CONTENT_FARM_MELON;
 	f->plantgrowth_large_count = 1;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 
 	i = CONTENT_FARM_PUMPKIN;
@@ -308,7 +308,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_large_dug_node = CONTENT_FARM_PUMPKIN;
 	f->plantgrowth_large_count = 1;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	content_list_add("creative",i,1,0);
 	f->pressure_type = CST_CRUSHABLE;
 
@@ -330,7 +330,7 @@ void content_mapnode_farm(bool repeat)
 	f->flammable = 1;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->light_source = LIGHT_MAX-1;
 	crafting::set1Any2Recipe(CONTENT_TORCH,CONTENT_FARM_PUMPKIN,CONTENT_FARM_PUMPKIN_JACK);
 	content_list_add("creative",i,1,0);
@@ -353,7 +353,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_small_dug_node = CONTENT_SEEDS_POTATO;
 	f->plantgrowth_large_dug_node = CONTENT_CRAFTITEM_POTATO;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -373,7 +373,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_small_dug_node = CONTENT_SEEDS_CARROT;
 	f->plantgrowth_large_dug_node = CONTENT_CRAFTITEM_CARROT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -393,7 +393,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_small_dug_node = CONTENT_SEEDS_BEETROOT;
 	f->plantgrowth_large_dug_node = CONTENT_CRAFTITEM_BEETROOT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -414,7 +414,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_large_dug_node = CONTENT_CRAFTITEM_GRAPE;
 	f->plantgrowth_trellis_node = CONTENT_FARM_TRELLIS_GRAPE;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -437,7 +437,7 @@ void content_mapnode_farm(bool repeat)
 	f->plantgrowth_large_count = 6;
 	f->plantgrowth_large_gives_small = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -461,7 +461,7 @@ void content_mapnode_farm(bool repeat)
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -479,7 +479,7 @@ void content_mapnode_farm(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.3;
+	f->dig_time = 0.3;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -499,7 +499,7 @@ void content_mapnode_farm(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 }
diff --git a/src/content_mapnode_furniture.cpp b/src/content_mapnode_furniture.cpp
index 48051e7..66afc90 100644
--- a/src/content_mapnode_furniture.cpp
+++ b/src/content_mapnode_furniture.cpp
@@ -46,7 +46,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	content_nodebox_bookshelf(f);
 	f->setInventoryTextureNodeBox(i,"wood.png", "wood.png", "wood.png");
 	if (f->initial_metadata == NULL)
@@ -79,7 +79,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	content_nodebox_bookshelf(f);
 	f->setInventoryTextureNodeBox(i,"junglewood.png", "junglewood.png", "junglewood.png");
 	if (f->initial_metadata == NULL)
@@ -112,7 +112,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	content_nodebox_bookshelf(f);
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	if (f->initial_metadata == NULL)
@@ -145,7 +145,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/4;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	content_nodebox_bookshelf(f);
 	f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png");
 	if (f->initial_metadata == NULL)
@@ -175,7 +175,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -194,7 +194,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -213,7 +213,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -232,7 +232,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -251,7 +251,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -270,7 +270,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -299,7 +299,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_BLUE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -318,7 +318,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_BLUE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -337,7 +337,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_BLUE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -356,7 +356,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_BLUE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -375,7 +375,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_BLUE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -394,7 +394,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_BLUE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -417,7 +417,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_GREEN;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -436,7 +436,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_GREEN;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -455,7 +455,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_GREEN;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -474,7 +474,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_GREEN;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -493,7 +493,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_GREEN;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -512,7 +512,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_GREEN;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -535,7 +535,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_ORANGE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -554,7 +554,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_ORANGE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -573,7 +573,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_ORANGE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -592,7 +592,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_ORANGE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -611,7 +611,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_ORANGE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -630,7 +630,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_ORANGE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -653,7 +653,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_PURPLE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -672,7 +672,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_PURPLE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -691,7 +691,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_PURPLE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -710,7 +710,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_PURPLE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -729,7 +729,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_PURPLE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -748,7 +748,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_PURPLE;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -771,7 +771,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_RED;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -790,7 +790,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_RED;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -809,7 +809,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_RED;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -828,7 +828,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_RED;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -847,7 +847,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_RED;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -866,7 +866,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_RED;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -889,7 +889,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_YELLOW;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -908,7 +908,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_YELLOW;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -927,7 +927,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_YELLOW;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -946,7 +946,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_YELLOW;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -965,7 +965,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_YELLOW;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -984,7 +984,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_YELLOW;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -1007,7 +1007,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_BLACK;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
@@ -1026,7 +1026,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_BLACK;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
@@ -1045,7 +1045,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_BLACK;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
@@ -1064,7 +1064,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_BLACK;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
@@ -1083,7 +1083,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_BLACK;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
@@ -1102,7 +1102,7 @@ void content_mapnode_furniture(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 15;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_BLACK;
 	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
@@ -1132,7 +1132,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onpunch_replace_respects_borderstone = true;
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	{
 		u16 r[9] = {
@@ -1165,7 +1165,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onpunch_replace_respects_borderstone = true;
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1188,7 +1188,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onpunch_replace_respects_borderstone = true;
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1211,7 +1211,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onpunch_replace_respects_borderstone = true;
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1234,7 +1234,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onpunch_replace_respects_borderstone = true;
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1257,7 +1257,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onpunch_replace_respects_borderstone = true;
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1277,7 +1277,7 @@ void content_mapnode_furniture(bool repeat)
 	content_nodebox_table(f);
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	{
 		u16 r[9] = {
@@ -1314,7 +1314,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON,CONTENT_BED_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1346,7 +1346,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1373,7 +1373,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON_BLUE,CONTENT_BED_BLUE_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1405,7 +1405,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1432,7 +1432,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON_GREEN,CONTENT_BED_GREEN_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1464,7 +1464,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1491,7 +1491,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON_ORANGE,CONTENT_BED_ORANGE_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1523,7 +1523,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1550,7 +1550,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON_PURPLE,CONTENT_BED_PURPLE_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1582,7 +1582,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1609,7 +1609,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON_RED,CONTENT_BED_RED_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1641,7 +1641,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1668,7 +1668,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON_YELLOW,CONTENT_BED_YELLOW_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1700,7 +1700,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1727,7 +1727,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_bed_head(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	crafting::setBedRecipe(CONTENT_COTTON_BLACK,CONTENT_BED_BLACK_HEAD);
 	content_list_add("craftguide",i,1,0);
@@ -1759,7 +1759,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_bed_foot(f);
 	f->type = CMT_WOOD;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 
@@ -1781,7 +1781,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,1);
 	content_nodebox_slab(f);
 	f->type = CMT_PLANT;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	{
 		content_t r[9] = {
@@ -1815,7 +1815,7 @@ void content_mapnode_furniture(bool repeat)
 	f->onact_also_affects = v3s16(0,0,-1);
 	content_nodebox_slab(f);
 	f->type = CMT_PLANT;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1839,7 +1839,7 @@ void content_mapnode_furniture(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_WHITE)+" 1";
 	f->type = CMT_WOOD;
 	content_nodebox_painting(f);
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	{
 		u16 r[9] = {
@@ -1873,7 +1873,7 @@ void content_mapnode_furniture(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_RED)+" 1";
 	f->type = CMT_WOOD;
 	content_nodebox_painting(f);
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	{
 		u16 r[9] = {
@@ -1907,7 +1907,7 @@ void content_mapnode_furniture(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_GREEN)+" 1";
 	f->type = CMT_WOOD;
 	content_nodebox_painting(f);
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	{
 		u16 r[9] = {
@@ -1941,7 +1941,7 @@ void content_mapnode_furniture(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_BLUE)+" 1";
 	f->type = CMT_WOOD;
 	content_nodebox_painting(f);
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	{
 		u16 r[9] = {
@@ -1975,7 +1975,7 @@ void content_mapnode_furniture(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_CANVAS)+" 1";
 	f->type = CMT_WOOD;
 	content_nodebox_painting(f);
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	crafting::set1Any2Recipe(CONTENT_PAINTING_WHITE,CONTENT_CRAFTITEM_STARCH,CONTENT_PAINTING_CANVAS);
 	crafting::set1Any2Recipe(CONTENT_PAINTING_RED,CONTENT_CRAFTITEM_STARCH,CONTENT_PAINTING_CANVAS);
@@ -2010,7 +2010,7 @@ void content_mapnode_furniture(bool repeat)
 	f->fuel_time = 1;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	content_nodebox_clock(f);
 	f->setInventoryTextureNodeBox(i,"clock.png","clock_front.png","clock.png");
 	f->pressure_type = CST_CRUSHABLE;
diff --git a/src/content_mapnode_plants.cpp b/src/content_mapnode_plants.cpp
index 5c5212e..723bc54 100644
--- a/src/content_mapnode_plants.cpp
+++ b/src/content_mapnode_plants.cpp
@@ -49,7 +49,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
 	f->fuel_time = 30;
 	f->type = CMT_TREE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->ondig_special_drop = CONTENT_WOOD;
 	f->ondig_special_drop_count = 6;
 	f->ondig_special_tool = TT_AXE;
@@ -70,7 +70,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
 	f->fuel_time = 30;
 	f->type = CMT_TREE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->ondig_special_drop = CONTENT_WOOD;
 	f->ondig_special_drop_count = 6;
 	f->ondig_special_tool = TT_AXE;
@@ -91,7 +91,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
 	f->fuel_time = 30;
 	f->type = CMT_TREE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->ondig_special_drop = CONTENT_JUNGLEWOOD;
 	f->ondig_special_drop_count = 6;
 	f->ondig_special_tool = TT_AXE;
@@ -111,7 +111,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
 	f->fuel_time = 25;
 	f->type = CMT_TREE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->ondig_special_drop = CONTENT_WOOD_PINE;
 	f->ondig_special_drop_count = 6;
 	f->ondig_special_tool = TT_AXE;
@@ -134,7 +134,7 @@ void content_mapnode_plants(bool repeat)
 	f->special_alternate_node = CONTENT_LEAVES;
 	f->fuel_time = 20;
 	f->type = CMT_TREE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
 
@@ -154,7 +154,7 @@ void content_mapnode_plants(bool repeat)
 	f->special_alternate_node = CONTENT_JUNGLELEAVES;
 	f->fuel_time = 20;
 	f->type = CMT_TREE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
 
@@ -174,7 +174,7 @@ void content_mapnode_plants(bool repeat)
 	f->special_alternate_node = CONTENT_APPLE_LEAVES;
 	f->fuel_time = 20;
 	f->type = CMT_TREE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
 
@@ -194,7 +194,7 @@ void content_mapnode_plants(bool repeat)
 	f->special_alternate_node = CONTENT_CONIFER_LEAVES;
 	f->fuel_time = 20;
 	f->type = CMT_TREE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
 
@@ -214,7 +214,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/32;
 	f->type = CMT_PLANT;
-	f->hardness = 0.20;
+	f->dig_time = 0.20;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -235,7 +235,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/32;
 	f->type = CMT_PLANT;
-	f->hardness = 0.20;
+	f->dig_time = 0.20;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -266,7 +266,7 @@ void content_mapnode_plants(bool repeat)
 	f->place_on_drop = CONTENT_SAPLING;
 	f->place_on_drop_alternate = CONTENT_WILDGRASS_SHORT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -298,7 +298,7 @@ void content_mapnode_plants(bool repeat)
 	f->place_on_drop = CONTENT_SAPLING;
 	f->place_on_drop_alternate = CONTENT_WILDGRASS_SHORT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -330,7 +330,7 @@ void content_mapnode_plants(bool repeat)
 	f->place_on_drop = CONTENT_SAPLING;
 	f->place_on_drop_alternate = CONTENT_WILDGRASS_SHORT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -362,7 +362,7 @@ void content_mapnode_plants(bool repeat)
 	f->place_on_drop = CONTENT_SAPLING;
 	f->place_on_drop_alternate = CONTENT_WILDGRASS_SHORT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -395,7 +395,7 @@ void content_mapnode_plants(bool repeat)
 	f->place_on_drop = CONTENT_APPLE_SAPLING;
 	f->place_on_drop_alternate = CONTENT_WILDGRASS_SHORT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -427,7 +427,7 @@ void content_mapnode_plants(bool repeat)
 	f->place_on_drop = CONTENT_JUNGLESAPLING;
 	f->place_on_drop_alternate = CONTENT_WILDGRASS_SHORT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -459,7 +459,7 @@ void content_mapnode_plants(bool repeat)
 	f->place_on_drop = CONTENT_CONIFER_SAPLING;
 	f->place_on_drop_alternate = CONTENT_WILDGRASS_SHORT;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -484,7 +484,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -509,7 +509,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -534,7 +534,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -559,7 +559,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -584,7 +584,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -609,7 +609,7 @@ void content_mapnode_plants(bool repeat)
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -635,7 +635,7 @@ void content_mapnode_plants(bool repeat)
 	f->extra_dug_item_rarity = 1;
 	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLE_LEAVES)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("decrafting",i,1,0);
@@ -657,7 +657,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -677,7 +677,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/32;
 	f->type = CMT_PLANT;
-	f->hardness = 0.20;
+	f->dig_time = 0.20;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -697,7 +697,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/32;
 	f->type = CMT_PLANT;
-	f->hardness = 0.20;
+	f->dig_time = 0.20;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -718,7 +718,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/32;
 	f->type = CMT_PLANT;
-	f->hardness = 0.20;
+	f->dig_time = 0.20;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -781,7 +781,7 @@ void content_mapnode_plants(bool repeat)
 	));
 	f->setInventoryTextureCube("cactus_top.png", "cactus_side.png", "cactus_side.png");
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	content_list_add("creative",i,1,0);
 
@@ -803,7 +803,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/32;
 	f->type = CMT_PLANT;
-	f->hardness = 0.25;
+	f->dig_time = 0.25;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -823,7 +823,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 1;
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->fertilizer_affects = true;
@@ -844,7 +844,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 1;
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->fertilizer_affects = true;
@@ -865,7 +865,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 1;
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->fertilizer_affects = true;
@@ -886,7 +886,7 @@ void content_mapnode_plants(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 1;
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->fertilizer_affects = true;
@@ -910,7 +910,7 @@ void content_mapnode_plants(bool repeat)
 	f->ondig_replace_node = CONTENT_APPLE_LEAVES;
 	f->ondig_replace_node_requires = CONTENT_APPLE_TREE;
 	f->type = CMT_PLANT;
-	f->hardness = 0.0;
+	f->dig_time = 0.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -935,7 +935,7 @@ void content_mapnode_plants(bool repeat)
 	//f->pointable = false;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -957,7 +957,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -979,7 +979,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1001,7 +1001,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 
@@ -1023,7 +1023,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1046,7 +1046,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1069,7 +1069,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.10;
+	f->dig_time = 0.10;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1088,7 +1088,7 @@ void content_mapnode_plants(bool repeat)
 	f->special_alternate_node = CONTENT_TEA;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1111,7 +1111,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1131,7 +1131,7 @@ void content_mapnode_plants(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_COFFEE_BEANS)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1153,7 +1153,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/32;
 	f->buildable_to = true;
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_list_add("creative",i,1,0);
@@ -1179,7 +1179,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/16;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->onpunch_gives_inventory = true;
@@ -1209,7 +1209,7 @@ void content_mapnode_plants(bool repeat)
 	f->fuel_time = 30/16;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_PLANT;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->onpunch_gives_inventory = true;
diff --git a/src/content_mapnode_sign.cpp b/src/content_mapnode_sign.cpp
index 3635a5e..44d46dd 100644
--- a/src/content_mapnode_sign.cpp
+++ b/src/content_mapnode_sign.cpp
@@ -50,7 +50,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->alternate_lockstate_node = CONTENT_LOCKABLE_SIGN;
@@ -80,7 +80,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->alternate_lockstate_node = CONTENT_LOCKABLE_SIGN_WALL;
@@ -105,7 +105,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->alternate_lockstate_node = CONTENT_LOCKABLE_SIGN_UD;
@@ -130,7 +130,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign(f);
@@ -160,7 +160,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_wall(f);
@@ -184,7 +184,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_ud(f);
@@ -208,7 +208,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign(f);
@@ -237,7 +237,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_wall(f);
@@ -261,7 +261,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_ud(f);
@@ -285,7 +285,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign(f);
@@ -314,7 +314,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_wall(f);
@@ -338,7 +338,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_ud(f);
@@ -362,7 +362,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_STONE;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign(f);
@@ -391,7 +391,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_STONE;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_wall(f);
@@ -415,7 +415,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SignNodeMetadata("Some sign");
 	f->type = CMT_STONE;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_sign_ud(f);
@@ -443,7 +443,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new LockingSignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->alternate_lockstate_node = CONTENT_SIGN_WALL;
@@ -469,7 +469,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new LockingSignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->alternate_lockstate_node = CONTENT_SIGN;
@@ -499,7 +499,7 @@ void content_mapnode_sign(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new LockingSignNodeMetadata("Some sign");
 	f->type = CMT_WOOD;
-	f->hardness = 0.1;
+	f->dig_time = 0.1;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->alternate_lockstate_node = CONTENT_SIGN_UD;
diff --git a/src/content_mapnode_slab.cpp b/src/content_mapnode_slab.cpp
index 55ab5ba..71162d4 100644
--- a/src/content_mapnode_slab.cpp
+++ b/src/content_mapnode_slab.cpp
@@ -44,7 +44,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png", "roughstone.png", "roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONE_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -62,7 +62,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png", "cobble.png", "cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_COBBLE,CONTENT_COBBLE_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -80,7 +80,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png", "mossycobble.png", "mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_MOSSYCOBBLE,CONTENT_MOSSYCOBBLE_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -97,7 +97,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"stone.png", "stone.png", "stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_STONE,CONTENT_STONE_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -116,7 +116,7 @@ void content_mapnode_slab(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_WOOD,CONTENT_WOOD_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -135,7 +135,7 @@ void content_mapnode_slab(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_JUNGLEWOOD,CONTENT_JUNGLE_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -156,7 +156,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"brick_top.png", "brick.png", "brick_side.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_BRICK,CONTENT_BRICK_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -173,7 +173,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png", "sandstone.png", "sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_SANDSTONE,CONTENT_SANDSTONE_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -198,7 +198,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png", "glass_slab.png", "glass_slab.png^glass.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -223,7 +223,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_BLUE_SLAB);
 	crafting::set1Any2Recipe(CONTENT_GLASS_SLAB,CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_GLASS_BLUE_SLAB);
@@ -249,7 +249,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_GREEN_SLAB);
 	crafting::set1Any2Recipe(CONTENT_GLASS_SLAB,CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_GLASS_GREEN_SLAB);
@@ -275,7 +275,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_ORANGE_SLAB);
 	crafting::set1Any2Recipe(CONTENT_GLASS_SLAB,CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_GLASS_ORANGE_SLAB);
@@ -301,7 +301,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_PURPLE_SLAB);
 	crafting::set1Any2Recipe(CONTENT_GLASS_SLAB,CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_GLASS_PURPLE_SLAB);
@@ -327,7 +327,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_RED_SLAB);
 	crafting::set1Any2Recipe(CONTENT_GLASS_SLAB,CONTENT_CRAFTITEM_DYE_RED,CONTENT_GLASS_RED_SLAB);
@@ -353,7 +353,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_YELLOW_SLAB);
 	crafting::set1Any2Recipe(CONTENT_GLASS_SLAB,CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_GLASS_YELLOW_SLAB);
@@ -379,7 +379,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_GLASS,CONTENT_GLASS_BLACK_SLAB);
 	crafting::set1Any2Recipe(CONTENT_GLASS_SLAB,CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_GLASS_BLACK_SLAB);
@@ -398,7 +398,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slab(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png", "limestone.png", "limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 	crafting::setRow3Recipe(CONTENT_LIMESTONE,CONTENT_LIMESTONE_SLAB);
 	content_list_add("craftguide",i,1,0);
@@ -416,7 +416,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png", "roughstone.png", "roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_COBBLE_SLAB_UD;
@@ -431,7 +431,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png", "cobble.png", "cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_MOSSYCOBBLE_SLAB_UD;
@@ -445,7 +445,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png", "mossycobble.png", "mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_STONE_SLAB_UD;
@@ -458,7 +458,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"stone.png", "stone.png", "stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_WOOD_SLAB_UD;
@@ -473,7 +473,7 @@ void content_mapnode_slab(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_JUNGLE_SLAB_UD;
@@ -488,7 +488,7 @@ void content_mapnode_slab(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_BRICK_SLAB_UD;
@@ -505,7 +505,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"brick_top.png", "brick.png^[transformfy", "brick_side.png^[transformfy");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_SANDSTONE_SLAB_UD;
@@ -518,7 +518,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png", "sandstone.png", "sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_SLAB_UD;
@@ -540,7 +540,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png", "glass_slab.png^glass.png", "glass_slab.png^glass.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_BLUE_SLAB_UD;
@@ -562,7 +562,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_GREEN_SLAB_UD;
@@ -584,7 +584,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_ORANGE_SLAB_UD;
@@ -606,7 +606,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_PURPLE_SLAB_UD;
@@ -628,7 +628,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_RED_SLAB_UD;
@@ -650,7 +650,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_YELLOW_SLAB_UD;
@@ -672,7 +672,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_GLASS_BLACK_SLAB_UD;
@@ -694,7 +694,7 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png");
 	f->type = CMT_GLASS;
-	f->hardness = 0.15;
+	f->dig_time = 0.15;
 	f->suffocation_per_second = 0;
 
 	i = CONTENT_LIMESTONE_SLAB_UD;
@@ -708,6 +708,6 @@ void content_mapnode_slab(bool repeat)
 	content_nodebox_slabud(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png", "limestone.png", "limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 }
diff --git a/src/content_mapnode_special.cpp b/src/content_mapnode_special.cpp
index 35c987c..9d688bd 100644
--- a/src/content_mapnode_special.cpp
+++ b/src/content_mapnode_special.cpp
@@ -48,7 +48,7 @@ void content_mapnode_special(bool repeat)
 	f->fuel_time = 15;
 	f->special_alternate_node = CONTENT_WOOD;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_fence_inv(f);
@@ -74,7 +74,7 @@ void content_mapnode_special(bool repeat)
 	f->air_equivalent = true; // grass grows underneath
 	f->special_alternate_node = CONTENT_STEEL;
 	f->type = CMT_STONE;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	f->destructive_mob_safe = true;
@@ -101,7 +101,7 @@ void content_mapnode_special(bool repeat)
 	f->fuel_time = 15;
 	f->special_alternate_node = CONTENT_JUNGLEWOOD;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_fence_inv(f);
@@ -127,7 +127,7 @@ void content_mapnode_special(bool repeat)
 	f->fuel_time = 15;
 	f->special_alternate_node = CONTENT_WOOD_PINE;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_fence_inv(f);
@@ -153,7 +153,7 @@ void content_mapnode_special(bool repeat)
 	f->fuel_time = 15;
 	f->special_alternate_node = CONTENT_APPLEWOOD;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_fence_inv(f);
@@ -176,7 +176,7 @@ void content_mapnode_special(bool repeat)
 	f->air_equivalent = true; // grass grows underneath
 	f->special_alternate_node = CONTENT_STEEL;
 	f->type = CMT_STONE;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_SOLID;
 	f->suffocation_per_second = 0;
 	content_nodebox_bars(f);
@@ -205,7 +205,7 @@ void content_mapnode_special(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->air_equivalent = true; // grass grows underneath
 	f->type = CMT_DIRT;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->suffocation_per_second = 0;
 	{
 		u16 r[9] = {
@@ -232,7 +232,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -248,7 +248,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -265,7 +265,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -288,7 +288,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -310,7 +310,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -332,7 +332,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -355,7 +355,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -378,7 +378,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -401,7 +401,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -424,7 +424,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -447,7 +447,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -470,7 +470,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_GLASS;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -487,7 +487,7 @@ void content_mapnode_special(bool repeat)
 	f->draw_type = CDT_ROOFLIKE;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	content_nodebox_roofcollide(f);
@@ -515,7 +515,7 @@ void content_mapnode_special(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/16;
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->setNodeBox(core::aabbox3d<f32>(
@@ -574,7 +574,7 @@ void content_mapnode_special(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/16;
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->setNodeBox(core::aabbox3d<f32>(
@@ -608,7 +608,7 @@ void content_mapnode_special(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/16;
 	f->type = CMT_WOOD;
-	f->hardness = 0.5;
+	f->dig_time = 0.5;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	f->setNodeBox(core::aabbox3d<f32>(
@@ -635,7 +635,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new BorderStoneNodeMetadata();
 	f->type = CMT_STONE;
-	f->hardness = 2.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_SOLID;
 	crafting::setFilledRoundRecipe(CONTENT_STONE,CONTENT_CRAFTITEM_MITHRIL_RAW,CONTENT_BORDERSTONE);
 	crafting::setFilledRoundRecipe(CONTENT_STONE,CONTENT_CRAFTITEM_MITHRIL_UNBOUND,CONTENT_BORDERSTONE);
@@ -673,7 +673,7 @@ void content_mapnode_special(bool repeat)
 	f->setFaceText(0,FaceText(0.45,0.3,0.9875,0.7375));
 	f->setInventoryTextureNodeBox(i, "book_cover.png", "book_end.png^[transformFX", "book_side.png^[transformFY");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::setCol1Recipe(CONTENT_CRAFTITEM_PAPER,i);
@@ -703,7 +703,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_book(f);
 	f->setInventoryTextureNodeBox(i, "book_cook_cover.png", "book_cook_end.png^[transformFX", "book_cook_side.png^[transformFY");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_BOOK,CONTENT_CRAFTITEM_COAL,i);
@@ -734,7 +734,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_book(f);
 	f->setInventoryTextureNodeBox(i, "book_decraft_cover.png", "book_decraft_end.png^[transformFX", "book_decraft_side.png^[transformFY");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_BOOK,CONTENT_CRAFTITEM_GUNPOWDER,i);
@@ -765,7 +765,7 @@ void content_mapnode_special(bool repeat)
 	f->setFaceText(0,FaceText(0.45,0.3,0.9875,0.7375));
 	f->setInventoryTextureNodeBox(i, "book_diary_cover.png", "book_diary_end.png^[transformFX", "book_diary_side.png^[transformFY");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_BOOK,CONTENT_CRAFTITEM_STEEL_INGOT,i);
@@ -795,7 +795,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_book(f);
 	f->setInventoryTextureNodeBox(i, "book_craft_cover.png", "book_craft_end.png^[transformFX", "book_craft_side.png^[transformFY");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_BOOK,CONTENT_CRAFTITEM_MITHRIL_RAW,i);
@@ -834,7 +834,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_book(f);
 	f->setInventoryTextureNodeBox(i, "book_rcraft_cover.png", "book_rcraft_end.png^[transformFX", "book_rcraft_side.png^[transformFY");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	{
@@ -871,7 +871,7 @@ void content_mapnode_special(bool repeat)
 	f->setFaceText(0,FaceText(0.15,0.35,0.85,0.85,FTT_BOOKCONTENT));
 	f->setInventoryTextureNodeBox(i, "guide_top.png", "guide_end.png", "guide_side.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	if (f->initial_metadata == NULL)
@@ -898,7 +898,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_guide(f);
 	f->setInventoryTextureNodeBox(i, "guide_cook_top.png", "guide_cook_end.png", "guide_cook_side.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	if (f->initial_metadata == NULL)
@@ -925,7 +925,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_guide(f);
 	f->setInventoryTextureNodeBox(i, "guide_decraft_top.png", "guide_decraft_end.png", "guide_decraft_side.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	if (f->initial_metadata == NULL)
@@ -953,7 +953,7 @@ void content_mapnode_special(bool repeat)
 	f->setFaceText(0,FaceText(0.15,0.35,0.85,0.85,FTT_BOOKCONTENT));
 	f->setInventoryTextureNodeBox(i, "guide_diary_top.png", "guide_diary_end.png", "guide_diary_side.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	if (f->initial_metadata == NULL)
@@ -980,7 +980,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_guide(f);
 	f->setInventoryTextureNodeBox(i, "guide_craft_top.png", "guide_craft_end.png", "guide_craft_side.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	if (f->initial_metadata == NULL)
@@ -1007,7 +1007,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_guide(f);
 	f->setInventoryTextureNodeBox(i, "guide_rcraft_top.png", "guide_rcraft_end.png", "guide_rcraft_side.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	if (f->initial_metadata == NULL)
@@ -1071,7 +1071,7 @@ void content_mapnode_special(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->light_source = LIGHT_MAX-1;
 	f->type = CMT_WOOD;
-	f->hardness = 0.0;
+	f->dig_time = 0.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
 	crafting::set1over4Recipe(CONTENT_CRAFTITEM_COAL,CONTENT_CRAFTITEM_STICK,CONTENT_TORCH);
@@ -1113,7 +1113,7 @@ void content_mapnode_special(bool repeat)
 		f->initial_metadata = new ChestNodeMetadata();
 	f->sound_access = "open-chest";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	crafting::setRoundRecipe(CONTENT_WOOD,CONTENT_CHEST);
 	content_list_add("craftguide",i,1,0);
@@ -1152,7 +1152,7 @@ void content_mapnode_special(bool repeat)
 		f->initial_metadata = new ChestNodeMetadata();
 	f->sound_access = "open-chest";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	crafting::setRoundRecipe(CONTENT_WOOD_PINE,CONTENT_CHEST_PINE);
 	content_list_add("craftguide",i,1,0);
@@ -1191,7 +1191,7 @@ void content_mapnode_special(bool repeat)
 		f->initial_metadata = new ChestNodeMetadata();
 	f->sound_access = "open-chest";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	crafting::setRoundRecipe(CONTENT_JUNGLEWOOD,CONTENT_CHEST_JUNGLE);
 	content_list_add("craftguide",i,1,0);
@@ -1230,7 +1230,7 @@ void content_mapnode_special(bool repeat)
 		f->initial_metadata = new ChestNodeMetadata();
 	f->sound_access = "open-chest";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	crafting::setRoundRecipe(CONTENT_APPLEWOOD,CONTENT_CHEST_APPLE);
 	content_list_add("craftguide",i,1,0);
@@ -1252,7 +1252,7 @@ void content_mapnode_special(bool repeat)
 		f->initial_metadata = new DeprecatedChestNodeMetadata();
 	f->sound_access = "open-chest";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 
 	i = CONTENT_CREATIVE_CHEST;
@@ -1271,7 +1271,7 @@ void content_mapnode_special(bool repeat)
 		f->initial_metadata = new CreativeChestNodeMetadata();
 	f->sound_access = "open-chest";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	content_list_add("player-creative",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -1293,7 +1293,7 @@ void content_mapnode_special(bool repeat)
 		f->initial_metadata = new LockingDeprecatedChestNodeMetadata();
 	f->sound_access = "open-chest";
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 
 	i = CONTENT_SAFE;
@@ -1311,7 +1311,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new SafeNodeMetadata();
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->pressure_type = CST_SOLID;
 	f->destructive_mob_safe = true;
 	crafting::setFilledRoundRecipe(CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_CRAFTITEM_COPPER_INGOT,CONTENT_SAFE);
@@ -1337,7 +1337,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new FurnaceNodeMetadata();
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	f->pressure_type = CST_SOLID;
 	f->alternate_lockstate_node = CONTENT_LOCKABLE_FURNACE;
 	crafting::setRoundRecipe(CONTENT_ROUGHSTONE,CONTENT_FURNACE);
@@ -1359,7 +1359,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new FurnaceNodeMetadata();
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	f->pressure_type = CST_SOLID;
 
 	i = CONTENT_LOCKABLE_FURNACE;
@@ -1381,7 +1381,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new LockingFurnaceNodeMetadata();
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	f->pressure_type = CST_SOLID;
 	f->alternate_lockstate_node = CONTENT_FURNACE;
 	crafting::setFilledRoundRecipe(CONTENT_ROUGHSTONE,CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_LOCKABLE_FURNACE);
@@ -1404,7 +1404,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new LockingFurnaceNodeMetadata();
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	f->pressure_type = CST_SOLID;
 
 	i = CONTENT_INCINERATOR;
@@ -1426,7 +1426,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new IncineratorNodeMetadata();
 	f->type = CMT_STONE;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_SOLID;
 	crafting::setFilledRoundRecipe(CONTENT_ROUGHSTONE,CONTENT_CRAFTITEM_MITHRIL_UNBOUND,CONTENT_INCINERATOR);
 	content_list_add("craftguide",i,1,0);
@@ -1447,7 +1447,7 @@ void content_mapnode_special(bool repeat)
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new IncineratorNodeMetadata();
 	f->type = CMT_STONE;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->pressure_type = CST_SOLID;
 
 
@@ -1479,7 +1479,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new CampFireNodeMetadata();
 	f->type = CMT_WOOD;
-	f->hardness = 2.0;
+	f->dig_time = 2.0;
 	f->pressure_type = CST_CRUSHED;
 	{
 		u16 r[9] = {
@@ -1505,7 +1505,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureCube("nc_side.png", "nc_front.png", "nc_side.png");
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	content_list_add("creative",i,1,0);
 
 	i = CONTENT_NC_RB;
@@ -1516,7 +1516,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureCube("nc_rb.png", "nc_rb.png", "nc_rb.png");
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	content_list_add("creative",i,1,0);
 
 	i = CONTENT_FLOWER_POT_RAW;
@@ -1532,7 +1532,7 @@ void content_mapnode_special(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_FLOWER_POT)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->pressure_type = CST_CRUSHABLE;
 	content_nodebox_flower_pot(f);
 	f->setInventoryTextureNodeBox(i,"flower_pot_raw_top.png","flower_pot_raw.png","flower_pot_raw.png");
@@ -1552,7 +1552,7 @@ void content_mapnode_special(bool repeat)
 	f->sunlight_propagates = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_STONE;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	content_nodebox_flower_pot(f);
 	f->setInventoryTextureNodeBox(i,"flower_pot_top.png","flower_pot.png","flower_pot.png");
 	content_list_add("creative",i,1,0);
@@ -1575,7 +1575,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
 	f->special_alternate_node = CONTENT_COBBLE;
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 	crafting::setWallRecipe(CONTENT_COBBLE,CONTENT_COBBLE_WALL);
 	content_list_add("craftguide",i,1,0);
@@ -1598,7 +1598,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
 	f->special_alternate_node = CONTENT_ROUGHSTONE;
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 	crafting::setWallRecipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONE_WALL);
 	content_list_add("craftguide",i,1,0);
@@ -1621,7 +1621,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
 	f->special_alternate_node = CONTENT_MOSSYCOBBLE;
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->suffocation_per_second = 0;
 	crafting::setWallRecipe(CONTENT_MOSSYCOBBLE,CONTENT_MOSSYCOBBLE_WALL);
 	content_list_add("craftguide",i,1,0);
@@ -1644,7 +1644,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
 	f->special_alternate_node = CONTENT_STONE;
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setWallRecipe(CONTENT_STONE,CONTENT_STONE_WALL);
 	content_list_add("craftguide",i,1,0);
@@ -1667,7 +1667,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
 	f->special_alternate_node = CONTENT_SANDSTONE;
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setWallRecipe(CONTENT_SANDSTONE,CONTENT_SANDSTONE_WALL);
 	content_list_add("craftguide",i,1,0);
@@ -1690,7 +1690,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
 	f->special_alternate_node = CONTENT_LIMESTONE;
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->suffocation_per_second = 0;
 	crafting::setWallRecipe(CONTENT_LIMESTONE,CONTENT_LIMESTONE_WALL);
 	content_list_add("craftguide",i,1,0);
@@ -1713,7 +1713,7 @@ void content_mapnode_special(bool repeat)
 	f->setInventoryTextureNodeBox(i,"marble.png","marble.png","marble.png");
 	f->special_alternate_node = CONTENT_MARBLE;
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setWallRecipe(CONTENT_MARBLE,CONTENT_MARBLE_WALL);
 	content_list_add("craftguide",i,1,0);
@@ -1733,7 +1733,7 @@ void content_mapnode_special(bool repeat)
 	if(f->initial_metadata == NULL)
 		f->initial_metadata = new TNTNodeMetadata();
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_TNT,CONTENT_TNT);
 	content_list_add("craftguide",i,1,0);
@@ -1794,7 +1794,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_WHITE;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	{
 		content_t r[9] = {
@@ -1839,7 +1839,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_BLUE;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_FLAG,CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_FLAG_BLUE);
 	if(f->initial_metadata == NULL)
@@ -1863,7 +1863,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_GREEN;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_FLAG,CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_FLAG_GREEN);
 	if(f->initial_metadata == NULL)
@@ -1887,7 +1887,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_ORANGE;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_FLAG,CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_FLAG_ORANGE);
 	if(f->initial_metadata == NULL)
@@ -1911,7 +1911,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_PURPLE;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_FLAG,CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_FLAG_PURPLE);
 	if(f->initial_metadata == NULL)
@@ -1935,7 +1935,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_RED;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_FLAG,CONTENT_CRAFTITEM_DYE_RED,CONTENT_FLAG_RED);
 	if(f->initial_metadata == NULL)
@@ -1959,7 +1959,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_YELLOW;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_FLAG,CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_FLAG_YELLOW);
 	if(f->initial_metadata == NULL)
@@ -1983,7 +1983,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_flag(f);
 	f->home_node = PLAYERFLAG_BLACK;
 	f->type = CMT_WOOD;
-	f->hardness = 0.4;
+	f->dig_time = 0.4;
 	f->suffocation_per_second = 0;
 	crafting::set1Any2Recipe(CONTENT_FLAG,CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_FLAG_BLACK);
 	if(f->initial_metadata == NULL)
@@ -2002,7 +2002,7 @@ void content_mapnode_special(bool repeat)
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->suffocation_per_second = 0;
 	{
 		content_t r[9] = {
@@ -2035,7 +2035,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_parcel(f);
 	f->setInventoryTextureNodeBox(i,"parcel_top.png", "parcel.png", "parcel.png");
 	f->type = CMT_DIRT;
-	f->hardness = 0.01;
+	f->dig_time = 0.01;
 	f->suffocation_per_second = 0;
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new ParcelNodeMetadata();
@@ -2048,7 +2048,7 @@ void content_mapnode_special(bool repeat)
 	f->setMetaTexture(0,"water.png");
 	f->draw_type = CDT_NODEBOX_META;
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	content_nodebox_cauldron(f);
 	f->setInventoryTextureNodeBox(i,"cauldron_outer.png", "cauldron_outer.png", "cauldron_outer.png");
@@ -2068,7 +2068,7 @@ void content_mapnode_special(bool repeat)
 	f->setTexture(1,"forge_bottom.png");
 	f->draw_type = CDT_NODEBOX;
 	f->type = CMT_STONE;
-	f->hardness = 3.0;
+	f->dig_time = 3.0;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	content_nodebox_forge(f);
 	f->setInventoryTextureNodeBox(i,"forge_top.png", "forge_side.png", "forge_side.png");
@@ -2117,7 +2117,7 @@ void content_mapnode_special(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->flammable = 1;
     f->fuel_time = 30/4;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->is_ground_content = true;
 	f->light_propagates = true;
 	f->param_type = CPT_LIGHT;
diff --git a/src/content_mapnode_stair.cpp b/src/content_mapnode_stair.cpp
index c66487e..0439a02 100644
--- a/src/content_mapnode_stair.cpp
+++ b/src/content_mapnode_stair.cpp
@@ -43,7 +43,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png", "roughstone.png", "roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONE_STAIR);
@@ -61,7 +61,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png", "cobble.png", "cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_COBBLE_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_COBBLE,CONTENT_COBBLE_STAIR);
@@ -79,7 +79,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png", "mossycobble.png", "mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_MOSSYCOBBLE,CONTENT_MOSSYCOBBLE_STAIR);
@@ -98,7 +98,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair(f);
 	f->setInventoryTextureNodeBox(i,"stone.png", "stone.png", "stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_STONE,CONTENT_STONE_STAIR);
@@ -118,7 +118,7 @@ void content_mapnode_stair(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_WOOD_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_WOOD,CONTENT_WOOD_STAIR);
@@ -138,7 +138,7 @@ void content_mapnode_stair(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_JUNGLE_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_JUNGLEWOOD,CONTENT_JUNGLE_STAIR);
@@ -161,7 +161,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair(f);
 	f->setInventoryTextureNodeBox(i,"brick_stair_top.png", "brick_stair_front.png", "brick_side.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_BRICK,CONTENT_BRICK_STAIR);
@@ -179,7 +179,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png", "sandstone.png", "sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_SANDSTONE,CONTENT_SANDSTONE_STAIR);
@@ -197,7 +197,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png", "limestone.png", "limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 	crafting::setStairRecipe(CONTENT_LIMESTONE,CONTENT_LIMESTONE_STAIR);
@@ -215,7 +215,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stairud(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png", "roughstone.png", "roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -230,7 +230,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stairud(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png", "cobble.png", "cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_COBBLE_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -245,7 +245,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stairud(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png", "mossycobble.png", "mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -260,7 +260,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stairud(f);
 	f->setInventoryTextureNodeBox(i,"stone.png", "stone.png", "stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -277,7 +277,7 @@ void content_mapnode_stair(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_WOOD_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -294,7 +294,7 @@ void content_mapnode_stair(bool repeat)
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_JUNGLE_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -314,7 +314,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stairud(f);
 	f->setInventoryTextureNodeBox(i,"brick.png", "brick_front.png", "brick.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -329,7 +329,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stairud(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png", "sandstone.png", "sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -344,7 +344,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stairud(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png", "limestone.png", "limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 	f->suffocation_per_second = 0;
@@ -361,7 +361,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -376,7 +376,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_COBBLE_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -391,7 +391,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -406,7 +406,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -423,7 +423,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_WOOD_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -441,7 +441,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_JUNGLE_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -458,7 +458,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -473,7 +473,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -488,7 +488,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_INNER_STAIR_CORNER;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -504,7 +504,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -519,7 +519,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_COBBLE_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -533,7 +533,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -547,7 +547,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -564,7 +564,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_WOOD_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -582,7 +582,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_JUNGLE_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -598,7 +598,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -612,7 +612,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -626,7 +626,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_INNER_STAIR_CORNER_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -642,7 +642,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -656,7 +656,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_COBBLE_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -671,7 +671,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -685,7 +685,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -702,7 +702,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_WOOD_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -719,7 +719,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_JUNGLE_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -737,7 +737,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -752,7 +752,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -766,7 +766,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_corner(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_STAIR;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -782,7 +782,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_ROUGHSTONE_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -797,7 +797,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_COBBLE_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -812,7 +812,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.8;
+	f->dig_time = 0.8;
 	f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -827,7 +827,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_STONE_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -844,7 +844,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 0.75;
+	f->dig_time = 0.75;
 	f->onpunch_replace_node = CONTENT_WOOD_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -862,7 +862,7 @@ void content_mapnode_stair(bool repeat)
 					  // it is set on fire
 	f->fuel_time = 30;
 	f->type = CMT_WOOD;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_JUNGLE_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -878,7 +878,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
 	f->type = CMT_STONE;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_BRICK_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -893,7 +893,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
 	f->type = CMT_DIRT;
-	f->hardness = 1.0;
+	f->dig_time = 1.0;
 	f->onpunch_replace_node = CONTENT_SANDSTONE_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 
@@ -908,7 +908,7 @@ void content_mapnode_stair(bool repeat)
 	content_nodebox_inner_stair_cornerud(f);
 	f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
 	f->type = CMT_STONE;
-	f->hardness = 0.9;
+	f->dig_time = 0.9;
 	f->onpunch_replace_node = CONTENT_LIMESTONE_STAIR_UD;
 	f->onpunch_replace_respects_borderstone = true;
 }
diff --git a/src/content_mapnode_util.cpp b/src/content_mapnode_util.cpp
index 33ae42b..ddb83f6 100644
--- a/src/content_mapnode_util.cpp
+++ b/src/content_mapnode_util.cpp
@@ -30,7 +30,7 @@ void content_nodedef_knob(content_t nodeid, content_t source_node, ContentMateri
 	features->light_propagates = true;
 	features->dug_item = std::string("MaterialItem2 ")+itos(nodeid)+" 1";
 	features->type = CMT_STONE;
-	features->hardness = 0.8;
+	features->dig_time = 0.8;
 	features->climbable = true;
 	features->suffocation_per_second = 0;
 	if (material_type == CMT_WOOD) {
diff --git a/src/content_toolitem.cpp b/src/content_toolitem.cpp
index ff575b9..cfff995 100644
--- a/src/content_toolitem.cpp
+++ b/src/content_toolitem.cpp
@@ -188,6 +188,8 @@ int get_tool_use(tooluse_t *info, content_t target, uint16_t data, content_t too
 		}else{
 			info->data = 4.0;
 		}
+
+		info->data *= c_features->dig_time;
 	}
 
 	if (type_match && data != 0 && info->diggable) {
diff --git a/src/mapnode.h b/src/mapnode.h
index 060bc85..c64ec0b 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -503,8 +503,8 @@ struct ContentFeatures
 
 	// the material type (stone, wood, etc)
 	ContentMaterialType type;
-	// the hardness of the node
-	f32 hardness;
+	// the dig time of the node
+	f32 dig_time;
 	// for pistons
 	ContentPressureType pressure_type;
 
@@ -619,7 +619,7 @@ struct ContentFeatures
 		liquid_viscosity = 0;
 		light_source = 0;
 		type = CMT_AIR;
-		hardness = 1.0;
+		dig_time = 1.0;
 		pressure_type = CST_MOVABLE;
 		damage_per_second = 0;
 		suffocation_per_second = 20;