Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git 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>
2025-07-02 16:38:41 +00:00 · 2011-06-26 12:24:32 +02:00 · 2011-06-26 12:24:32 +02:00 · 033ae0dcae
commit 033ae0dcae
parent a80025c352 e261cc9e8f
43 changed files with 1312 additions and 48 deletions
--- a/data/book.png
+++ b/data/book.png
--- a/data/bookshelf.png
+++ b/data/bookshelf.png
--- a/data/brick.png
+++ b/data/brick.png
--- a/data/cactus_side.png
+++ b/data/cactus_side.png
--- a/data/cactus_top.png
+++ b/data/cactus_top.png
--- a/data/clay.png
+++ b/data/clay.png
--- a/data/clay_brick.png
+++ b/data/clay_brick.png
--- a/data/fence.png
+++ b/data/fence.png
--- a/data/glass.png
+++ b/data/glass.png
--- a/data/lump_of_clay.png
+++ b/data/lump_of_clay.png
--- a/data/menulogo.png
+++ b/data/menulogo.png
--- a/data/oerkki1.png
+++ b/data/oerkki1.png
--- a/data/paper.png
+++ b/data/paper.png
--- a/data/papyrus.png
+++ b/data/papyrus.png
--- a/data/player.png
+++ b/data/player.png
--- a/data/player_back.png
+++ b/data/player_back.png
--- a/data/rail.png
+++ b/data/rail.png
--- a/data/rail_crossing.png
+++ b/data/rail_crossing.png
--- a/data/rail_curved.png
+++ b/data/rail_curved.png
--- a/data/rail_t_junction.png
+++ b/data/rail_t_junction.png
--- a/data/rat.png
+++ b/data/rat.png
--- a/data/sandstone.png
+++ b/data/sandstone.png