20 files changed, 22 insertions, 42 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40ecbf675..bf430a0df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ if(${CMAKE_VERSION} STREQUAL "2.8.2")
 endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 
 # This can be read from ${PROJECT_NAME} after project() is called
-project(minetest-delta)
+project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
diff --git a/README b/README
deleted file mode 100644
index 9fe48f26e..000000000
--- a/README
+++ /dev/null
@@ -1,26 +0,0 @@
-Minetest Δ (“Minetest Delta”) is a fork of Minetest-c55 <http://celeron.55.lt/~celeron55/minetest/>, incorporating experimental features that are not (yet) included in Minetest-c55.
-Currently it is considered the unstable development branch of Minetest-c55, which means almost everything is merged upstream from Minetest Δ.
-
-New features:
-* refactored liquids (should not affect gameplay)
-* translation support (including german, french, italian)
-
-New blocks:
-* ladders (crafted from 7 sticks in a H form)
-
-Alternate graphics:
-* Player
-* Omsk birds (instead of Oerkki ghosts)
-* Rat
-* Glass
-* Heart
-
-Building on GNU/Linux or OS X:
-    cmake . -DRUN_IN_PLACE=1
-    make -j2
-
-The “upstream” branch contains vanilla minetest-c55, created using:
-    hg-fast-export -r ~/share/src/games/minetest -o upstream
-    git push origin upstream/master:upstream -f
-
-All new/replaced graphics done by erlehmann are dual-licensed under GPL (version 2 or, at your option, any later version) and CC-BY-SA (version 3.0 or, at your option, any later version).
diff --git a/data/glass.png b/data/glass.png
index 35ea596d5..8598ce670 100644
--- a/data/glass.png
+++ b/data/glass.png
diff --git a/data/heart.png b/data/heart.png
index bea1aefd6..6bc183e04 100644
--- a/data/heart.png
+++ b/data/heart.png
diff --git a/data/menulogo.png b/data/menulogo.png
index cb6983e5c..76595c48d 100644
--- a/data/menulogo.png
+++ b/data/menulogo.png
diff --git a/data/oerkki1.png b/data/oerkki1.png
index 2c0f8e7aa..33cbac9e7 100644
--- a/data/oerkki1.png
+++ b/data/oerkki1.png
diff --git a/data/oerkki1_damaged.png b/data/oerkki1_damaged.png
index edfab37aa..9b777387c 100644
--- a/data/oerkki1_damaged.png
+++ b/data/oerkki1_damaged.png
diff --git a/data/papyrus.png b/data/papyrus.png
index 3ebfcc689..bf0dec7fe 100644
--- a/data/papyrus.png
+++ b/data/papyrus.png
diff --git a/data/player.png b/data/player.png
index 60ac4854b..90adf9747 100644
--- a/data/player.png
+++ b/data/player.png
diff --git a/data/player_back.png b/data/player_back.png
index 447c1fd8f..530aa7519 100644
--- a/data/player_back.png
+++ b/data/player_back.png
diff --git a/data/rat.png b/data/rat.png
index 96d44c3fa..d1a0e2ae2 100644
--- a/data/rat.png
+++ b/data/rat.png
diff --git a/data/unknown_block.png b/data/unknown_block.png
index 8a8e0109c..a27cb8ca9 100644
--- a/data/unknown_block.png
+++ b/data/unknown_block.png
diff --git a/makepackage_binary.sh b/makepackage_binary.sh
index 32d19865a..fac3a0374 100755
--- a/makepackage_binary.sh
+++ b/makepackage_binary.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PROJECT_NAME=minetest-delta
+PROJECT_NAME=minetest
 PACKAGEDIR=../$PROJECT_NAME-packages
 PACKAGENAME=$PROJECT_NAME-binary-`date +%y%m%d%H%M%S`
 PACKAGEPATH=$PACKAGEDIR/$PACKAGENAME
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 32177f8a9..ce53651b0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(minetest-delta)
+project(minetest)
 cmake_minimum_required( VERSION 2.6 )
 
 if(RUN_IN_PLACE)
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 91524a6de..265997857 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -70,8 +70,6 @@ void set_default_settings()
 	g_settings.setDefault("fast_move", "false");
 	g_settings.setDefault("invert_mouse", "false");
 	g_settings.setDefault("enable_farmesh", "false");
