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

This commit is contained in:
Rachel Powers 2023-06-25 12:36:27 -07:00
commit df4fd7df7f
No known key found for this signature in database
GPG key ID: E10E321EB160949B
118 changed files with 2410 additions and 822 deletions

View file

@ -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");
}