Merge branch 'develop' into chore/add-compiler-warnings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-07-13 20:05:16 -07:00 committed by GitHub
commit 520594e529
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 1569 additions and 761 deletions

View file

@ -69,8 +69,6 @@ bool TexturePackPage::onSelectionChanged(const QModelIndex& current, [[maybe_unu
void TexturePackPage::downloadTPs()
{
if (!m_controlsEnabled)
return;
if (m_instance->typeName() != "Minecraft")
return; // this is a null instance or a legacy instance