Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class

2023-06-25 12:36:27 -07:00
parent c8ff812ab8 1bd778d0ae
commit df4fd7df7f
118 changed files with 2410 additions and 822 deletions
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
@ -215,7 +215,7 @@ bool ModrinthCreationTask::createInstance()

    if (m_instIcon != "default") {
        instance.setIconKey(m_instIcon);
-    } else {
+    } else if (!m_managed_id.isEmpty()) {
        instance.setIconKey("modrinth");
    }