merged fix to decapitated trees; other bugs now exists

diff --cc po/en/minetest.pot
index e242c494b5f0569e4665866878ee750a0c89ead1,0000000000000000000000000000000000000000..8fbac78d0b3c05dbff1828850f74beea1a8eb04d
mode 100644,000000..100644
--- 1/po/en/minetest.pot
--- /dev/null
+++ b/po/en/minetest.pot
@@@ -1,113 -1,0 +1,113 @@@
- "Project-Id-Version: minetest\n"
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 +# This file is distributed under the same license as the PACKAGE package.
 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 +#
 +#, fuzzy
 +msgid ""
 +msgstr ""
- "POT-Creation-Date: 2011-07-22 11:02+0200\n"
++"Project-Id-Version: PACKAGE VERSION\n"
 +"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2011-07-24 11:32+0300\n"
 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 +"Language-Team: LANGUAGE <LL@li.org>\n"
 +"Language: \n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=CHARSET\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
 +#: src/guiMainMenu.cpp:180
 +msgid "Name/Password"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:203
 +msgid "Address/Port"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:223
 +msgid "Leave address blank to start a local server."
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:230
 +msgid "Fancy trees"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:236
 +msgid "Smooth Lighting"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:244
 +msgid "Start Game / Connect"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:253
 +msgid "Change keys"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:276
 +msgid "Creative Mode"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:282
 +msgid "Enable Damage"
 +msgstr ""
 +
 +#: src/guiMainMenu.cpp:290
 +msgid "Delete map"
 +msgstr ""
 +
 +#: src/guiMessageMenu.cpp:93 src/guiTextInputMenu.cpp:111
 +msgid "Proceed"
 +msgstr ""
 +
 +#: src/guiPasswordChange.cpp:102
 +msgid "Old Password"
 +msgstr ""
 +
 +#: src/guiPasswordChange.cpp:117
 +msgid "New Password"
 +msgstr ""
 +
 +#: src/guiPasswordChange.cpp:131
 +msgid "Confirm Password"
 +msgstr ""
 +
 +#: src/guiPasswordChange.cpp:146
 +msgid "Change"
 +msgstr ""
 +
 +#: src/guiPasswordChange.cpp:155
 +msgid "Passwords do not match!"
 +msgstr ""
 +
 +#: src/guiPauseMenu.cpp:110
 +msgid "Continue"
 +msgstr ""
 +
 +#: src/guiPauseMenu.cpp:117
 +msgid "Change Password"
 +msgstr ""
 +
 +#: src/guiPauseMenu.cpp:124
 +msgid "Disconnect"
 +msgstr ""
 +
 +#: src/guiPauseMenu.cpp:131
 +msgid "Exit to OS"
 +msgstr ""
 +
 +#: src/guiPauseMenu.cpp:138
 +msgid ""
 +"Keys:\n"
 +"- WASD: Walk\n"
 +"- Mouse left: dig blocks\n"
 +"- Mouse right: place blocks\n"
 +"- Mouse wheel: select item\n"
 +"- 0...9: select item\n"
 +"- Shift: sneak\n"
 +"- R: Toggle viewing all loaded chunks\n"
 +"- I: Inventory menu\n"
 +"- ESC: This menu\n"
 +"- T: Chat\n"
 +msgstr ""

diff --cc src/map.cpp
index 1c63943c4c775f696a8bebef3b428b5b8f6bb85b,8bce36f2530113541c2cbd47c037f627309849e5..f0ea2f6f1f84f346b8988c0ce7ab56a79baca625
--- 1/src/map.cpp
--- 2/src/map.cpp
+++ b/src/map.cpp
@@@ -2012,17 -2010,9 +2012,17 @@@ ServerMap::~ServerMap(
  
  void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
  {
--      /*dstream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
--                      <<blockpos.Z<<")"<<std::endl;*/
 -
++      dstream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
++                      <<blockpos.Z<<")"<<std::endl;
 +      
 +      // Do nothing if not inside limits (+-1 because of neighbors)
 +      if(blockpos_over_limit(blockpos - v3s16(1,1,1)) ||
 +              blockpos_over_limit(blockpos + v3s16(1,1,1)))
 +      {
 +              data->no_op = true;
 +              return;
 +      }
 +      
        data->no_op = false;
        data->seed = m_seed;
        data->blockpos = blockpos;

diff --cc src/mapblock.cpp
index ead26dd1f8088ccaf8a4a2037ef5abb36f02eec7,cdbd54525a418709dfaa2bafa91043da1bec381f..49d215bf6d5b2f14a7a1eff78a4595533b9fd57d
--- 1/src/mapblock.cpp
--- 2/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@@ -242,7 -242,12 +242,12 @@@ bool MapBlock::propagateSunlight(core::
                        // Check if node above block has sunlight
                        try{
                                MapNode n = getNodeParent(v3s16(x, MAP_BLOCKSIZE, z));
-                               if(n.getContent() == CONTENT_IGNORE || n.getLight(LIGHTBANK_DAY) != LIGHT_SUN)
 -                              if(n.d == CONTENT_IGNORE)
++                              if(n.getContent() == CONTENT_IGNORE)
+                               {
+                                       // Trust heuristics
+                                       no_sunlight = is_underground;
+                               }
+                               else if(n.getLight(LIGHTBANK_DAY) != LIGHT_SUN)
                                {
                                        no_sunlight = true;
                                }