Merge branch 'develop' into fix/network_and_signals

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

1 files changed, 0 insertions, 168 deletions

diff --git a/launcher/modplatform/modpacksch/FTBPackManifest.h b/launcher/modplatform/modpacksch/FTBPackManifest.h
deleted file mode 100644
index a8b6f35e..00000000
--- a/launcher/modplatform/modpacksch/FTBPackManifest.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
- *      Copyright 2020 Petr Mrazek <peterix@gmail.com>
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-#include <QVector>
-#include <QUrl>
-#include <QJsonObject>
-#include <QMetaType>
-
-namespace ModpacksCH
-{
-
-struct Specs
-{
-    int id;
-    int minimum;
-    int recommended;
-};
-
-struct Tag
-{
-    int id;
-    QString name;
-};
-
-struct Art
-{
-    int id;
-    QString url;
-    QString type;
-    int width;
-    int height;
-    bool compressed;
-    QString sha1;
-    int size;
-    int64_t updated;
-};
-
-struct Author
-{
-    int id;
-    QString name;
-    QString type;
-    QString website;
-    int64_t updated;
-};
-
-struct VersionInfo
-{
-    int id;
-    QString name;
-    QString type;
-    int64_t updated;
-    Specs specs;
-};
-
-struct Modpack
-{
-    int id;
-    QString name;
-    QString synopsis;
-    QString description;
-    QString type;
-    bool featured;
-    int installs;
-    int plays;
-    int64_t updated;
-    int64_t refreshed;
-    QVector<Art> art;
-    QVector<Author> authors;
-    QVector<VersionInfo> versions;
-    QVector<Tag> tags;
-};
-
-struct VersionTarget
-{
-    int id;
-    QString type;
-    QString name;
-    QString version;
-    int64_t updated;
-};
-
-struct VersionFileCurseForge
-{
-    int project_id;
-    int file_id;
-};
-
-struct VersionFile
-{
-    int id;
-    QString type;
-    QString path;
-    QString name;
-    QString version;
-    QString url;
-    QString sha1;
-    int size;
-    bool clientOnly;
-    bool serverOnly;
-    bool optional;
-    int64_t updated;
-    VersionFileCurseForge curseforge;
-};
-
-struct Version
-{
-    int id;
-    int parent;
-    QString name;
-    QString type;
-    int installs;
-    int plays;
-    int64_t updated;
-    int64_t refreshed;
-    Specs specs;
-    QVector<VersionTarget> targets;
-    QVector<VersionFile> files;
-};
-
-struct VersionChangelog
-{
-    QString content;
-    int64_t updated;
-};
-
-void loadModpack(Modpack & m, QJsonObject & obj);
-
-void loadVersion(Version & m, QJsonObject & obj);
-}
-
-Q_DECLARE_METATYPE(ModpacksCH::Modpack)