chore: resolve conflicts and merge upstream

2022-03-24 18:24:51 -03:00
parent da43ed8ce1 92f3154e8f
commit e13ca94061
121 changed files with 3182 additions and 802 deletions
--- a/launcher/ui/pages/modplatform/ModPage.h
+++ b/launcher/ui/pages/modplatform/ModPage.h
@ -33,6 +33,8 @@ class ModPage : public QWidget, public BasePage {
    virtual auto debugName() const -> QString = 0;


+    void retranslate() override;
+
    auto shouldDisplay() const -> bool override = 0;
    virtual auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, QString loaderVer = "") const -> bool = 0;