-	g_settings.setDefault("farmesh_trees", "true");
-	g_settings.setDefault("farmesh_distance", "40");
 	g_settings.setDefault("enable_clouds", "true");
 	g_settings.setDefault("invisible_stone", "false");
 	g_settings.setDefault("screenshot_path", ".");
diff --git a/src/farmesh.cpp b/src/farmesh.cpp
index 2cd922434..8f91e3a1a 100644
--- a/src/farmesh.cpp
+++ b/src/farmesh.cpp
@@ -70,7 +70,6 @@ FarMesh::FarMesh(
 	m_box = core::aabbox3d<f32>(-BS*1000000,-BS*31000,-BS*1000000,
 			BS*1000000,BS*31000,BS*1000000);
 
-    trees = g_settings.getBool("farmesh_trees");
 }
 
 FarMesh::~FarMesh()
@@ -314,11 +313,12 @@ void FarMesh::render()
 				}
 				else
 				{
-					// Trees if there are over 0.01 trees per MapNode
-					if(trees && tree_amount_avg > 0.01)
+					/*// Trees if there are over 0.01 trees per MapNode
+					if(tree_amount_avg > 0.01)
 						c = video::SColor(255,50,128,50);
 					else
-						c = video::SColor(255,107,134,51);
+						c = video::SColor(255,107,134,51);*/
+					c = video::SColor(255,107,134,51);
 					ground_is_mud = true;
 				}
 			}
@@ -351,7 +351,7 @@ void FarMesh::render()
 				video::EVT_STANDARD, scene::EPT_TRIANGLES, video::EIT_16BIT);
 
 		// Add some trees if appropriate
-		if(trees && tree_amount_avg >= 0.0065 && steepness < 1.4
+		if(tree_amount_avg >= 0.0065 && steepness < 1.4
 				&& ground_is_mud == true)
 		{
 			driver->setMaterial(m_materials[1]);
@@ -404,11 +404,11 @@ void FarMesh::step(float dtime)
 	m_time += dtime;
 }
 
-void FarMesh::update(v2f camera_p, float brightness)
+void FarMesh::update(v2f camera_p, float brightness, s16 render_range)
 {
 	m_camera_pos = camera_p;
 	m_brightness = brightness;
-	m_render_range = g_settings.getS16("farmesh_distance")*10;
+	m_render_range = render_range;
 }
 
 
diff --git a/src/farmesh.h b/src/farmesh.h
index 577224e15..0a30a8aef 100644
--- a/src/farmesh.h
+++ b/src/farmesh.h
@@ -67,7 +67,7 @@ public:
 
 	void step(float dtime);
 
-	void update(v2f camera_p, float brightness);
+	void update(v2f camera_p, float brightness, s16 render_range);
 
 private:
 	video::SMaterial m_materials[FARMESH_MATERIAL_COUNT];
@@ -79,7 +79,6 @@ private:
 	float m_time;
 	Client *m_client;
 	s16 m_render_range;
-    bool trees;
 };
 
 #endif
diff --git a/src/game.cpp b/src/game.cpp
index fb5d7cb93..c4a9aba00 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2005,9 +2005,15 @@ void the_game(
 		*/
 		if(farmesh)
 		{
+			farmesh_range = draw_control.wanted_range * 10;
+			if(draw_control.range_all && farmesh_range < 500)
+				farmesh_range = 500;
+			if(farmesh_range > 1000)
+				farmesh_range = 1000;
+
 			farmesh->step(dtime);
 			farmesh->update(v2f(player_position.X, player_position.Z),
-					0.05+brightness*0.95);
+					0.05+brightness*0.95, farmesh_range);
 		}
 		
 		// Store brightness value
diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 8ccf0c468..eae887a4c 100644
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -173,7 +173,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
 		);*/

 

 		std::ostringstream os;

-		os<<"Minetest-delta\n";

+		os<<"Minetest\n";

 		os<<"by Perttu Ahola and contributors\n";

 		os<<"celeron55@gmail.com\n";

 		os<<BUILD_INFO<<"\n";

diff --git a/src/main.cpp b/src/main.cpp
index 6eca96eac..4f57fc078 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -367,6 +367,9 @@ TODO: Merge bahamada's audio stuff (clean patch available)
 
 TODO: Move content_features to mapnode_content_features.{h,cpp} or so
 
+TODO: Fix item use() stuff; dropping a stack of cooked rats and eating
+      it gives 3 hearts and consumes all the rats.
+
 Making it more portable:
 ------------------------