External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-26 02:25:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Sebastian-byte
2021-07-23 16:34:31 -05:00
parent 9cab395f1c 0c466bc530
commit c908c1b5ef
39 changed files with 263 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/logic/minecraft/MinecraftInstance.cpp
View File

@@ -801,9 +801,15 @@ QString MinecraftInstance::getStatusbarDescription()
QString description;
description.append(tr("Minecraft %1 (%2)").arg(m_components->getComponentVersion("net.minecraft")).arg(typeName()));
if(m_settings->get("ShowGameTime").toBool() && totalTimePlayed() > 0)
if(m_settings->get("ShowGameTime").toBool())
{
description.append(tr(", played for %1").arg(prettifyTimeDuration(totalTimePlayed())));
if (lastTimePlayed() > 0) {
description.append(tr(", last played for %1").arg(prettifyTimeDuration(lastTimePlayed())));
}
if (totalTimePlayed() > 0) {
description.append(tr(", total played for %1").arg(prettifyTimeDuration(totalTimePlayed())));
}
}
if(hasCrashed())
{