Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mergeconflicts

Browse source
This commit is contained in:
Milan* 2017-07-30 12:15:29 +02:00
commit 8a3f06a18f
47 changed files with 1139 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mods/flowers/init.lua
View file

@ -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}
},