Merge branch 'upstream/master'

Conflicts:
	data/oerkki1.png
	src/client.cpp

diff --cc CMakeLists.txt
Simple merge

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/client.cpp
Simple merge

diff --cc src/content_inventory.cpp
Simple merge

diff --cc src/content_mapblock.cpp
Simple merge

diff --cc src/content_mapnode.cpp
Simple merge

diff --cc src/defaultsettings.cpp
index ac1983ed1fc482aa0a73633add84b41974cbb011,cda9eb79a613723e2cf6796fa29349f10b995a57..cbc78ad3f51a70773a17658618fa0e32d5728812
--- 1/src/defaultsettings.cpp
--- 2/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@@ -68,10 -70,9 +70,11 @@@ 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", ".");
  
        // Server stuff
        g_settings.setDefault("enable_experimental", "false");

diff --cc src/environment.cpp
Simple merge

diff --cc src/farmesh.cpp
Simple merge

diff --cc src/game.cpp
Simple merge

diff --cc src/map.cpp
Simple merge

diff --cc src/mapgen.cpp
index a491ac81aa19206db256f9af3198867f8ee041ba,4a2a39aec7b63b4170fa46435765bf91c933d2d1..d7b6e56c440bb5e659a74a3d9c76c5138da143e0
--- 1/src/mapgen.cpp
--- 2/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@@ -894,17 -898,19 +926,19 @@@ NoiseParams get_cave_noise2_params(u64 
  {
        /*return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 5, 0.7,
                        200, CAVE_NOISE_SCALE);*/
-       return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 4, 0.7,
-                       100, CAVE_NOISE_SCALE);
+       /*return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 4, 0.7,
+                       100, CAVE_NOISE_SCALE);*/
+       /*return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 5, 0.3,
+                       100, CAVE_NOISE_SCALE);*/
+       return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 4, 0.5,
+                       50, CAVE_NOISE_SCALE);
+       //return NoiseParams(NOISE_CONSTANT_ONE);
  }
  
- //#define CAVE_NOISE_THRESHOLD (2.5/CAVE_NOISE_SCALE)
- #define CAVE_NOISE_THRESHOLD (2.0/CAVE_NOISE_SCALE)
- 
  NoiseParams get_ground_noise1_params(u64 seed)
  {
 -      return NoiseParams(NOISE_PERLIN, seed+983240, 5,
 -                      0.60, 100.0, 30.0);
 +      return NoiseParams(NOISE_PERLIN, seed+983240, 4,
 +                      0.55, 80.0, 40.0);
  }
  
  NoiseParams get_ground_crumbleness_params(u64 seed)
@@@ -937,9 -943,9 +971,9 @@@ bool val_is_ground(double ground_noise1
  {
        //return ((double)p.Y < ground_noise1_val);
  
-       double f = 0.8 + noise2d_perlin(
+       double f = 0.55 + noise2d_perlin(
                        0.5+(float)p.X/250, 0.5+(float)p.Z/250,
 -                      seed+920381, 3, 0.5);
 +                      seed+920381, 3, 0.45);
        if(f < 0.01)
                f = 0.01;
        else if(f >= 1.0)

diff --cc src/mapnode.h
Simple merge