Merge remote-tracking branch 'upstream/master'

Changement d'un ingrédient de potion : lilypad remplace waterlily

init.lua

@@ -565,7 +565,7 @@ witchcraft.pot = {
 	{"blue", "brown", "default:dirt", "blue2", "moreplants:bullrush", "red", "purple"},
 	{"blue2", "yellow", "default:steelblock", "yellow", "default:copperblock", "green2", "aqua"},
 	{"darkpurple", "cyan", "flowers:mushroom_red", "green", "moreplants:weed", "yellow", "redbrown"},
-	{"purple", "blue2", "flowers:waterlily", "gpurple", "default:mese_crystal", "magenta", "darkpurple"},
+	{"purple", "blue2", "nalc_flowers:lily_pad", "gpurple", "default:mese_crystal", "magenta", "darkpurple"},
 	{"magenta", "purple", "witchcraft:bottle_eyes", "darkpurple", "moreplants:mushroom", "purple", "darkpurple"},
 	{"red", "grey", "default:gravel", "yllwgrn", "default:flint", "blue", "purple"},
 	{"redbrown", "magenta", "flowers:mushroom_brown", "magenta", "default:stone", "grey", "brown"},
@@ -587,7 +587,7 @@ witchcraft.pot = {
 --new recipes
 
 witchcraft.pot_new = {
-	{"blue", "blue2", "flowers:waterlily", "brown", "default:dirt", "red", "purple"},
+	{"blue", "blue2", "nalc_flowers:lily_pad", "brown", "default:dirt", "red", "purple"},
 	{"blue2", "green", "default:papyrus", "", "", "gred", "magenta"},
 	{"green", "green2", "default:sapling", "", "", "yellow", "yllwgrn"},
 	{"green2", "yellow", "default:mese_crystal_fragment", "", "", "blue", "cyan"},
@@ -2879,6 +2879,7 @@ else
 			return itemstack
 		end
 	})
+>>>>>>> upstream/master
 end
 
 minetest.register_node("witchcraft:potion_magenta", {
@@ -3627,3 +3628,5 @@ minetest.register_node("witchcraft:candle", {
 
 dofile(minetest.get_modpath("witchcraft").."/scrolls.lua")
 dofile(minetest.get_modpath("witchcraft").."/brewing_stand.lua")
+
+minetest.log("action", "[witchcraft] loaded.")