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

solve mergeconflicts

Browse source 
* tmp drop farming+boats
    * correct tnt
    * drop original readme.txt
This commit is contained in:
Milan* 2017-03-11 13:09:26 +01:00
commit c836129bff
78 changed files with 1432 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mods/flowers/init.lua
View file

@ -265,7 +265,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",