+18 −0

lua_api.txt

doc/lua_api.txt

+38 −2

collision.cpp

src/collision.cpp

+40 −1

content_mapblock.cpp

src/content_mapblock.cpp

+5 −2

game.cpp

src/game.cpp

+2 −1

localplayer.cpp

src/localplayer.cpp

+52 −13

mapnode.cpp

src/mapnode.cpp

+3 −3

mapnode.h

src/mapnode.h

+1 −0

networkprotocol.h

src/network/networkprotocol.h

+145 −12

nodedef.cpp

src/nodedef.cpp

+15 −0

nodedef.h

src/nodedef.h

+69 −19

c_content.cpp

src/script/common/c_content.cpp

+1 −0

s_node.cpp

src/script/cpp_api/s_node.cpp

+3 −0

server.cpp

src/server.cpp