Fixed merge conflict

This commit is contained in:
CakeAndBanana
2025-10-05 21:21:18 +02:00
5 changed files with 68 additions and 36 deletions

View File

@@ -313,7 +313,7 @@ public class DrawUserPair
using (ImRaii.PushColor(ImGuiCol.Text, roleColor))
{
ImGui.TextUnformatted(_pair.UserData.IsAdmin
? "Official Lightless Admin"
? "Official Lightless Developer"
: "Official Lightless Moderator");
}
ImGui.EndTooltip();

View File

@@ -1032,7 +1032,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
_configService.Current.EnableRightClickMenus = enableRightClickMenu;
_configService.Save();
}
_uiShared.DrawHelpText("This will add Lightless related right click menu entries in the game UI on paired players.");
_uiShared.DrawHelpText("This will add all Lightless related right click menu entries in the game UI.");
if (ImGui.Checkbox("Display status and visible pair count in Server Info Bar", ref enableDtrEntry))
{