merge upstream

mods/flowers/init.lua

@@ -248,7 +248,7 @@ end
 
 minetest.register_abm({
 	label = "Mushroom spread",
-	nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"},
+	nodenames = {"group:mushroom"},
 	interval = 11,
 	chance = 150,
 	action = function(...)
@@ -279,6 +279,7 @@ local waterlily_def = {
 	tiles = {"flowers_waterlily.png", "flowers_waterlily_bottom.png"},
 	inventory_image = "flowers_waterlily.png",
 	wield_image = "flowers_waterlily.png",
+	use_texture_alpha = "clip",
 	liquids_pointable = true,
 	walkable = false,
 	buildable_to = true,
@@ -312,8 +313,7 @@ local waterlily_def = {
 				minetest.set_node(pos, {name = "flowers:waterlily" ..
 					(def.waving == 3 and "_waving" or ""),
 					param2 = math.random(0, 3)})
-				if not (creative and creative.is_enabled_for
-						and creative.is_enabled_for(player_name)) then
+				if not minetest.is_creative_enabled(player_name) then
 					itemstack:take_item()
 				end
 			else

mods/flowers/locale/flowers.eo.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=Ruĝa Rozo
+Orange Tulip=Oranĝkolora Tulipo
+Yellow Dandelion=Flava Leontodo
+Green Chrysanthemum=Verda Krizantemo
+Blue Geranium=Blua Geranio
+Viola=Violo
+White Dandelion=Blanka Leontodo
+Black Tulip=Nigra Tulipo
+Red Mushroom=Ruĝa Fungo
+Brown Mushroom=Bruna Fungo
+Waterlily=Nimfeo

mods/flowers/locale/flowers.it.tr

@@ -1,12 +1,12 @@
-# textdomain: flowers
-Red Rose=Rosa rossa
-Orange Tulip=Tulipano arancione
-Yellow Dandelion=Dente di leone giallo
-Green Chrysanthemum=Crisantemo verde
-Blue Geranium=Geranio blu
-Viola=Viola
-White Dandelion=Dente di leone bianco
-Black Tulip=Tulipano nero
-Red Mushroom=Fungo rosso
-Brown Mushroom=Fungo marrone
-Waterlily=Ninfea
+# textdomain: flowers
+Red Rose=Rosa rossa
+Orange Tulip=Tulipano arancione
+Yellow Dandelion=Dente di leone giallo
+Green Chrysanthemum=Crisantemo verde
+Blue Geranium=Geranio blu
+Viola=Viola
+White Dandelion=Dente di leone bianco
+Black Tulip=Tulipano nero
+Red Mushroom=Fungo rosso
+Brown Mushroom=Fungo marrone
+Waterlily=Ninfea

mods/flowers/locale/flowers.ja.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=赤色のバラ
+Orange Tulip=橙色のチューリップ
+Yellow Dandelion=黄色のタンポポ
+Green Chrysanthemum=緑色のキク
+Blue Geranium=青色のゼラニウム
+Viola=ビオラ
+White Dandelion=白色のタンポポ
+Black Tulip=黒色のチューリップ
+Red Mushroom=赤色のキノコ
+Brown Mushroom=茶色のキノコ
+Waterlily=スイレン

mods/flowers/locale/flowers.jbo.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=lo xunre rozgu
+Orange Tulip=lo narju tujli
+Yellow Dandelion=lo pelxu spatrtaraksaku
+Green Chrysanthemum=lo crino xrisantemo
+Blue Geranium=lo blanu plargoni
+Viola=lo spatrvi'ola
+White Dandelion=lo blabi spatrtaraksaku
+Black Tulip=lo xekri tujli
+Red Mushroom=lo xunre ledgrute
+Brown Mushroom=lo bunre ledgrute
+Waterlily=lo jacrulspa

mods/flowers/locale/flowers.pl.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=Czerwona róża
+Orange Tulip=Pomarańczowy tulipan
+Yellow Dandelion=Żółty mlecz
+Green Chrysanthemum=Zielona chryzantema
+Blue Geranium=Niebieska pelargonia
+Viola=Fiołek
+White Dandelion=Biały mlecz
+Black Tulip=Czarny tulipan
+Red Mushroom=Czerwony muchomor
+Brown Mushroom=Brązowy grzyb
+Waterlily=Lilia wodna

mods/flowers/locale/flowers.pt_BR.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=Rosa Vermelha
+Orange Tulip=Tulipa Laranja
+Yellow Dandelion=Dente-de-leão Amarelo
+Green Chrysanthemum=Crisântemo Verde
+Blue Geranium=Gerânio Azul
+Viola=Violeta
+White Dandelion=Dente-de-leão Branco
+Black Tulip=Tulipa Negra
+Red Mushroom=Cogumelo Vermelho
+Brown Mushroom=Cogumelo Marrom
+Waterlily=Nenúfar

mods/flowers/locale/flowers.se.tr

@@ -1,12 +0,0 @@
-# textdomain: flowers
-Red Rose=Röd ros
-Orange Tulip=Orange Tulpan
-Yellow Dandelion=Gul Maskros
-Green Chrysanthemum=Grön Krysantemum
-Blue Geranium=Blå Geranium
-Viola=Violett Viola
-White Dandelion=Vit Maskros
-Black Tulip=Svart Tulpan
-Red Mushroom=Röd Svamp
-Brown Mushroom=Brun Svamp
-Waterlily=Näckros

mods/flowers/locale/flowers.sk.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=Červená ruža
+Orange Tulip=Oranžový tulipán 
+Yellow Dandelion=Žltá púpava
+Green Chrysanthemum=Zelená chryzantéma
+Blue Geranium=Modrý muškát
+Viola=Fialka
+White Dandelion=Biela púpava
+Black Tulip=Čierny tulipán
+Red Mushroom=Červená huba
+Brown Mushroom=Hnedá huba
+Waterlily=Lekno

mods/flowers/locale/flowers.sv.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=Röd ros
+Orange Tulip=Orange tulpan
+Yellow Dandelion=Gul maskros
+Green Chrysanthemum=Grön krysantemum
+Blue Geranium=Blå geranium
+Viola=Violett viola
+White Dandelion=Vit maskros
+Black Tulip=Svart tulpan
+Red Mushroom=Röd svamp
+Brown Mushroom=Brun svamp
+Waterlily=Näckros

mods/flowers/locale/flowers.uk.tr

@@ -0,0 +1,12 @@
+# textdomain: flowers
+Red Rose=Червона Троянда
+Orange Tulip=Помаранчевий Тюльпан
+Yellow Dandelion=Жовта Кульбабка
+Green Chrysanthemum=Зелена Хризантема
+Blue Geranium=Синій Геран
+Viola=Фіалка
+White Dandelion=Біла Кульбабка
+Black Tulip=Чорний Тюльпан
+Red Mushroom=Мухомор
+Brown Mushroom=Коричневий Гриб
+Waterlily=Водяна Лілія