The final pieces of update#1.5

Author: BigMongol

scripts/buffs/BurningBuff.lua

@@ -21,14 +21,13 @@ return buff.init{
             info          = "",
             data          =
             {
-            dmg = int.dmg
+            dmg = int.dmg or 1
             }
         }
     end,
 
     charAct = function(self,buff)
       local data = self:desc().data
-      RPD.glog(data.dmg)
       RPG.damage(buff.target,math.ceil(data.dmg*(1+math.min((buff:level() +buff:level()%2)*0.05,0.3)) ),type,elmnt)
     end
 }

strings_ru.json

@@ -317,10 +317,6 @@
 ["IronMail","плетён"]
 ["SteelMail","проволочн"]
 ["Clothy","тканев"]
-<<<<<<< HEAD
-=======
-["WithLeather","кожен"]
->>>>>>> ded6f92daa3a261a04dc76ee737987e27eb625f6
 ["WithLeather","кожан"]
 ["",""]
 ["",""]
@@ -534,4 +530,4 @@
 ["BoneGolem2_Name","Костяной голем[2 уровень]"]
 ["BoneGolem3_Name","Костяной голем[3 уровень]"]
 ["BoneGolem_Desc","Существо созданое из костей погибших этого подземелья."]
-["BoneGolem_Act","Костяного голема"]
+["BoneGolem_Act","Костяного голема"]