merge net5

This commit is contained in:
goat 2022-07-11 19:19:22 +02:00
commit c1dac8d27a
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
34 changed files with 420 additions and 386 deletions

View file

@ -18,11 +18,6 @@ namespace Dalamud.Configuration.Internal
[Serializable]
internal sealed class DalamudConfiguration : IServiceType
{
/// <summary>
/// Currently used beta key for Dalamud staging builds.
/// </summary>
public const string DalamudCurrentBetaKey = "If you read this you are a beta tester for the awesome .NET 6 version of Dalamud! Hell yeah!";
private static readonly JsonSerializerSettings SerializerSettings = new()
{
TypeNameHandling = TypeNameHandling.All,
@ -44,12 +39,6 @@ namespace Dalamud.Configuration.Internal
/// </summary>
public event DalamudConfigurationSavedDelegate DalamudConfigurationSaved;
/// <summary>
/// Gets a value indicating whether or not Dalamud staging is enabled.
/// </summary>
[JsonIgnore]
public bool IsConventionalStaging => this.DalamudBetaKey == DalamudCurrentBetaKey;
/// <summary>
/// Gets or sets a list of muted works.
/// </summary>
@ -144,17 +133,6 @@ namespace Dalamud.Configuration.Internal
/// </summary>
public float FontGammaLevel { get; set; } = 1.4f;
/// <summary>
/// Gets or sets a value indicating the level of font resolution between 1 to 5.
/// 0(1024x1024), 1(2048x2048), 2(4096x4096), 3(8192x8192), 4(16384x16384).
/// </summary>
public int FontResolutionLevel { get; set; } = 2;
/// <summary>
/// Gets or sets a value indicating whether to disable font fallback notice.
/// </summary>
public bool DisableFontFallbackNotice { get; set; } = false;
/// <summary>
/// Gets or sets a value indicating whether or not plugin UI should be hidden.
/// </summary>