fix mergeconflicts

mods/flowers/README.txt

@@ -11,7 +11,6 @@ Authors of media (textures)
 ---------------------------
 RHRhino (CC BY-SA 3.0):
   flowers_dandelion_white.png
-  flowers_dandelion_yellow.png
   flowers_geranium.png
   flowers_rose.png
   flowers_tulip.png
@@ -23,4 +22,7 @@ Gambit (CC BY-SA 3.0):
   flowers_waterlily.png
 
 yyt16384 (CC BY-SA 3.0):
-  flowers_waterlily_bottom.png, derived from Gambit's texture
+  flowers_waterlily_bottom.png -- Derived from Gambit's texture
+
+paramat (CC BY-SA 3.0):
+  flowers_dandelion_yellow.png -- Derived from RHRhino's texture

mods/flowers/init.lua

@@ -59,7 +59,7 @@ end
 flowers.datas = {
 	{
 		"rose",
-		"Rose",
+		"Red Rose",
 		{-2 / 16, -0.5, -2 / 16, 2 / 16, 5 / 16, 2 / 16},
 		{color_red = 1, flammable = 1}
 	},
@@ -72,7 +72,7 @@ flowers.datas = {
 	{
 		"dandelion_yellow",
 		"Yellow Dandelion",
-		{-2 / 16, -0.5, -2 / 16, 2 / 16, 4 / 16, 2 / 16},
+		{-4 / 16, -0.5, -4 / 16, 4 / 16, -2 / 16, 4 / 16},
 		{color_yellow = 1, flammable = 1}
 	},
 	{
@@ -89,7 +89,7 @@ flowers.datas = {
 	},
 	{
 		"dandelion_white",
-		"White dandelion",
+		"White Dandelion",
 		{-5 / 16, -0.5, -5 / 16, 5 / 16, -2 / 16, 5 / 16},
 		{color_white = 1, flammable = 1}
 	},

mods/flowers/license.txt

@@ -32,6 +32,7 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 Copyright (C) 2014-2016 RHRhino
 Copyright (C) 2015-2016 Gambit
 Copyright (C) 2016 yyt16384
+Copyright (C) 2017 paramat
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.

mods/flowers/mapgen.lua

@@ -87,15 +87,15 @@ local function register_flower(seed, name)
 		place_on = {"default:dirt_with_grass"},
 		sidelen = 16,
 		noise_params = {
-			offset = -0.015,
-			scale = 0.025,
+			offset = -0.02,
+			scale = 0.04,
 			spread = {x = 200, y = 200, z = 200},
 			seed = seed,
 			octaves = 3,
 			persist = 0.6
 		},
 		biomes = {"grassland", "deciduous_forest", "coniferous_forest",
-			"floatland_grassland", "floatland_coniferous_forest"},
+			"floatland_coniferous_forest"},
 		y_min = 1,
 		y_max = 31000,
 		decoration = "flowers:"..name,