Merge branch '1.1' of https://github.com/D00Med/farlands into 1.1

mods/decoblocks/nodes.lua

@@ -867,11 +867,21 @@ tiles = {
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.3, -0.5, -0.3, 0.3, 1, 0.3}
+		fixed = {
+			{-0.3125, -0.5, -0.4375, 0.3125, -0.1875, 0.4375}, -- NodeBox1
+			{-0.25, -0.25, -0.375, 0.25, -0.125, 0.375}, -- NodeBox2
+			{-0.125, -0.1875, -0.25, 0.125, 0, 0.25}, -- NodeBox3
+			{-0.3125, 0, -0.5, 0.3125, 0.5, 0.5}, -- NodeBox4
+		}
 	},
 	collision_box = {
 		type = "fixed",
-		fixed = {-0.3, -0.1, -0.3, 0.3, 1, 0.3}
+		fixed = {
+			{-0.3125, -0.5, -0.4375, 0.3125, -0.1875, 0.4375}, -- NodeBox1
+			{-0.25, -0.25, -0.375, 0.25, -0.125, 0.375}, -- NodeBox2
+			{-0.125, -0.1875, -0.25, 0.125, 0, 0.25}, -- NodeBox3
+			{-0.3125, 0, -0.5, 0.3125, 0.5, 0.5}, -- NodeBox4
+		}
 	},
 	groups = {cracky = 1},
 	sounds = default.node_sound_metal_defaults(),

mods/default/default_farlands.lua

@@ -261,4 +261,54 @@ minetest.register_node("default:big_pine_sapling", {
 
 		return itemstack
 	end,
+})
+
+default.register_chest("bamboo_chest", {
+	description = "Bamboo Chest",
+	tiles = {
+		"default_bamboo_chest_top.png",
+		"default_bamboo_chest_top.png",
+		"default_bamboo_chest_side.png",
+		"default_bamboo_chest_side.png",
+		"default_bamboo_chest_front.png",
+		"default_chest_inside.png"
+	},
+	sounds = default.node_sound_wood_defaults(),
+	sound_open = "default_chest_open",
+	sound_close = "default_chest_close",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+})
+
+default.register_chest("ice_chest", {
+	description = "Ice Chest",
+	tiles = {
+		"default_ice_chest_top.png",
+		"default_ice_chest_top.png",
+		"default_ice_chest_side.png",
+		"default_ice_chest_side.png",
+		"default_ice_chest_front.png",
+		"default_chest_inside.png"
+	},
+	sounds = default.node_sound_glass_defaults(),
+	sound_open = "default_chest_open",
+	sound_close = "default_chest_close",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2},
+})
+
+minetest.register_craft({
+	output = 'default:bamboo_chest',
+	recipe = {
+		{'mapgen:bamboo', 'mapgen:bamboo', 'mapgen:bamboo'},
+		{'mapgen:bamboo', '', 'mapgen:bamboo'},
+		{'mapgen:bamboo', 'mapgen:bamboo', 'mapgen:bamboo'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:ice_chest',
+	recipe = {
+		{'default:ice', 'default:ice', 'default:ice'},
+		{'default:ice', '', 'default:ice'},
+		{'default:ice', 'default:ice', 'default:ice'},
+	}
 })

mods/flowerpots/depends.txt

@@ -1,2 +1,3 @@
 default
-flowers
+flowers
+flowers_plus

mods/flowerpots/nodes.lua

@@ -18,6 +18,7 @@ local flowers = {
 	{"small_cactus_1", "mapgen:small_cactus_1", "Small Cactus1"},
 	{"oxeye_daisy", "mapgen:oxeye_daisy", "Oxeye Daisy"},
 	{"dead_grass", "mapgen:dead_grass_5", "Dead Grass"},
+	{"frozen_grass", "mapgen:snow_grass_5", "Frozen Grass"},
 	{"jungle_grass", "mapgen:jungle_grass_5", "Jungle Grass"},
 	{"sapling", "default:sapling", "Sapling"},
 	{"acacia_sapling", "default:acacia_sapling", "Acacia Sapling"},
@@ -26,6 +27,14 @@ local flowers = {
 	{"pine_sapling", "default:pine_sapling", "Pine Sapling"},
 	{"junglegrass", "default:junglegrass", "junglegrass"},
 	{"frozen_rose", "mapgen:frozen_rose", "Frozen Rose"},
+	{"pansy_purple", "flowers_plus:pansy_purple", "Purple Pansy"},
+	{"pansy_blue", "flowers_plus:pansy_blue", "Blue Pansy"},
+	{"petunia_blue", "flowers_plus:petunia_blue", "Blue Petunia"},
+	{"petunia_pink", "flowers_plus:petunia_pink", "Pink Petunia"},
+	{"petunia_white", "flowers_plus:petunia_white", "White Petunia"},
+	{"lobelia", "flowers_plus:lobelia", "Lobelia"},
+	{"foxglove", "flowers_plus:foxglove", "Foxglove", {"flowerpots_foxglove.png"}},
+	{"foxglove_purple", "flowers_plus:foxglove_purple", "Purple Foxglove", {"flowerpots_foxglove_p.png"}},
 
 }
 
@@ -104,6 +113,7 @@ local flower = row[1]
 local flower_node = row[2]
 local desc = row[3]
 local texture = minetest.registered_nodes[flower_node]["tiles"]
+if row[4] ~= nil then texture = row[4] end
 minetest.register_node("flowerpots:flower_pot_"..flower, {
 	description = "Flower Pot With "..desc.."",
 	drawtype = "mesh",