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-03-15 11:30:00 +01:00
commit 464fee1dee
79 changed files with 1535 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mods/flowers/init.lua
View file

@ -264,7 +264,7 @@ minetest.register_node("flowers:waterlily", {
node_placement_prediction = "",
node_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -15 / 32, 0.5}
fixed = {-0.5, -31 / 64, -0.5, 0.5, -15 / 32, 0.5}
},
selection_box = {
type = "fixed",