Merge pull request #3159 from IvanSavenko/beta

Merge beta -> develop (rebased)

config/commanders.json

@@ -3,9 +3,9 @@
 	//Commander receives these bonuses on level-up
 	"bonusPerLevel":
 	[
-		["CREATURE_DAMAGE", 1, "creatureDamageMin", 0 ], //+1 minimum damage
-		["CREATURE_DAMAGE", 2, "creatureDamageMax", 0 ], //+2 maximum damage
-		["STACK_HEALTH", 5, null, 0 ] //+5 hp
+		["CREATURE_DAMAGE", 2, "creatureDamageMin", 0 ], //+2 minimum damage
+		["CREATURE_DAMAGE", 4, "creatureDamageMax", 0 ], //+4 maximum damage
+		["STACK_HEALTH", 20, null, 0 ] //+5 hp
 	],
 	//Value of bonuses given by each skill level
 	"skillLevels":

launcher/modManager/cmodlist.cpp

@@ -105,7 +105,7 @@ bool CModEntry::isVisible() const
 			return false;
 	}
 
-	return !localData.isEmpty() || !repository.isEmpty();
+	return !localData.isEmpty() || (!repository.isEmpty() && !repository.contains("mod"));
 }
 
 bool CModEntry::isTranslation() const

lib/mapObjects/MiscObjects.cpp

@@ -210,7 +210,7 @@ void CGMine::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) con
 void CGMine::serializeJsonOptions(JsonSerializeFormat & handler)
 {
 	CArmedInstance::serializeJsonOptions(handler);
-
+	serializeJsonOwner(handler);
 	if(isAbandoned())
 	{
 		if(handler.saving)
@@ -241,10 +241,6 @@ void CGMine::serializeJsonOptions(JsonSerializeFormat & handler)
 			}
 		}
 	}
-	else
-	{
-		serializeJsonOwner(handler);
-	}
 }
 
 GameResID CGResource::resourceID() const