Merge remote-tracking branch 'refs/remotes/origin/master' into toby

2017-01-16 15:32:35 +01:00 · 2017-01-16 15:32:35 +01:00 · d49fa56b55
parent 15017f5c8c a1538aeab6
commit d49fa56b55
9 changed files with 3 additions and 3 deletions
--- a/mods/default/textures/default_grass.png
+++ b/mods/default/textures/default_grass.png
--- a/mods/default/textures/default_grass_1.png
+++ b/mods/default/textures/default_grass_1.png
--- a/mods/default/textures/default_grass_2.png
+++ b/mods/default/textures/default_grass_2.png
--- a/mods/default/textures/default_grass_3.png
+++ b/mods/default/textures/default_grass_3.png
--- a/mods/default/textures/default_grass_4.png
+++ b/mods/default/textures/default_grass_4.png
--- a/mods/default/textures/default_grass_5.png
+++ b/mods/default/textures/default_grass_5.png
--- a/mods/default/textures/default_grass_side.png
+++ b/mods/default/textures/default_grass_side.png
--- a/mods/mapgen/nodes.lua
+++ b/mods/mapgen/nodes.lua
@ -217,12 +217,12 @@ minetest.register_node("mapgen:moss", {
 minetest.register_node("mapgen:tallgrass", {
 	description = "Tall Grass",
 	drawtype = "plantlike",
-	tiles = {"moreplants_longgrass.png"},
+	tiles = {"mapgen_longgrass.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	buildable_to = true, 
 	sunlight_propagates = true,
-	inventory_image = "moreplants_longgrass.png",
+	inventory_image = "mapgen_longgrass.png",
 	visual_scale = 1.4,
 	wield_scale = {x=0.5, y=0.5, z=0.5},
 	groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
@ -232,4 +232,4 @@ minetest.register_node("mapgen:tallgrass", {
 		fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
 	},
 	walkable = false,
-})
+})
--- a/mods/mapgen/textures/moreplants_longgrass.png
+++ b/mods/mapgen/textures/moreplants_longgrass.png