Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

This commit is contained in:
EvilFactory
2023-12-20 11:34:03 -03:00
36 changed files with 182 additions and 81 deletions
@@ -2562,9 +2562,9 @@ namespace Barotrauma
}
}
public static void ThrowError(LocalizedString error, Exception e = null, bool createMessageBox = false, bool appendStackTrace = false)
public static void ThrowErrorLocalized(LocalizedString error, Exception e = null, ContentPackage contentPackage = null, bool createMessageBox = false, bool appendStackTrace = false)
{
ThrowError(error.Value, e, createMessageBox, appendStackTrace);
ThrowError(error.Value, e, contentPackage, createMessageBox, appendStackTrace);
}
public static void ThrowError(string error, Exception e = null, ContentPackage contentPackage = null, bool createMessageBox = false, bool appendStackTrace = false)