ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-25 22:21:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of https://github.com/Limiana/Dalamud

Browse source
This commit is contained in:
Limiana 2025-12-21 03:07:26 +03:00
commit 6237f9a132
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Dalamud.csproj
View file

@ -6,7 +6,7 @@
<PropertyGroup Label="Feature">
<Description>XIV Launcher addon framework</Description>
<DalamudVersion>14.0.0.0</DalamudVersion>
<DalamudVersion>14.0.0.1</DalamudVersion>
<AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
<Version>$(DalamudVersion)</Version>
<FileVersion>$(DalamudVersion)</FileVersion>

8
Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabBadge.cs
View file

@ -20,7 +20,7 @@ internal sealed class SettingsTabBadge : SettingsTab
public override string Title => Loc.Localize("DalamudSettingsBadge", "Badges");
public override SettingsOpenKind Kind => SettingsOpenKind.ServerInfoBar;
public override SettingsOpenKind Kind => SettingsOpenKind.Badge;
public override SettingsEntry[] Entries { get; } =
[
@ -36,12 +36,12 @@ internal sealed class SettingsTabBadge : SettingsTab
var badgeManager = Service<BadgeManager>.Get();
var dalamudInterface = Service<DalamudInterface>.Get();
ImGui.TextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarHint", "Plugins can put additional information into your server information bar(where world & time can be seen).\nYou can reorder and disable these here."));
ImGui.TextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingBadgesHint", "On this tab, you can unlock small badges that show on your title screen.\nBadge codes are usually given out during community events or contests."));
ImGuiHelpers.ScaledDummy(5);
ImGui.Text(Loc.Localize("DalamudSettingsBadgesUnlock", "Unlock a badge"));
ImGui.TextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsBadgesUnlockHint", "If you have received a code for a badge, enter it here to unlock the badge.\nCodes are usually given out during community events or contests."));
ImGui.TextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsBadgesUnlockHint", "If you have received a code for a badge, enter it here to unlock the badge."));
ImGui.InputTextWithHint(
"##BadgePassword",
Loc.Localize("DalamudSettingsBadgesUnlockHintInput", "Enter badge code here"),
@ -79,7 +79,7 @@ internal sealed class SettingsTabBadge : SettingsTab
if (haveBadges.Length == 0)
{
ImGui.TextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarDidNone", "You did not unlock any badges yet.\nBadges can be unlocked by participating in community events or contests."));
ImGui.TextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsBadgesDidNone", "You did not unlock any badges yet."));
}
var badgeTexture = Service<DalamudAssetManager>.Get().GetDalamudTextureWrap(DalamudAsset.BadgeAtlas);