Age | Commit message (Collapse) | Author |
|
|
|
src/CMakeLists.txt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CMakeLists.txt to package /README.txt
|
|
|
|
|
|
|
|
clientserver.h; clean up defaultsettings.cpp and minetest.conf.example
|
|
|
|
|
|
and make the server enforce it
|
|
|
|
|
|
(0.2.201109xx_dev)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
data/oerkki1.png
src/client.cpp
|
|
|
|
into upstream_merge
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
|