add logo to different styles

Also fixed genicons to automate this.

.gitignore

@@ -45,8 +45,8 @@ run/
 flatbuild
 builddir
 # Deb
-packages/debian/polymc/usr/bin
+packages/debian/polymc/usr/
-packages/debian/polymc/usr/lib
-packages/debian/polymc/usr/share/polymc/jars
 packages/debian/polymc.deb
-packages/debian/polymc/DEBIAN/control
+packages/debian/polymc/DEBIAN/control
+# Nix/NixOS
+result/

BUILD.md

@@ -26,11 +26,36 @@ Getting the project to build and run on Linux is easy if you use any modern and
 
 ## Build dependencies
 * A C++ compiler capable of building C++11 code.
-* Qt 5.6+ Development tools (http://qt-project.org/downloads) ("Qt Online Installer for Linux (64 bit)") or the equivalent from your package manager. It is always better to use the Qt from your distribution, as long as it has a new enough version.
+* Qt Development tools 5.6 or newer  (`qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5` on Debian-based system)
-* cmake 3.1 or newer
+* cmake 3.1 or newer (`cmake` on Debian-based system)
-* zlib (for example, `zlib1g-dev`)
+* zlib (`zlib1g-dev` on Debian-based system)
-* Java JDK 8 (for example, `openjdk-8-jdk`)
+* Java JDK (`openjdk-17-jdk`on Debian-based system)
-* GL headers (for example, `libgl1-mesa-dev`)
+* GL headers (`libgl1-mesa-dev` on Debian-based system)
+
+### Building a .deb
+
+You need to install the build dependencies first
+
+```
+git clone https://github.com/PolyMC/PolyMC.git
+git submodule init && git submodule update
+cd packages/debian
+./makedeb.sh
+```
+
+If everything works correctly, the .deb will be next to the build script, in `PolyMC/packages/debian`
+
+### Building a .rpm
+
+You don't need to install the build dependencies, as the script will use `dnf` to install them for you.
+
+```
+git clone https://github.com/PolyMC/PolyMC.git
+cd packages/rpm
+./makerpm.sh
+```
+
+If everything works correctly, the .rpm will be next to the build script, in `PolyMC/packages/rpm`
 
 ### Building from command line
 You need a source folder, a build folder and an install folder.
@@ -180,11 +205,19 @@ zlib1.dll
 # macOS
 
 ### Install prerequisites:
-- Install XCode and set it up to the point where you can build things from a terminal
+- Install XCode Command Line tools
 - Install the official build of CMake (https://cmake.org/download/)
 - Install JDK 8 (https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html)
 - Get Qt 5.6 and install it (https://download.qt.io/new_archive/qt/5.6/5.6.3/)
 
+### XCode Command Line tools
+
+If you don't have XCode CommandLine tools installed, you can install them by using this command in the Terminal App
+
+```bash
+xcode-select --install
+```
+
 ### Build
 
 Pick an installation path - this is where the final `.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration.

CMakeLists.txt

@@ -13,17 +13,10 @@ if(IS_IN_SOURCE_BUILD)
     message(FATAL_ERROR "You are building the Launcher in-source. Please separate the build tree from the source tree.")
 endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR
-        CMAKE_HOST_SYSTEM_VERSION MATCHES ".*WSL.*"
-    )
-        message(FATAL_ERROR "Building the Launcher is not supported in Linux-on-Windows distributions.")
-    endif()
-endif()
-
 
 ##################################### Set CMake options #####################################
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
@@ -47,15 +40,18 @@ if(UNIX AND APPLE)
 endif()
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
 
+# Fix build with Qt 5.13
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
+
 ##################################### Set Application options #####################################
 
 ######## Set URLs ########
 set(Launcher_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetch Launcher's news RSS feed from.")
 
 ######## Set version numbers ########
-set(Launcher_VERSION_MAJOR    0)
+set(Launcher_VERSION_MAJOR    1)
-set(Launcher_VERSION_MINOR    6)
+set(Launcher_VERSION_MINOR    0)
-set(Launcher_VERSION_HOTFIX   14)
+set(Launcher_VERSION_HOTFIX   5)
 
 # Build number
 set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -78,9 +74,6 @@ set(Launcher_PASTE_EE_API_KEY "utLvciUouSURFzfjPxLBf5W4ISsUX4pwBDF7N1AfZ" CACHE
 # Imgur API Client ID
 set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
 
-# Google analytics ID
-set(Launcher_ANALYTICS_ID "" CACHE STRING "ID you can get from Google analytics")
-
 # MSA Client ID
 set(Launcher_MSA_CLIENT_ID "17b47edd-c884-4997-926d-9e7f9a6b4647" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application")
 
@@ -88,7 +81,7 @@ set(Launcher_MSA_CLIENT_ID "17b47edd-c884-4997-926d-9e7f9a6b4647" CACHE STRING "
 set(Launcher_BUG_TRACKER_URL "https://github.com/PolyMC/PolyMC/issues" CACHE STRING "URL for the bug tracker.")
 
 # Discord URL
-set(Launcher_DISCORD_URL "" CACHE STRING "URL for the Discord guild.")
+set(Launcher_DISCORD_URL "https://discord.gg/Z52pwxWCHP" CACHE STRING "URL for the Discord guild.")
 
 # Subreddit URL
 set(Launcher_SUBREDDIT_URL "" CACHE STRING "URL for the subreddit.")
@@ -129,8 +122,9 @@ if (Qt5_POSITION_INDEPENDENT_CODE)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
-####################################### Secrets #######################################
+####################################### Program Info #######################################
 
+set(Launcher_APP_BINARY_NAME "polymc" CACHE STRING "Name of the Launcher binary")
 add_subdirectory(program_info)
 
 ####################################### Install layout #######################################
@@ -203,20 +197,26 @@ elseif(Launcher_LAYOUT_REAL STREQUAL "lin-nodeps")
     install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" DESTINATION ${BUNDLE_DEST_DIR} RENAME ${Launcher_Name})
 
 elseif(Launcher_LAYOUT_REAL STREQUAL "lin-system")
-	set(Launcher_APP_BINARY_NAME "polymc" CACHE STRING "Name of the Launcher binary")
+    set(Launcher_BINARY_DEST_DIR "bin" CACHE STRING "Path to the binary directory")
-	set(Launcher_BINARY_DEST_DIR "bin" CACHE STRING "Path to the binary directory")
+    set(Launcher_LIBRARY_DEST_DIR "lib${LIB_SUFFIX}" CACHE STRING "Path to the library directory")
-	set(Launcher_LIBRARY_DEST_DIR "lib${LIB_SUFFIX}" CACHE STRING "Path to the library directory")
+    set(Launcher_SHARE_DEST_DIR "share/polymc" CACHE STRING "Path to the shared data directory")
-	set(Launcher_SHARE_DEST_DIR "share/polymc" CACHE STRING "Path to the shard data directory")
+    set(JARS_DEST_DIR "${Launcher_SHARE_DEST_DIR}/jars")
-	set(JARS_DEST_DIR "${Launcher_SHARE_DEST_DIR}/jars")
+    set(Launcher_DESKTOP_DEST_DIR "share/applications" CACHE STRING "Path to the desktop file directory")
+    set(Launcher_METAINFO_DEST_DIR "share/metainfo" CACHE STRING "Path to the metainfo directory")
+    set(Launcher_ICON_DEST_DIR "share/icons/hicolor/scalable/apps" CACHE STRING "Path to the scalable icon directory")
 
-	set(BINARY_DEST_DIR ${Launcher_BINARY_DEST_DIR})
+    set(BINARY_DEST_DIR ${Launcher_BINARY_DEST_DIR})
-	set(LIBRARY_DEST_DIR ${Launcher_LIBRARY_DEST_DIR})
+    set(LIBRARY_DEST_DIR ${Launcher_LIBRARY_DEST_DIR})
 
-	MESSAGE(STATUS "Compiling for linux system with ${Launcher_SHARE_DEST_DIR} and LAUNCHER_LINUX_DATADIR")
+    MESSAGE(STATUS "Compiling for linux system with ${Launcher_SHARE_DEST_DIR} and LAUNCHER_LINUX_DATADIR")
-	SET(Launcher_APP_BINARY_DEFS "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DLAUNCHER_LINUX_DATADIR")
+    SET(Launcher_APP_BINARY_DEFS "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DLAUNCHER_LINUX_DATADIR")
 
-	# install as bundle with no dependencies included
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_Desktop} DESTINATION ${Launcher_DESKTOP_DEST_DIR})
-	set(INSTALL_BUNDLE "nodeps")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_MetaInfo} DESTINATION ${Launcher_METAINFO_DEST_DIR})
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_SVG} DESTINATION ${Launcher_ICON_DEST_DIR})
+
+    # install as bundle with no dependencies included
+    set(INSTALL_BUNDLE "nodeps")
 
 elseif(Launcher_LAYOUT_REAL STREQUAL "win-bundle")
     set(BINARY_DEST_DIR ".")
@@ -250,7 +250,6 @@ set(NBT_NAME Launcher_nbt++)
 set(NBT_DEST_DIR ${LIBRARY_DEST_DIR})
 add_subdirectory(libraries/libnbtplusplus)
 
-add_subdirectory(libraries/ganalytics) # google analytics library
 add_subdirectory(libraries/systeminfo) # system information library
 add_subdirectory(libraries/hoedown) # markdown parser
 add_subdirectory(libraries/launcher) # java based launcher part for Minecraft
@@ -260,7 +259,7 @@ add_subdirectory(libraries/quazip) # zip manipulation library
 add_subdirectory(libraries/rainbow) # Qt extension for colors
 add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader
 add_subdirectory(libraries/LocalPeer) # fork of a library from Qt solutions
-add_subdirectory(libraries/classparser) # google analytics library
+add_subdirectory(libraries/classparser) # class parser library
 add_subdirectory(libraries/optional-bare)
 add_subdirectory(libraries/tomlc99) # toml parser
 add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too much

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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, either version 3 of the License, or
+    (at your option) any later version.
+
+    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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,36 +1,28 @@
 <p align="center">
-  <img src="https://avatars.githubusercontent.com/u/96310119" alt="PolyMC logo"/>
+  <img src="/program_info/polymc-light.png#gh-light-mode-only" alt="PolyMC logo"/>
+  <img src="/program_info/polymc-dark.png#gh-dark-mode-only" alt="PolyMC logo"/>
 </p>
-
+<br>
-PolyMC 5
-=========
-
 PolyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.
 
 This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. The PolyMC community felt that the maintainer was not acting in the spirit of Free Software so this fork was made. Read "[Why was this fork made?](https://github.com/PolyMC/PolyMC/wiki/FAQ)" on the wiki for more details.
 
-## todo
-- [ ] Get a permanent name + icon.
-- [ ] Style the logo for different icon styles.
-- [ ] Packaging for Linux--Any help packaging for your favorite distro is appreciated!
-- [ ] Packaging for MacOS/Windows
-- [ ] Stop relying on MultiMC-Hosted metadata services
-- [ ] Remove references to MultiMC
-- [ ] Change up packaging, remove the install script junk
-- [ ] AppImage, Flatpak, .deb, ebuild, and AUR packages
-- [ ] Meson
-- [x] Long-term solution for the MSA client ID issue
-- [x] Figure out a way to switch to GPL.
-
 ## Packages
-Experimental packages are available for Linux (non-portable) and Windows (portable). Both versions are confirmed to work but the Windows version needs more testing--please volunteer if you use Windows!
+Several source build packages are available, along with experimental pre-built generic packages.
 
-- An [AUR package](https://aur.archlinux.org/packages/polymc-git/) is also available.
+<a href='https://flathub.org/apps/details/org.polymc.PolyMC'><img width='240' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a>
-- A Gentoo ebuild is available in the [swirl](https://github.com/binex-dsk/ebuilds) overlay, available as `games-action/polymc`. Check the README for instructions on how to add the overlay.
+<br>
-- A full list of generic, pre-built packages is available [here](https://jenkins.polymc.org/job/PolyMC/lastSuccessfulBuild/artifact/).
+[![AUR package](https://img.shields.io/aur/version/polymc-git)](https://aur.archlinux.org/packages/polymc-git/)
+- A [Nix](packages/nix/NIX.md) derivation is available in repo.
+- A Gentoo ebuild is available in the [swirl](https://git.swurl.xyz/swirl/ebuilds) overlay, named `games-action/polymc`. Check the README for instructions on how to add the overlay.
+- The Flatpak can be built using [this source](https://github.com/flathub/org.polymc.PolyMC).
+- An RPM package is available on [COPR](https://copr.fedorainfracloud.org/coprs/sentry/polymc/), or can be built by going to the `packages/rpm` directory and running `rpmbuild -bb polymc.spec`.
+- Generic, prebuilt packages (archived by version) can be found [here](https://packages.polymc.org/) ([latest](https://packages.polymc.org/latest)).
 - Last build status: https://jenkins.polymc.org/job/PolyMC/lastBuild/
-- [Linux (AMD64) System](https://jenkins.polymc.org/job/PolyMC/lastSuccessfulBuild/artifact/lin64-system.tar.zst) - this is a generic system package intended to be used as a base for making distro-specific packages.
+- [Linux (AMD64) System](https://packages.polymc.org/latest/lin64-system/lin64-system.tar.zst) ([SHA256](https://packages.polymc.org/latest/lin64-system/lin64-system.tar.zst.sha256)) - this is a generic system package intended to be used as a base for making distro-specific packages.
-- [Windows (32-bit)](https://jenkins.polymc.org/job/PolyMC/lastSuccessfulBuild/artifact/win32.zip) - this is a portable package, you can extract it anywhere and run it. This package needs testing.
+- [Windows (32-bit)](https://packages.polymc.org/latest/win32/win32.zip) ([SHA256](https://packages.polymc.org/latest/win32/win32.zip.sha256)) - this is a portable package, you can extract it anywhere and run it. This package needs testing.
+- [Debian (AMD64)](https://packages.polymc.org/latest/deb/polymc-amd64.deb) ([SHA256](https://packages.polymc.org/latest/deb/polymc-amd64.deb.sha256)) - this is intended to be installed with `dpkg -i`. Alternatively, you may build the `.deb` yourself, by going to `packages/debian` and running `./makedeb.sh`.
+- [AppImage (AMD64)](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage) ([SHA256](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage.sha256)) - `chmod +x` must be run on this file before usage. This should work on any distribution.
 - MacOS currently does not have any packages. We are still working on setting up MacOS packaging.
 
 ## Development
@@ -39,6 +31,8 @@ If you want to contribute to PolyMC you might find it useful to join [#developme
 ### Building
 If you want to build PolyMC yourself, check [BUILD.md](BUILD.md) for build instructions.
 
+You can build the flatpak using [this source](https://github.com/flathub/org.polymc.PolyMC).
+
 ### Code formatting
 Just follow the existing formatting.
 
@@ -60,11 +54,11 @@ Feel free to create an issue if you need help. However, you might find it easier
 
 [![PolyMC Discord](https://img.shields.io/discord/923671181020766230?label=PolyMC%20Discord)](https://discord.gg/xq7fxrgtMP)
 
-For people who don't want to use Discord, we have a Matrix Space which is bridged to the discord server. Be sure to enable spaces first (Settings -> Labs -> Spaces), and then you may join the space:
+For people who don't want to use Discord, we have a Matrix Space which is bridged to the Discord server:
 
 [![PolyMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=PolyMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org)
 
-Matrix's support for spaces is still in development, so if you have issues accessing rooms via the space, then you can join the rooms directly:
+If there are any issues with the space or you are using a client that does not support the feature here are the individual rooms:
 
 [![Support](https://img.shields.io/matrix/support:polymc.org?label=%23support&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#support:polymc.org)
 [![Discussion](https://img.shields.io/matrix/discussion:polymc.org?label=%23discussion&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#discussion:polymc.org)

buildconfig/BuildConfig.cpp.in

@@ -24,7 +24,6 @@ Config::Config()
 
     BUILD_PLATFORM = "@Launcher_BUILD_PLATFORM@";
     UPDATER_BASE = "@Launcher_UPDATER_BASE@";
-    ANALYTICS_ID = "@Launcher_ANALYTICS_ID@";
     NOTIFICATION_URL = "@Launcher_NOTIFICATION_URL@";
     FULL_VERSION_STR = "@Launcher_VERSION_MAJOR@.@Launcher_VERSION_MINOR@.@Launcher_VERSION_BUILD@";
 

buildconfig/BuildConfig.h

@@ -46,9 +46,6 @@ public:
     QString USER_AGENT_UNCACHED;
 
 
-    /// Google analytics ID
-    QString ANALYTICS_ID;
-
     /// URL for notifications
     QString NOTIFICATION_URL;
 
@@ -79,7 +76,7 @@ public:
      * Client ID you can get from Imgur when you register an application
      */
     QString IMGUR_CLIENT_ID;
-    
+
     /**
      * Client ID you can get from Microsoft Identity Platform when you register an application
      */
@@ -115,3 +112,4 @@ public:
 };
 
 extern const Config BuildConfig;
+

default.nix

@@ -0,0 +1 @@
+(import packages/nix/flake-compat.nix).defaultNix

flake.lock

@@ -0,0 +1,94 @@
+{
+  "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "libnbtplusplus": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1591558203,
+        "narHash": "sha256-QgvNvaoFflCXEPCCFBCeZvYTpuiwScBG7EosUgFwFNQ=",
+        "owner": "multimc",
+        "repo": "libnbtplusplus",
+        "rev": "dc72a20b7efd304d12af2025223fad07b4b78464",
+        "type": "github"
+      },
+      "original": {
+        "owner": "multimc",
+        "repo": "libnbtplusplus",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1641528457,
+        "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ff377a78794d412a35245e05428c8f95fef3951f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "quazip": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1633895098,
+        "narHash": "sha256-+Of0M2IAoTf1CyC0teCpsyurv6xfqiBo84V49dSeNTA=",
+        "owner": "multimc",
+        "repo": "quazip",
+        "rev": "b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "multimc",
+        "repo": "quazip",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "libnbtplusplus": "libnbtplusplus",
+        "nixpkgs": "nixpkgs",
+        "quazip": "quazip"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,55 @@
+{
+  description = "PolyMC flake";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.flake-compat = { 
+    url = "github:edolstra/flake-compat";
+    flake = false;
+  };
+  inputs.libnbtplusplus = {
+    url = "github:multimc/libnbtplusplus";
+    flake = false;
+  };
+  inputs.quazip = {
+    url = "github:multimc/quazip";
+    flake = false;
+  };
+
+  outputs = inputs@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }:
+    flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+
+        packages = {
+          polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc {
+            inherit self;
+            submoduleQuazip = quazip;
+            submoduleNbt = libnbtplusplus;
+          };
+        };
+        
+        # 'nix flake check' fails
+        overlay = (final: prev: rec { 
+          polymc = prev.libsForQt5.callPackage ./packages/nix/polymc {
+            inherit self;
+            submoduleQuazip = quazip;
+            submoduleNbt = libnbtplusplus;
+          };
+        });
+
+        apps = {
+          polymc = flake-utils.lib.mkApp {
+            name = "polymc";
+            drv = packages.polymc;
+          };
+        };
+      in
+      {
+        inherit packages overlay apps;
+        defaultPackage = packages.polymc;
+        defaultApp = apps.polymc;
+      }
+    );
+}

launcher/Application.cpp

@@ -26,7 +26,6 @@
 #include "ui/setupwizard/SetupWizard.h"
 #include "ui/setupwizard/LanguageWizardPage.h"
 #include "ui/setupwizard/JavaWizardPage.h"
-#include "ui/setupwizard/AnalyticsWizardPage.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
 
@@ -73,7 +72,6 @@
 #include <DesktopServices.h>
 #include <LocalPeer.h>
 
-#include <ganalytics.h>
 #include <sys.h>
 
 
@@ -525,7 +523,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     // Set up paths
     {
         // Root path is used for updates.
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
         QDir foo(FS::PathCombine(binPath, ".."));
         m_rootPath = foo.absolutePath();
 #elif defined(Q_OS_WIN32)
@@ -719,14 +717,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         // paste.ee API key
         m_settings->registerSetting("PasteEEAPIKey", "multimc");
 
-        if(!BuildConfig.ANALYTICS_ID.isEmpty())
-        {
-            // Analytics
-            m_settings->registerSetting("Analytics", true);
-            m_settings->registerSetting("AnalyticsSeen", 0);
-            m_settings->registerSetting("AnalyticsClientID", QString());
-        }
-
         // Init page provider
         {
             m_globalSettingsProvider = std::make_shared<GenericPageProvider>(tr("Settings"));
@@ -908,46 +898,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         qDebug() << "<> Application theme set.";
     }
 
-    // Initialize analytics
-    [this]()
-    {
-        const int analyticsVersion = 2;
-        if(BuildConfig.ANALYTICS_ID.isEmpty())
-        {
-            return;
-        }
-
-        auto analyticsSetting = m_settings->getSetting("Analytics");
-        connect(analyticsSetting.get(), &Setting::SettingChanged, this, &Application::analyticsSettingChanged);
-        QString clientID = m_settings->get("AnalyticsClientID").toString();
-        if(clientID.isEmpty())
-        {
-            clientID = QUuid::createUuid().toString();
-            clientID.remove(QLatin1Char('{'));
-            clientID.remove(QLatin1Char('}'));
-            m_settings->set("AnalyticsClientID", clientID);
-        }
-        m_analytics = new GAnalytics(BuildConfig.ANALYTICS_ID, clientID, analyticsVersion, this);
-        m_analytics->setLogLevel(GAnalytics::Debug);
-        m_analytics->setAnonymizeIPs(true);
-        // FIXME: the ganalytics library has no idea about our fancy shared pointers...
-        m_analytics->setNetworkAccessManager(network().get());
-
-        if(m_settings->get("AnalyticsSeen").toInt() < m_analytics->version())
-        {
-            qDebug() << "Analytics info not seen by user yet (or old version).";
-            return;
-        }
-        if(!m_settings->get("Analytics").toBool())
-        {
-            qDebug() << "Analytics disabled by user.";
-            return;
-        }
-
-        m_analytics->enable();
-        qDebug() << "<> Initialized analytics with tid" << BuildConfig.ANALYTICS_ID;
-    }();
-
     if(createSetupWizard())
     {
         return;
@@ -974,29 +924,13 @@ bool Application::createSetupWizard()
         }
         return false;
     }();
-    bool analyticsRequired = [&]()
-    {
-        if(BuildConfig.ANALYTICS_ID.isEmpty())
-        {
-            return false;
-        }
-        if (!settings()->get("Analytics").toBool())
-        {
-            return false;
-        }
-        if (settings()->get("AnalyticsSeen").toInt() < analytics()->version())
-        {
-            return true;
-        }
-        return false;
-    }();
     bool languageRequired = [&]()
     {
         if (settings()->get("Language").toString().isEmpty())
             return true;
         return false;
     }();
-    bool wizardRequired = javaRequired || analyticsRequired || languageRequired;
+    bool wizardRequired = javaRequired || languageRequired;
 
     if(wizardRequired)
     {
@@ -1009,10 +943,6 @@ bool Application::createSetupWizard()
         {
             m_setupWizard->addPage(new JavaWizardPage(m_setupWizard));
         }
-        if(analyticsRequired)
-        {
-            m_setupWizard->addPage(new AnalyticsWizardPage(m_setupWizard));
-        }
         connect(m_setupWizard, &QDialog::finished, this, &Application::setupWizardFinished);
         m_setupWizard->show();
         return true;
@@ -1169,22 +1099,6 @@ void Application::messageReceived(const QByteArray& message)
     }
 }
 
-void Application::analyticsSettingChanged(const Setting&, QVariant value)
-{
-    if(!m_analytics)
-        return;
-    bool enabled = value.toBool();
-    if(enabled)
-    {
-        qDebug() << "Analytics enabled by user.";
-    }
-    else
-    {
-        qDebug() << "Analytics disabled by user.";
-    }
-    m_analytics->enable(enabled);
-}
-
 std::shared_ptr<TranslationsModel> Application::translations()
 {
     return m_translations;
@@ -1234,7 +1148,7 @@ void Application::setIconTheme(const QString& name)
 QIcon Application::getThemedIcon(const QString& name)
 {
     if(name == "logo") {
-        return QIcon(":/logo.svg");
+        return QIcon(":/org.polymc.PolyMC.svg");
     }
     return XdgIcon::fromTheme(name);
 }
@@ -1454,60 +1368,6 @@ MainWindow* Application::showMainWindow(bool minimized)
         connect(m_mainWindow, &MainWindow::isClosing, this, &Application::on_windowClose);
         m_openWindows++;
     }
-    // FIXME: move this somewhere else...
-    if(m_analytics)
-    {
-        auto windowSize = m_mainWindow->size();
-        auto sizeString = QString("%1x%2").arg(windowSize.width()).arg(windowSize.height());
-        qDebug() << "Viewport size" << sizeString;
-        m_analytics->setViewportSize(sizeString);
-        /*
-         * cm1 = java min heap [MB]
-         * cm2 = java max heap [MB]
-         * cm3 = system RAM [MB]
-         *
-         * cd1 = java version
-         * cd2 = java architecture
-         * cd3 = system architecture
-         * cd4 = CPU architecture
-         */
-        QVariantMap customValues;
-        int min = m_settings->get("MinMemAlloc").toInt();
-        int max = m_settings->get("MaxMemAlloc").toInt();
-        if(min < max)
-        {
-            customValues["cm1"] = min;
-            customValues["cm2"] = max;
-        }
-        else
-        {
-            customValues["cm1"] = max;
-            customValues["cm2"] = min;
-        }
-
-        constexpr uint64_t Mega = 1024ull * 1024ull;
-        int ramSize = int(Sys::getSystemRam() / Mega);
-        qDebug() << "RAM size is" << ramSize << "MB";
-        customValues["cm3"] = ramSize;
-
-        customValues["cd1"] = m_settings->get("JavaVersion");
-        customValues["cd2"] = m_settings->get("JavaArchitecture");
-        customValues["cd3"] = Sys::isSystem64bit() ? "64":"32";
-        customValues["cd4"] = Sys::isCPU64bit() ? "64":"32";
-        auto kernelInfo = Sys::getKernelInfo();
-        customValues["cd5"] = kernelInfo.kernelName;
-        customValues["cd6"] = kernelInfo.kernelVersion;
-        auto distInfo = Sys::getDistributionInfo();
-        if(!distInfo.distributionName.isEmpty())
-        {
-            customValues["cd7"] = distInfo.distributionName;
-        }
-        if(!distInfo.distributionVersion.isEmpty())
-        {
-            customValues["cd8"] = distInfo.distributionVersion;
-        }
-        m_analytics->sendScreenView("Main Window", customValues);
-    }
     return m_mainWindow;
 }
 

launcher/Application.h

@@ -33,7 +33,6 @@ class BaseDetachedToolFactory;
 class TranslationsModel;
 class ITheme;
 class MCEditTool;
-class GAnalytics;
 
 namespace Meta {
     class Index;
@@ -60,10 +59,6 @@ public:
     Application(int &argc, char **argv);
     virtual ~Application();
 
-    GAnalytics *analytics() const {
-        return m_analytics;
-    }
-
     std::shared_ptr<SettingsObject> settings() const {
         return m_settings;
     }
@@ -161,7 +156,6 @@ private slots:
     void messageReceived(const QByteArray & message);
     void controllerSucceeded();
     void controllerFailed(const QString & error);
-    void analyticsSettingChanged(const Setting &setting, QVariant value);
     void setupWizardFinished(int status);
 
 private:
@@ -226,7 +220,6 @@ private:
     // peer launcher instance connector - used to implement single instance launcher and signalling
     LocalPeer * m_peerInstance = nullptr;
 
-    GAnalytics * m_analytics = nullptr;
     SetupWizard * m_setupWizard = nullptr;
 public:
     QString m_instanceIdToLaunch;
@@ -236,3 +229,4 @@ public:
     QUrl m_zipToImport;
     std::unique_ptr<QFile> logFile;
 };
+

launcher/CMakeLists.txt

@@ -627,8 +627,6 @@ SET(LAUNCHER_SOURCES
     # GUI - setup wizard
     ui/setupwizard/SetupWizard.h
     ui/setupwizard/SetupWizard.cpp
-    ui/setupwizard/AnalyticsWizardPage.cpp
-    ui/setupwizard/AnalyticsWizardPage.h
     ui/setupwizard/BaseWizardPage.h
     ui/setupwizard/JavaWizardPage.cpp
     ui/setupwizard/JavaWizardPage.h
@@ -932,7 +930,6 @@ target_link_libraries(Launcher_logic
     hoedown
     Launcher_rainbow
     LocalPeer
-    ganalytics
 )
 
 target_link_libraries(Launcher_logic)

launcher/DesktopServices.cpp

@@ -7,7 +7,7 @@
 /**
  * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.
  */
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 
 #include <unistd.h>
 #include <errno.h>
@@ -83,7 +83,7 @@ bool openDirectory(const QString &path, bool ensureExists)
     {
         return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath()));
     };
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     return IndirectOpen(f);
 #else
     return f();
@@ -97,7 +97,7 @@ bool openFile(const QString &path)
     {
         return QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     };
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     return IndirectOpen(f);
 #else
     return f();
@@ -107,7 +107,7 @@ bool openFile(const QString &path)
 bool openFile(const QString &application, const QString &path, const QString &workingDirectory, qint64 *pid)
 {
     qDebug() << "Opening file" << path << "using" << application;
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
     return IndirectOpen([&]()
     {
@@ -121,7 +121,7 @@ bool openFile(const QString &application, const QString &path, const QString &wo
 bool run(const QString &application, const QStringList &args, const QString &workingDirectory, qint64 *pid)
 {
     qDebug() << "Running" << application << "with args" << args.join(' ');
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
     return IndirectOpen([&]()
     {
@@ -139,7 +139,7 @@ bool openUrl(const QUrl &url)
     {
         return QDesktopServices::openUrl(url);
     };
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     return IndirectOpen(f);
 #else
     return f();

launcher/FileSystem.cpp

@@ -403,7 +403,7 @@ QString getDesktopDir()
 bool createShortCut(QString location, QString dest, QStringList args, QString name,
                           QString icon)
 {
-#if defined Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     location = PathCombine(location, name + ".desktop");
 
     QFile f(location);

launcher/InstanceImportTask.cpp

@@ -55,14 +55,14 @@ void InstanceImportTask::executeTask()
         const QString path = m_sourceUrl.host() + '/' + m_sourceUrl.path();
         auto entry = APPLICATION->metacache()->resolveEntry("general", path);
         entry->setStale(true);
-        m_filesNetJob.reset(new NetJob(tr("Modpack download")));
+        m_filesNetJob = new NetJob(tr("Modpack download"), APPLICATION->network());
         m_filesNetJob->addNetAction(Net::Download::makeCached(m_sourceUrl, entry));
         m_archivePath = entry->getFullPath();
         auto job = m_filesNetJob.get();
         connect(job, &NetJob::succeeded, this, &InstanceImportTask::downloadSucceeded);
         connect(job, &NetJob::progress, this, &InstanceImportTask::downloadProgressChanged);
         connect(job, &NetJob::failed, this, &InstanceImportTask::downloadFailed);
-        m_filesNetJob->start(APPLICATION->network());
+        m_filesNetJob->start();
     }
 }
 
@@ -337,7 +337,7 @@ void InstanceImportTask::processFlame()
     connect(m_modIdResolver.get(), &Flame::FileResolvingTask::succeeded, [&]()
     {
         auto results = m_modIdResolver->getResults();
-        m_filesNetJob.reset(new NetJob(tr("Mod download")));
+        m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
         for(auto result: results.files)
         {
             QString filename = result.fileName;
@@ -391,7 +391,7 @@ void InstanceImportTask::processFlame()
             setProgress(current, total);
         });
         setStatus(tr("Downloading mods..."));
-        m_filesNetJob->start(APPLICATION->network());
+        m_filesNetJob->start();
     }
     );
     connect(m_modIdResolver.get(), &Flame::FileResolvingTask::failed, [&](QString reason)

launcher/LaunchController.cpp

@@ -16,6 +16,7 @@
 #include <QHostInfo>
 #include <QList>
 #include <QHostAddress>
+#include <QPushButton>
 
 #include "BuildConfig.h"
 #include "JavaCommon.h"
@@ -145,36 +146,44 @@ void LaunchController::login() {
                     m_session->MakeOffline(usedname);
                     // offline flavored game from here :3
                 }
-                if(m_accountToUse->ownsMinecraft() && !m_accountToUse->hasProfile()) {
+                if(m_accountToUse->ownsMinecraft()) {
-                    auto entitlement = m_accountToUse->accountData()->minecraftEntitlement;
+                    if(!m_accountToUse->hasProfile()) {
-                    QString errorString;
+                        // Now handle setting up a profile name here...
-                    if(!entitlement.canPlayMinecraft) {
+                        ProfileSetupDialog dialog(m_accountToUse, m_parentWidget);
-                        errorString = tr("The account does not own Minecraft. You need to purchase the game first to play it.");
+                        if (dialog.exec() == QDialog::Accepted)
-                        QMessageBox::warning(
+                        {
-                            nullptr,
+                            tryagain = true;
-                            tr("Missing Minecraft profile"),
+                            continue;
-                            errorString,
+                        }
-                            QMessageBox::StandardButton::Ok,
+                        else
-                            QMessageBox::StandardButton::Ok
+                        {
-                        );
+                            emitFailed(tr("Received undetermined session status during login."));
-                        emitFailed(errorString);
+                            return;
-                        return;
+                        }
-                    }
-                    // Now handle setting up a profile name here...
-                    ProfileSetupDialog dialog(m_accountToUse, m_parentWidget);
-                    if (dialog.exec() == QDialog::Accepted)
-                    {
-                        tryagain = true;
-                        continue;
-                    }
-                    else
-                    {
-                        emitFailed(tr("Received undetermined session status during login."));
-                        return;
                     }
+                    // we own Minecraft, there is a profile, it's all ready to go!
+                    launchInstance();
+                    return;
                 }
                 else {
-                    launchInstance();
+                    // play demo ?
+                    QMessageBox box(m_parentWidget);
+                    box.setWindowTitle(tr("Play demo?"));
+                    box.setText(tr("This account does not own Minecraft.\nYou need to purchase the game first to play it.\n\nDo you want to play the demo?"));
+                    box.setIcon(QMessageBox::Warning);
+                    auto demoButton = box.addButton(tr("Play Demo"), QMessageBox::ButtonRole::YesRole);
+                    auto cancelButton = box.addButton(tr("Cancel"), QMessageBox::ButtonRole::NoRole);
+                    box.setDefaultButton(cancelButton);
+
+                    box.exec();
+                    if(box.clickedButton() == demoButton) {
+                        // play demo here
+                        m_session->MakeDemo();
+                        launchInstance();
+                    }
+                    else {
+                        emitFailed(tr("Launch cancelled - account does not own Minecraft."));
+                    }
                 }
                 return;
             }

launcher/UpdateController.cpp

@@ -93,7 +93,7 @@ void UpdateController::installUpdates()
     qDebug() << "Installing updates.";
 #ifdef Q_OS_WIN
     QString finishCmd = QApplication::applicationFilePath();
-#elif defined Q_OS_LINUX
+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     QString finishCmd = FS::PathCombine(m_root, BuildConfig.LAUNCHER_NAME);
 #elif defined Q_OS_MAC
     QString finishCmd = QApplication::applicationFilePath();

launcher/Version.cpp

@@ -78,7 +78,7 @@ void Version::parse()
     // FIXME: this is bad. versions can contain a lot more separators...
     QStringList parts = m_string.split('.');
 
-    for (const auto &part : parts)
+    for (const auto& part : parts)
     {
         m_sections.append(Section(part));
     }

launcher/java/JavaUtils.cpp

@@ -31,7 +31,7 @@ JavaUtils::JavaUtils()
 {
 }
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
 {
     QDir mmcBin(QCoreApplication::applicationDirPath());
@@ -83,7 +83,7 @@ QProcessEnvironment CleanEnviroment()
             qDebug() << "Env: ignoring" << key << value;
             continue;
         }
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
         // Do not pass LD_* variables to java. They were intended for MultiMC
         if(key.startsWith("LD_"))
         {

launcher/main.cpp

@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
         Q_INIT_RESOURCE(multimc);
         Q_INIT_RESOURCE(backgrounds);
         Q_INIT_RESOURCE(documents);
-        Q_INIT_RESOURCE(logo);
+        Q_INIT_RESOURCE(polymc);
 
         Q_INIT_RESOURCE(pe_dark);
         Q_INIT_RESOURCE(pe_light);

launcher/meta/BaseEntity.cpp

@@ -117,7 +117,7 @@ void Meta::BaseEntity::load(Net::Mode loadType)
     {
         return;
     }
-    m_updateTask = new NetJob(QObject::tr("Download of meta file %1").arg(localFilename()));
+    m_updateTask = new NetJob(QObject::tr("Download of meta file %1").arg(localFilename()), APPLICATION->network());
     auto url = this->url();
     auto entry = APPLICATION->metacache()->resolveEntry("meta", localFilename());
     entry->setStale(true);
@@ -140,7 +140,7 @@ void Meta::BaseEntity::load(Net::Mode loadType)
         m_updateStatus = UpdateStatus::Failed;
         m_updateTask.reset();
     });
-    m_updateTask->start(APPLICATION->network());
+    m_updateTask->start();
 }
 
 bool Meta::BaseEntity::isLoaded() const

launcher/minecraft/AssetsUtils.cpp

@@ -29,6 +29,8 @@
 #include "net/ChecksumValidator.h"
 #include "BuildConfig.h"
 
+#include "Application.h"
+
 namespace {
 QSet<QString> collectPathsFromDir(QString dirPath)
 {
@@ -318,7 +320,7 @@ QString AssetObject::getRelPath()
 
 NetJob::Ptr AssetsIndex::getDownloadJob()
 {
-    auto job = new NetJob(QObject::tr("Assets for %1").arg(id));
+    auto job = new NetJob(QObject::tr("Assets for %1").arg(id), APPLICATION->network());
     for (auto &object : objects.values())
     {
         auto dl = object.getDownloadAction();

launcher/minecraft/MinecraftInstance.cpp

@@ -431,8 +431,7 @@ QStringList MinecraftInstance::processMinecraftArgs(
 
     QMap<QString, QString> token_mapping;
     // yggdrasil!
-    if(session)
+    if(session) {
-    {
         // token_mapping["auth_username"] = session->username;
         token_mapping["auth_session"] = session->session;
         token_mapping["auth_access_token"] = session->access_token;
@@ -440,6 +439,9 @@ QStringList MinecraftInstance::processMinecraftArgs(
         token_mapping["auth_uuid"] = session->uuid;
         token_mapping["user_properties"] = session->serializeUserProperties();
         token_mapping["user_type"] = session->user_type;
+        if(session->demo) {
+            args_pattern += " --demo";
+        }
     }
 
     // blatant self-promotion.
@@ -872,7 +874,9 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     // if we aren't in offline mode,.
     if(session->status != AuthSession::PlayableOffline)
     {
-        process->appendStep(new ClaimAccount(pptr, session));
+        if(!session->demo) {
+            process->appendStep(new ClaimAccount(pptr, session));
+        }
         process->appendStep(new Update(pptr, Net::Mode::Online));
     }
     else

launcher/minecraft/OpSys.cpp

@@ -17,6 +17,8 @@
 
 OpSys OpSys_fromString(QString name)
 {
+    if (name == "freebsd")
+        return Os_FreeBSD;
     if (name == "linux")
         return Os_Linux;
     if (name == "windows")
@@ -30,6 +32,8 @@ QString OpSys_toString(OpSys name)
 {
     switch (name)
     {
+    case Os_FreeBSD:
+	return "freebsd";
     case Os_Linux:
         return "linux";
     case Os_OSX:

launcher/minecraft/OpSys.h

@@ -18,6 +18,7 @@
 enum OpSys
 {
     Os_Windows,
+    Os_FreeBSD,
     Os_Linux,
     Os_OSX,
     Os_Other
@@ -27,11 +28,11 @@ OpSys OpSys_fromString(QString);
 QString OpSys_toString(OpSys);
 
 #ifdef Q_OS_WIN32
-#define currentSystem Os_Windows
+    #define currentSystem Os_Windows
+#elif defined Q_OS_MAC
+    #define currentSystem Os_OSX
+#elif defined Q_OS_FREEBSD
+    #define currentSystem Os_FreeBSD
 #else
-#ifdef Q_OS_MAC
+    #define currentSystem Os_Linux
-#define currentSystem Os_OSX
-#else
-#define currentSystem Os_Linux
 #endif
-#endif

launcher/minecraft/auth/AuthSession.cpp

@@ -30,3 +30,8 @@ bool AuthSession::MakeOffline(QString offline_playername)
     status = PlayableOffline;
     return true;
 }
+
+void AuthSession::MakeDemo() {
+    player_name = "Player";
+    demo = true;
+}

launcher/minecraft/auth/AuthSession.h

@@ -11,6 +11,7 @@ class QNetworkAccessManager;
 struct AuthSession
 {
     bool MakeOffline(QString offline_playername);
+    void MakeDemo();
 
     QString serializeUserProperties();
 
@@ -43,6 +44,9 @@ struct AuthSession
     bool auth_server_online = false;
     // Did the user request online mode?
     bool wants_online = true;
+
+    //Is this a demo session?
+    bool demo = false;
 };
 
 typedef std::shared_ptr<AuthSession> AuthSessionPtr;

launcher/minecraft/auth/Parsers.cpp

@@ -226,6 +226,8 @@ bool parseMinecraftEntitlements(QByteArray & data, MinecraftEntitlement &output)
     }
 
     auto obj = doc.object();
+    output.canPlayMinecraft = false;
+    output.ownsMinecraft = false;
 
     auto itemsArray = obj.value("items").toArray();
     for(auto item: itemsArray) {

launcher/minecraft/launch/ClaimAccount.cpp

@@ -6,7 +6,7 @@
 
 ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session): LaunchStep(parent)
 {
-    if(session->status == AuthSession::Status::PlayableOnline)
+    if(session->status == AuthSession::Status::PlayableOnline && !session->demo)
     {
         auto accounts = APPLICATION->accounts();
         m_account = accounts->getAccountByProfileName(session->player_name);

launcher/minecraft/launch/ExtractNatives.cpp

@@ -23,6 +23,13 @@
 #include "FileSystem.h"
 #include <QDir>
 
+#ifdef major
+    #undef major
+#endif
+#ifdef minor
+    #undef minor
+#endif
+
 static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement)
 {
     if (!target.endsWith(suffix))

launcher/minecraft/launch/PrintInstanceInfo.cpp

@@ -19,8 +19,9 @@
 #include "PrintInstanceInfo.h"
 #include <launch/LaunchTask.h>
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 namespace {
+#if defined(Q_OS_LINUX)
 void probeProcCpuinfo(QStringList &log)
 {
     std::ifstream cpuin("/proc/cpuinfo");
@@ -66,7 +67,43 @@ void runLspci(QStringList &log)
     }
     pclose(lspci);
 }
+#elif defined(Q_OS_FREEBSD)
+void runSysctlHwModel(QStringList &log)
+{
+    char buff[512];
+    FILE *hwmodel = popen("sysctl hw.model", "r");
+    while (fgets(buff, 512, hwmodel) != NULL)
+    {
+	log << QString::fromUtf8(buff);
+	break;
+    }
+    pclose(hwmodel);
+}
 
+void runPciconf(QStringList &log)
+{
+    char buff[512];
+    std::string strcard;
+    FILE *pciconf = popen("pciconf -lv -a vgapci0", "r");
+    while (fgets(buff, 512, pciconf) != NULL)
+    {
+	if (strncmp(buff, "    vendor", 10) == 0)
+	{
+	    std::string str(buff);
+	    strcard.append(str.substr(str.find_first_of("'") + 1, str.find_last_not_of("'") - (str.find_first_of("'") + 2)));
+	    strcard.append(" ");
+	}
+	else if (strncmp(buff, "    device", 10) == 0)
+	{
+	    std::string str2(buff);
+	    strcard.append(str2.substr(str2.find_first_of("'") + 1, str2.find_last_not_of("'") - (str2.find_first_of("'") + 2)));
+	}
+	log << QString::fromStdString(strcard);
+	break;
+    }
+    pclose(pciconf);
+}
+#endif
 void runGlxinfo(QStringList & log)
 {
     // FIXME: fixed size buffers...
@@ -94,10 +131,14 @@ void PrintInstanceInfo::executeTask()
     auto instance = m_parent->instance();
     QStringList log;
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX)
     ::probeProcCpuinfo(log);
     ::runLspci(log);
     ::runGlxinfo(log);
+#elif defined(Q_OS_FREEBSD)
+    ::runSysctlHwModel(log);
+    ::runPciconf(log);
+    ::runGlxinfo(log);
 #endif
 
     logLines(log, MessageLevel::Launcher);

launcher/minecraft/launch/VerifyJavaInstall.cpp

@@ -5,6 +5,13 @@
 #include <minecraft/PackProfile.h>
 #include <minecraft/VersionFilterData.h>
 
+#ifdef major
+    #undef major
+#endif
+#ifdef minor
+    #undef minor
+#endif
+
 void VerifyJavaInstall::executeTask() {
     auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
 

launcher/minecraft/update/AssetUpdateTask.cpp

@@ -24,7 +24,10 @@ void AssetUpdateTask::executeTask()
     auto assets = profile->getMinecraftAssets();
     QUrl indexUrl = assets->url;
     QString localPath = assets->id + ".json";
-    auto job = new NetJob(tr("Asset index for %1").arg(m_inst->name()));
+    auto job = new NetJob(
+        tr("Asset index for %1").arg(m_inst->name()),
+        APPLICATION->network()
+    );
 
     auto metacache = APPLICATION->metacache();
     auto entry = metacache->resolveEntry("asset_indexes", localPath);
@@ -43,7 +46,7 @@ void AssetUpdateTask::executeTask()
     connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
 
     qDebug() << m_inst->name() << ": Starting asset index download";
-    downloadJob->start(APPLICATION->network());
+    downloadJob->start();
 }
 
 bool AssetUpdateTask::canAbort() const
@@ -78,7 +81,7 @@ void AssetUpdateTask::assetIndexFinished()
         connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::emitSucceeded);
         connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed);
         connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
-        downloadJob->start(APPLICATION->network());
+        downloadJob->start();
         return;
     }
     emitSucceeded();

launcher/minecraft/update/FMLLibrariesTask.cpp

@@ -61,7 +61,7 @@ void FMLLibrariesTask::executeTask()
 
     // download missing libs to our place
     setStatus(tr("Downloading FML libraries..."));
-    auto dljob = new NetJob("FML libraries");
+    auto dljob = new NetJob("FML libraries", APPLICATION->network());
     auto metacache = APPLICATION->metacache();
     for (auto &lib : fmlLibsToProcess)
     {
@@ -74,7 +74,7 @@ void FMLLibrariesTask::executeTask()
     connect(dljob, &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed);
     connect(dljob, &NetJob::progress, this, &FMLLibrariesTask::progress);
     downloadJob.reset(dljob);
-    downloadJob->start(APPLICATION->network());
+    downloadJob->start();
 }
 
 bool FMLLibrariesTask::canAbort() const

launcher/minecraft/update/LibrariesTask.cpp

@@ -20,7 +20,7 @@ void LibrariesTask::executeTask()
     auto components = inst->getPackProfile();
     auto profile = components->getProfile();
 
-    auto job = new NetJob(tr("Libraries for instance %1").arg(inst->name()));
+    auto job = new NetJob(tr("Libraries for instance %1").arg(inst->name()), APPLICATION->network());
     downloadJob.reset(job);
 
     auto metacache = APPLICATION->metacache();
@@ -65,7 +65,7 @@ void LibrariesTask::executeTask()
     connect(downloadJob.get(), &NetJob::succeeded, this, &LibrariesTask::emitSucceeded);
     connect(downloadJob.get(), &NetJob::failed, this, &LibrariesTask::jarlibFailed);
     connect(downloadJob.get(), &NetJob::progress, this, &LibrariesTask::progress);
-    downloadJob->start(APPLICATION->network());
+    downloadJob->start();
 }
 
 bool LibrariesTask::canAbort() const

launcher/modplatform/atlauncher/ATLPackInstallTask.cpp

@@ -58,12 +58,12 @@ bool PackInstallTask::abort()
 void PackInstallTask::executeTask()
 {
     qDebug() << "PackInstallTask::executeTask: " << QThread::currentThreadId();
-    auto *netJob = new NetJob("ATLauncher::VersionFetch");
+    auto *netJob = new NetJob("ATLauncher::VersionFetch", APPLICATION->network());
     auto searchUrl = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.json")
             .arg(m_pack).arg(m_version_name);
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 
     QObject::connect(netJob, &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
     QObject::connect(netJob, &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
@@ -424,7 +424,7 @@ void PackInstallTask::installConfigs()
 {
     qDebug() << "PackInstallTask::installConfigs: " << QThread::currentThreadId();
     setStatus(tr("Downloading configs..."));
-    jobPtr.reset(new NetJob(tr("Config download")));
+    jobPtr = new NetJob(tr("Config download"), APPLICATION->network());
 
     auto path = QString("Configs/%1/%2.zip").arg(m_pack).arg(m_version_name);
     auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.zip")
@@ -458,7 +458,7 @@ void PackInstallTask::installConfigs()
         setProgress(current, total);
     });
 
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 }
 
 void PackInstallTask::extractConfigs()
@@ -508,7 +508,7 @@ void PackInstallTask::downloadMods()
     setStatus(tr("Downloading mods..."));
 
     jarmods.clear();
-    jobPtr.reset(new NetJob(tr("Mod download")));
+    jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
     for(const auto& mod : m_version.mods) {
         // skip non-client mods
         if(!mod.client) continue;
@@ -613,7 +613,7 @@ void PackInstallTask::downloadMods()
         setProgress(current, total);
     });
 
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 }
 
 void PackInstallTask::onModsDownloaded() {

launcher/modplatform/flame/FileResolvingTask.cpp

@@ -14,7 +14,7 @@ void Flame::FileResolvingTask::executeTask()
 {
     setStatus(tr("Resolving mod IDs..."));
     setProgress(0, m_toProcess.files.size());
-    m_dljob = new NetJob("Mod id resolver");
+    m_dljob = new NetJob("Mod id resolver", m_network);
     results.resize(m_toProcess.files.size());
     int index = 0;
     for(auto & file: m_toProcess.files)
@@ -27,7 +27,7 @@ void Flame::FileResolvingTask::executeTask()
         index ++;
     }
     connect(m_dljob.get(), &NetJob::finished, this, &Flame::FileResolvingTask::netJobFinished);
-    m_dljob->start(m_network);
+    m_dljob->start();
 }
 
 void Flame::FileResolvingTask::netJobFinished()

launcher/modplatform/legacy_ftb/PackFetchTask.cpp

@@ -12,7 +12,7 @@ void PackFetchTask::fetch()
     publicPacks.clear();
     thirdPartyPacks.clear();
 
-    jobPtr = new NetJob("LegacyFTB::ModpackFetch");
+    jobPtr = new NetJob("LegacyFTB::ModpackFetch", m_network);
 
     QUrl publicPacksUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/modpacks.xml");
     qDebug() << "Downloading public version info from" << publicPacksUrl.toString();
@@ -25,7 +25,7 @@ void PackFetchTask::fetch()
     QObject::connect(jobPtr.get(), &NetJob::succeeded, this, &PackFetchTask::fileDownloadFinished);
     QObject::connect(jobPtr.get(), &NetJob::failed, this, &PackFetchTask::fileDownloadFailed);
 
-    jobPtr->start(m_network);
+    jobPtr->start();
 }
 
 void PackFetchTask::fetchPrivate(const QStringList & toFetch)
@@ -35,7 +35,7 @@ void PackFetchTask::fetchPrivate(const QStringList & toFetch)
     for (auto &packCode: toFetch)
     {
         QByteArray *data = new QByteArray();
-        NetJob *job = new NetJob("Fetching private pack");
+        NetJob *job = new NetJob("Fetching private pack", m_network);
         job->addNetAction(Net::Download::makeByteArray(privatePackBaseUrl.arg(packCode), data));
 
         QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode]
@@ -63,7 +63,7 @@ void PackFetchTask::fetchPrivate(const QStringList & toFetch)
             delete data;
         });
 
-        job->start(m_network);
+        job->start();
     }
 }
 

launcher/modplatform/legacy_ftb/PackInstallTask.cpp

@@ -33,7 +33,7 @@ void PackInstallTask::downloadPack()
 
     auto packoffset = QString("%1/%2/%3").arg(m_pack.dir, m_version.replace(".", "_"), m_pack.file);
     auto entry = APPLICATION->metacache()->resolveEntry("FTBPacks", packoffset);
-    netJobContainer = new NetJob("Download FTB Pack");
+    netJobContainer = new NetJob("Download FTB Pack", m_network);
 
     entry->setStale(true);
     QString url;
@@ -51,7 +51,7 @@ void PackInstallTask::downloadPack()
     connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
     connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
     connect(netJobContainer.get(), &NetJob::progress, this, &PackInstallTask::onDownloadProgress);
-    netJobContainer->start(m_network);
+    netJobContainer->start();
 
     progress(1, 4);
 }

launcher/modplatform/modpacksch/FTBPackInstallTask.cpp

@@ -63,12 +63,11 @@ void PackInstallTask::executeTask()
         return;
     }
 
-    auto *netJob = new NetJob("ModpacksCH::VersionFetch");
+    auto *netJob = new NetJob("ModpacksCH::VersionFetch", APPLICATION->network());
-    auto searchUrl = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/%1/%2")
+    auto searchUrl = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/%1/%2").arg(m_pack.id).arg(version.id);
-            .arg(m_pack.id).arg(version.id);
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 
     QObject::connect(netJob, &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
     QObject::connect(netJob, &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
@@ -113,7 +112,7 @@ void PackInstallTask::downloadPack()
 {
     setStatus(tr("Downloading mods..."));
 
-    jobPtr = new NetJob(tr("Mod download"));
+    jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
     for(auto file : m_version.files) {
         if(file.serverOnly) continue;
 
@@ -159,7 +158,7 @@ void PackInstallTask::downloadPack()
         setProgress(current, total);
     });
 
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 }
 
 void PackInstallTask::install()

launcher/modplatform/technic/SingleZipPackInstallTask.cpp

@@ -44,14 +44,14 @@ void Technic::SingleZipPackInstallTask::executeTask()
     const QString path = m_sourceUrl.host() + '/' + m_sourceUrl.path();
     auto entry = APPLICATION->metacache()->resolveEntry("general", path);
     entry->setStale(true);
-    m_filesNetJob.reset(new NetJob(tr("Modpack download")));
+    m_filesNetJob = new NetJob(tr("Modpack download"), APPLICATION->network());
     m_filesNetJob->addNetAction(Net::Download::makeCached(m_sourceUrl, entry));
     m_archivePath = entry->getFullPath();
     auto job = m_filesNetJob.get();
     connect(job, &NetJob::succeeded, this, &Technic::SingleZipPackInstallTask::downloadSucceeded);
     connect(job, &NetJob::progress, this, &Technic::SingleZipPackInstallTask::downloadProgressChanged);
     connect(job, &NetJob::failed, this, &Technic::SingleZipPackInstallTask::downloadFailed);
-    m_filesNetJob->start(APPLICATION->network());
+    m_filesNetJob->start();
 }
 
 void Technic::SingleZipPackInstallTask::downloadSucceeded()

launcher/modplatform/technic/SolderPackInstallTask.cpp

@@ -42,12 +42,12 @@ bool Technic::SolderPackInstallTask::abort() {
 void Technic::SolderPackInstallTask::executeTask()
 {
     setStatus(tr("Finding recommended version:\n%1").arg(m_sourceUrl.toString()));
-    m_filesNetJob.reset(new NetJob(tr("Finding recommended version")));
+    m_filesNetJob = new NetJob(tr("Finding recommended version"), m_network);
     m_filesNetJob->addNetAction(Net::Download::makeByteArray(m_sourceUrl, &m_response));
     auto job = m_filesNetJob.get();
     connect(job, &NetJob::succeeded, this, &Technic::SolderPackInstallTask::versionSucceeded);
     connect(job, &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
-    m_filesNetJob->start(m_network);
+    m_filesNetJob->start();
 }
 
 void Technic::SolderPackInstallTask::versionSucceeded()
@@ -67,12 +67,12 @@ void Technic::SolderPackInstallTask::versionSucceeded()
     }
 
     setStatus(tr("Resolving modpack files:\n%1").arg(m_sourceUrl.toString()));
-    m_filesNetJob.reset(new NetJob(tr("Resolving modpack files")));
+    m_filesNetJob = new NetJob(tr("Resolving modpack files"), m_network);
     m_filesNetJob->addNetAction(Net::Download::makeByteArray(m_sourceUrl, &m_response));
     auto job = m_filesNetJob.get();
     connect(job, &NetJob::succeeded, this, &Technic::SolderPackInstallTask::fileListSucceeded);
     connect(job, &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
-    m_filesNetJob->start(m_network);
+    m_filesNetJob->start();
 }
 
 void Technic::SolderPackInstallTask::fileListSucceeded()
@@ -99,7 +99,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
         m_filesNetJob.reset();
         return;
     }
-    m_filesNetJob.reset(new NetJob(tr("Downloading modpack")));
+    m_filesNetJob = new NetJob(tr("Downloading modpack"), m_network);
     int i = 0;
     for (auto &modUrl: modUrls)
     {
@@ -113,7 +113,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
     connect(m_filesNetJob.get(), &NetJob::succeeded, this, &Technic::SolderPackInstallTask::downloadSucceeded);
     connect(m_filesNetJob.get(), &NetJob::progress, this, &Technic::SolderPackInstallTask::downloadProgressChanged);
     connect(m_filesNetJob.get(), &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
-    m_filesNetJob->start(m_network);
+    m_filesNetJob->start();
 }
 
 void Technic::SolderPackInstallTask::downloadSucceeded()

launcher/net/NetJob.h

@@ -29,7 +29,7 @@ class NetJob : public Task
 public:
     using Ptr = shared_qobject_ptr<NetJob>;
 
-    explicit NetJob(QString job_name) : Task()
+    explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network) : Task(), m_network(network)
     {
         setObjectName(job_name);
     }
@@ -65,19 +65,6 @@ private slots:
 public slots:
     virtual void executeTask() override;
     virtual bool abort() override;
-    virtual void start(shared_qobject_ptr<QNetworkAccessManager> network) {
-        m_network = network;
-        start();
-    }
-
-protected slots:
-    void start() override {
-        if(!m_network) {
-            throw "Missing network while trying to start " + objectName();
-            return;
-        }
-        Task::start();
-    }
 
 private slots:
     void partProgress(int index, qint64 bytesReceived, qint64 bytesTotal);

launcher/news/NewsChecker.cpp

@@ -37,12 +37,12 @@ void NewsChecker::reloadNews()
 
     qDebug() << "Reloading news.";
 
-    NetJob* job = new NetJob("News RSS Feed");
+    NetJob* job = new NetJob("News RSS Feed", m_network);
     job->addNetAction(Net::Download::makeByteArray(m_feedUrl, &newsData));
     QObject::connect(job, &NetJob::succeeded, this, &NewsChecker::rssDownloadFinished);
     QObject::connect(job, &NetJob::failed, this, &NewsChecker::rssDownloadFailed);
     m_newsNetJob.reset(job);
-    job->start(m_network);
+    job->start();
 }
 
 void NewsChecker::rssDownloadFinished()

launcher/notifications/NotificationChecker.cpp

@@ -52,12 +52,12 @@ void NotificationChecker::checkForNotifications()
     {
         return;
     }
-    m_checkJob.reset(new NetJob("Checking for notifications"));
+    m_checkJob = new NetJob("Checking for notifications", APPLICATION->network());
     auto entry = APPLICATION->metacache()->resolveEntry("root", "notifications.json");
     entry->setStale(true);
     m_checkJob->addNetAction(m_download = Net::Download::makeCached(m_notificationsUrl, entry));
     connect(m_download.get(), &Net::Download::succeeded, this, &NotificationChecker::downloadSucceeded);
-    m_checkJob->start(APPLICATION->network());
+    m_checkJob->start();
 }
 
 void NotificationChecker::downloadSucceeded(int)

launcher/resources/OSX/OSX.qrc

@@ -23,7 +23,6 @@
         <file>scalable/new.svg</file>
         <file>scalable/news.svg</file>
         <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
         <file>scalable/proxy.svg</file>
         <file>scalable/refresh.svg</file>
         <file>scalable/resourcepacks.svg</file>

launcher/resources/OSX/scalable/launcher.svg

@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ <defs>
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-<rect fill="none" width="24" height="24"/>
+   <stop stop-color="#88b858" offset="0"/>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#E6E6E6" d="M22,6c0-0.6-0.4-1-1-1H9C8.4,5,8,5.4,8,6v12c0,0.6,0.4,1,1,1h12
+   <stop stop-color="#72b147" offset=".5"/>
-	c0.6,0,1-0.4,1-1V6z"/>
+   <stop stop-color="#5a9a30" offset="1"/>
-<polygon fill="#FFFFFF" points="12.5,8.1 12.5,15.9 18.6,12 "/>
+  </linearGradient>
-<g>
+ </defs>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#585858" d="M21,20H9c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h12c1.1,0,2,0.9,2,2
+ <g>
-		v12C23,19.1,22.1,20,21,20z M22,6c0-0.6-0.4-1-1-1H9C8.4,5,8,5.4,8,6v12c0,0.6,0.4,1,1,1h12c0.6,0,1-0.4,1-1V6z"/>
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-	<g>
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-		<path fill="#585858" d="M12.3,17c-0.4,0-0.8-0.3-0.8-0.9V7.9c0-0.6,0.4-0.9,0.8-0.9c0.2,0,0.4,0.1,0.5,0.2l6.5,4.1
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-			c0.3,0.2,0.4,0.4,0.4,0.7s-0.2,0.6-0.4,0.7l-6.5,4.1C12.7,16.9,12.5,17,12.3,17z M12.5,8.1l0,7.7l6.1-3.9L12.5,8.1z"/>
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-	</g>
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-</g>
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+ </g>
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
 </svg>

launcher/resources/flat/flat.qrc

@@ -26,7 +26,6 @@
         <file>scalable/news.svg</file>
         <file>scalable/notes.svg</file>
         <file>scalable/packages.svg</file>
-        <file>scalable/patreon.svg</file>
         <file>scalable/proxy.svg</file>
         <file>scalable/quickmods.svg</file>
         <file>scalable/reddit-alien.svg</file>

launcher/resources/flat/scalable/launcher.svg

@@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="24" height="24" fill="#757575" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m20 4h-16v16h16zm0 18h-16c-1.1046 0-2-0.89543-2-2v-16c0-1.1046 0.89543-2 2-2h16c1.1046 0 2 0.89543 2 2v16c0 1.1046-0.89543 2-2 2z"/><path d="m7.2 18c-0.225 0-0.45-0.075-0.6-0.15-0.375-0.225-0.6-0.6-0.6-1.05v-9.6c0-0.45 0.225-0.825 0.6-1.05 0.225-0.15 0.375-0.15 0.6-0.15 0.15 0 0.375 0.075 0.525 0.15l9.6 4.8c0.375 0.225 0.675 0.6 0.675 1.05 0 0.45-0.225 0.9-0.675 1.05l-9.6 4.8c-0.15 0.075-0.375 0.15-0.525 0.15z" clip-rule="evenodd" fill="#757575" fill-rule="evenodd" stroke-width=".99999"/></svg>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#88b858" offset="0"/>
+   <stop stop-color="#72b147" offset=".5"/>
+   <stop stop-color="#5a9a30" offset="1"/>
+  </linearGradient>
+ </defs>
+ <g>
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+ </g>
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+</svg>

launcher/resources/iOS/iOS.qrc

@@ -23,7 +23,6 @@
         <file>scalable/new.svg</file>
         <file>scalable/news.svg</file>
         <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
         <file>scalable/proxy.svg</file>
         <file>scalable/refresh.svg</file>
         <file>scalable/resourcepacks.svg</file>

launcher/resources/iOS/scalable/launcher.svg

@@ -1,14 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ <defs>
-	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-<g>
+   <stop stop-color="#88b858" offset="0"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#3366CC" d="M28,32H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h24c2.2,0,4,1.8,4,4
+   <stop stop-color="#72b147" offset=".5"/>
-		v24C32,30.2,30.2,32,28,32z M30,4c0-1.1-0.9-2-2-2H4C2.9,2,2,2.9,2,4v24c0,1.1,0.9,2,2,2h24c1.1,0,2-0.9,2-2V4z"/>
+   <stop stop-color="#5a9a30" offset="1"/>
-	<g>
+  </linearGradient>
-		<path fill="#3366CC" d="M10.6,26C9.8,26,9,25.4,9,24.2V7.8C9,6.6,9.8,6,10.6,6c0.4,0,0.7,0.1,1.1,0.3l13,8.2
+ </defs>
-			c0.6,0.3,0.9,0.9,0.9,1.5s-0.3,1.1-0.9,1.5l-13,8.2C11.3,25.9,10.9,26,10.6,26z M11,8.3l0,15.4L23.2,16L11,8.3z"/>
+ <g>
-	</g>
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-</g>
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+ </g>
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
 </svg>

launcher/resources/multimc/multimc.qrc

@@ -77,14 +77,6 @@
         <!-- Custom commands. -->
         <file>scalable/custom-commands.svg</file>
 
-        <!-- Patron logo. (C) 2014 Patreon, Inc., http://www.patreon.com/toolbox?ftyp=media -->
-        <file>16x16/patreon.png</file>
-        <file>22x22/patreon.png</file>
-        <file>24x24/patreon.png</file>
-        <file>32x32/patreon.png</file>
-        <file>48x48/patreon.png</file>
-        <file>64x64/patreon.png</file>
-
         <!-- The cat button. Freeware, http://findicons.com/icon/73096/black_cat -->
         <file>16x16/cat.png</file>
         <file>22x22/cat.png</file>

launcher/resources/multimc/scalable/launcher.svg

@@ -1,187 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg
+ <defs>
-   version="1.1"
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   width="32"
+   <stop stop-color="#88b858" offset="0"/>
-   height="32"
+   <stop stop-color="#72b147" offset=".5"/>
-   id="svg2"
+   <stop stop-color="#5a9a30" offset="1"/>
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+  </linearGradient>
-   sodipodi:docname="launcher.svg"
+ </defs>
-   inkscape:export-filename="/home/peterix/minecraft/src/MultiMC5/application/resources/multimc/64x64/status-running.png"
+ <g>
-   inkscape:export-xdpi="180"
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-   inkscape:export-ydpi="180"
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-   xmlns:xlink="http://www.w3.org/1999/xlink"
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-   xmlns="http://www.w3.org/2000/svg"
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-   xmlns:svg="http://www.w3.org/2000/svg"
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ </g>
-   xmlns:cc="http://creativecommons.org/ns#"
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1502"
-     inkscape:window-height="1405"
-     id="namedview32"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="7.9152543"
-     inkscape:cy="16.576271"
-     inkscape:window-x="2015"
-     inkscape:window-y="586"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4160"
-       spacingx="0.5"
-       spacingy="0.5"
-       empspacing="8" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4162">
-      <stop
-         offset="0"
-         style="stop-color:#0071f1;stop-opacity:1"
-         id="stop4164" />
-      <stop
-         offset="1"
-         style="stop-color:#007ec3;stop-opacity:1"
-         id="stop4166" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         style="stop-color:#b80000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3831"
-         style="stop-color:#600000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3801">
-      <stop
-         id="stop3803"
-         style="stop-color:#f1ab00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3805"
-         style="stop-color:#c39a00;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3005">
-      <stop
-         id="stop3007"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3781"
-         style="stop-color:#ffffff;stop-opacity:0.49803922"
-         offset="0.8142857" />
-      <stop
-         id="stop3009"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter3797">
-      <feGaussianBlur
-         id="feGaussianBlur3799"
-         stdDeviation="0.52592593" />
-    </filter>
-    <radialGradient
-       cx="3.9371533"
-       cy="7.5016646"
-       r="2.5"
-       fx="3.9371533"
-       fy="7.5016646"
-       id="radialGradient3807"
-       xlink:href="#linearGradient4162"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
-    <radialGradient
-       cx="3.9371533"
-       cy="7.5016646"
-       r="2.5"
-       fx="3.9371533"
-       fy="7.5016646"
-       id="radialGradient3823"
-       xlink:href="#linearGradient3827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
-    <radialGradient
-       cx="3.9371533"
-       cy="7.5016646"
-       r="2.5"
-       fx="3.9371533"
-       fy="7.5016646"
-       id="radialGradient3786"
-       xlink:href="#linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="layer1">
-    <path
-       d="m 8,9.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
-       transform="matrix(6.4,0,0,6.4,-19.2,975.5622)"
-       id="path2997"
-       style="color:#000000;fill:url(#radialGradient3807);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 31,16 A 15,15 0 1 1 1,16 15,15 0 1 1 31,16 z"
-       transform="matrix(0.93333333,0,0,0.93333444,1.0666666,1021.4288)"
-       id="path2999"
-       style="color:#000000;fill:#009cff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g4187">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4168"
-         d="m 10.455414,1028.3241 0,16.0761 L 24,1036.3622 Z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.95251006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         style="opacity:0.54887217;fill:#ffffff;stroke:none"
-         id="path3809-3"
-         d="m 10.5,1044.3622 0,-16 13.5,8 z" />
-    </g>
-  </g>
 </svg>

launcher/resources/pe_blue/pe_blue.qrc

@@ -23,7 +23,6 @@
         <file>scalable/new.svg</file>
         <file>scalable/news.svg</file>
         <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
         <file>scalable/proxy.svg</file>
         <file>scalable/refresh.svg</file>
         <file>scalable/resourcepacks.svg</file>

launcher/resources/pe_blue/scalable/launcher.svg

@@ -1,43 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ <defs>
-	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#DAEEFF" d="M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v20c0,1.1,0.9,2,2,2h20
+   <stop stop-color="#88b858" offset="0"/>
-	c1.1,0,2-0.9,2-2V6z"/>
+   <stop stop-color="#72b147" offset=".5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#3366CC" d="M26,32H6c-3.3,0-6-2.7-6-6V6c0-3.3,2.7-6,6-6h20c3.3,0,6,2.7,6,6
+   <stop stop-color="#5a9a30" offset="1"/>
-	v20C32,29.3,29.3,32,26,32z M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v20c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2V6z"/>
+  </linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#C1272D" d="M10.6,24.2c-0.3,0-0.6-0.1-0.8-0.2C9.3,23.7,9,23.2,9,22.6V9.8
+ </defs>
-	c0-0.6,0.3-1.1,0.8-1.4c0.3-0.2,0.5-0.2,0.8-0.2c0.2,0,0.5,0.1,0.7,0.2l12.8,6.4c0.5,0.3,0.9,0.8,0.9,1.4c0,0.6-0.3,1.2-0.9,1.4
+ <g>
-	L11.3,24C11.1,24.1,10.8,24.2,10.6,24.2z"/>
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-<g>
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-</g>
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-<g>
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-</g>
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-<g>
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-</g>
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
-<g>
+ </g>
-</g>
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

launcher/resources/pe_colored/pe_colored.qrc

@@ -23,7 +23,6 @@
         <file>scalable/new.svg</file>
         <file>scalable/news.svg</file>
         <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
         <file>scalable/proxy.svg</file>
         <file>scalable/refresh.svg</file>
         <file>scalable/resourcepacks.svg</file>

launcher/resources/pe_colored/scalable/launcher.svg

@@ -1,14 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ <defs>
-	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#F2F2F2" d="M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v20c0,1.1,0.9,2,2,2h20
+   <stop stop-color="#88b858" offset="0"/>
-	c1.1,0,2-0.9,2-2V6z"/>
+   <stop stop-color="#72b147" offset=".5"/>
-<path fill="none" d="M6,28h20c1.1,0,2-0.9,2-2V9V6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v3v17C4,27.1,4.9,28,6,28z"/>
+   <stop stop-color="#5a9a30" offset="1"/>
-<path fill="#39B54A" d="M26,0H6C2.7,0,0,2.7,0,6v3h4V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v3h4V6C32,2.7,29.3,0,26,0z"/>
+  </linearGradient>
-<path fill="#8C6239" d="M28,26c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V9H0v17c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V9h-4V26z"/>
+ </defs>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#C1272D" d="M10.6,24.2c-0.3,0-0.6-0.1-0.8-0.2C9.3,23.7,9,23.2,9,22.6V9.8
+ <g>
-	c0-0.6,0.3-1.1,0.8-1.4c0.3-0.2,0.5-0.2,0.8-0.2c0.2,0,0.5,0.1,0.7,0.2l12.8,6.4c0.5,0.3,0.9,0.8,0.9,1.4c0,0.6-0.3,1.2-0.9,1.4
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-	L11.3,24C11.1,24.1,10.8,24.2,10.6,24.2z"/>
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+ </g>
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
 </svg>

launcher/resources/pe_dark/pe_dark.qrc

@@ -23,7 +23,6 @@
         <file>scalable/new.svg</file>
         <file>scalable/news.svg</file>
         <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
         <file>scalable/proxy.svg</file>
         <file>scalable/refresh.svg</file>
         <file>scalable/resourcepacks.svg</file>

launcher/resources/pe_dark/scalable/launcher.svg

@@ -1,43 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ <defs>
-	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#F2F2F2" d="M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v20c0,1.1,0.9,2,2,2h20
+   <stop stop-color="#88b858" offset="0"/>
-	c1.1,0,2-0.9,2-2V6z"/>
+   <stop stop-color="#72b147" offset=".5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26,32H6c-3.3,0-6-2.7-6-6V6c0-3.3,2.7-6,6-6h20c3.3,0,6,2.7,6,6v20
+   <stop stop-color="#5a9a30" offset="1"/>
-	C32,29.3,29.3,32,26,32z M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v20c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2V6z"/>
+  </linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#666666" d="M10.6,24.2c-0.3,0-0.6-0.1-0.8-0.2C9.3,23.7,9,23.2,9,22.6V9.8
+ </defs>
-	c0-0.6,0.3-1.1,0.8-1.4c0.3-0.2,0.5-0.2,0.8-0.2c0.2,0,0.5,0.1,0.7,0.2l12.8,6.4c0.5,0.3,0.9,0.8,0.9,1.4c0,0.6-0.3,1.2-0.9,1.4
+ <g>
-	L11.3,24C11.1,24.1,10.8,24.2,10.6,24.2z"/>
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-<g>
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-</g>
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-<g>
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-</g>
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-<g>
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-</g>
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
-<g>
+ </g>
-</g>
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

launcher/resources/pe_light/pe_light.qrc

@@ -23,7 +23,6 @@
         <file>scalable/new.svg</file>
         <file>scalable/news.svg</file>
         <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
         <file>scalable/proxy.svg</file>
         <file>scalable/refresh.svg</file>
         <file>scalable/resourcepacks.svg</file>
@@ -37,4 +36,3 @@
         <file>scalable/worlds.svg</file>
     </qresource>
 </RCC>
-

launcher/resources/pe_light/scalable/launcher.svg

@@ -1,43 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ <defs>
-	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#4D4D4D" d="M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v20c0,1.1,0.9,2,2,2h20
+   <stop stop-color="#88b858" offset="0"/>
-	c1.1,0,2-0.9,2-2V6z"/>
+   <stop stop-color="#72b147" offset=".5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#F2F2F2" d="M26,32H6c-3.3,0-6-2.7-6-6V6c0-3.3,2.7-6,6-6h20c3.3,0,6,2.7,6,6
+   <stop stop-color="#5a9a30" offset="1"/>
-	v20C32,29.3,29.3,32,26,32z M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v20c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2V6z"/>
+  </linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M10.6,24.2c-0.3,0-0.6-0.1-0.8-0.2C9.3,23.7,9,23.2,9,22.6V9.8
+ </defs>
-	c0-0.6,0.3-1.1,0.8-1.4c0.3-0.2,0.5-0.2,0.8-0.2c0.2,0,0.5,0.1,0.7,0.2l12.8,6.4c0.5,0.3,0.9,0.8,0.9,1.4c0,0.6-0.3,1.2-0.9,1.4
+ <g>
-	L11.3,24C11.1,24.1,10.8,24.2,10.6,24.2z"/>
+  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-<g>
+  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-</g>
+  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-<g>
+  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-</g>
+  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-<g>
+  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-</g>
+  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
-<g>
+ </g>
-</g>
+ <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

launcher/tools/MCEditTool.cpp

@@ -52,7 +52,7 @@ QString MCEditTool::getProgramPath()
 #else
     const QString mceditPath = path();
     QDir mceditDir(mceditPath);
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     if (mceditDir.exists("mcedit.sh"))
     {
         return mceditDir.absoluteFilePath("mcedit.sh");

launcher/translations/TranslationsModel.cpp

@@ -573,14 +573,14 @@ void TranslationsModel::downloadIndex()
         return;
     }
     qDebug() << "Downloading Translations Index...";
-    d->m_index_job.reset(new NetJob("Translations Index"));
+    d->m_index_job = new NetJob("Translations Index", APPLICATION->network());
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("translations", "index_v2.json");
     entry->setStale(true);
     d->m_index_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/index_v2.json"), entry);
     d->m_index_job->addNetAction(d->m_index_task);
     connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed);
     connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexReceived);
-    d->m_index_job->start(APPLICATION->network());
+    d->m_index_job->start();
 }
 
 void TranslationsModel::updateLanguage(QString key)
@@ -625,13 +625,13 @@ void TranslationsModel::downloadTranslation(QString key)
     dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawHash));
     dl->m_total_progress = lang->file_size;
 
-    d->m_dl_job.reset(new NetJob("Translation for " + key));
+    d->m_dl_job = new NetJob("Translation for " + key, APPLICATION->network());
     d->m_dl_job->addNetAction(dl);
 
     connect(d->m_dl_job.get(), &NetJob::succeeded, this, &TranslationsModel::dlGood);
     connect(d->m_dl_job.get(), &NetJob::failed, this, &TranslationsModel::dlFailed);
 
-    d->m_dl_job->start(APPLICATION->network());
+    d->m_dl_job->start();
 }
 
 void TranslationsModel::downloadNext()

launcher/ui/MainWindow.cpp

@@ -201,7 +201,6 @@ public:
     //TranslatedAction actionRefresh;
     TranslatedAction actionCheckUpdate;
     TranslatedAction actionSettings;
-    TranslatedAction actionPatreon;
     TranslatedAction actionMoreNews;
     TranslatedAction actionManageAccounts;
     TranslatedAction actionLaunchInstance;
@@ -400,14 +399,6 @@ public:
 
         mainToolBar->addSeparator();
 
-        actionPatreon = TranslatedAction(MainWindow);
-        actionPatreon->setObjectName(QStringLiteral("actionPatreon"));
-        actionPatreon->setIcon(APPLICATION->getThemedIcon("patreon"));
-        actionPatreon.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Support %1"));
-        actionPatreon.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the %1 Patreon page."));
-        all_actions.append(&actionPatreon);
-        mainToolBar->addAction(actionPatreon);
-
         actionCAT = TranslatedAction(MainWindow);
         actionCAT->setObjectName(QStringLiteral("actionCAT"));
         actionCAT->setCheckable(true);
@@ -1694,11 +1685,6 @@ void MainWindow::on_actionReportBug_triggered()
     DesktopServices::openUrl(QUrl(BuildConfig.BUG_TRACKER_URL));
 }
 
-void MainWindow::on_actionPatreon_triggered()
-{
-    DesktopServices::openUrl(QUrl("https://www.patreon.com/multimc"));
-}
-
 void MainWindow::on_actionMoreNews_triggered()
 {
     DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));

launcher/ui/MainWindow.h

@@ -109,8 +109,6 @@ private slots:
 
     void on_actionReportBug_triggered();
 
-    void on_actionPatreon_triggered();
-
     void on_actionMoreNews_triggered();
 
     void newsButtonClicked();
@@ -223,3 +221,4 @@ private:
     // managed by the application object
     Task *m_versionLoadTask = nullptr;
 };
+

launcher/ui/dialogs/AboutDialog.cpp

@@ -26,9 +26,8 @@
 namespace {
 // Credits
 // This is a hack, but I can't think of a better way to do this easily without screwing with QTextDocument...
-QString getCreditsHtml(QStringList patrons)
+QString getCreditsHtml()
 {
-    QString patronsHeading = QObject::tr("Patrons", "About Credits");
     QString output;
     QTextStream stream(&output);
     stream.setCodec(QTextCodec::codecForName("UTF-8"));
@@ -50,13 +49,6 @@ QString getCreditsHtml(QStringList patrons)
     stream << "<p>Zeker Zhayard &lt;<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>&gt;</p>\n";
     stream << "<br />\n";
 
-    if(!patrons.isEmpty()) {
-        stream << "<h3>" << QObject::tr("Patrons", "About Credits") << "</h3>\n";
-        for (QString patron : patrons)
-        {
-            stream << "<p>" << patron << "</p>\n";
-        }
-    }
     stream << "</center>\n";
     return output;
 }
@@ -80,7 +72,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
 
     setWindowTitle(tr("About %1").arg(launcherName));
 
-    QString chtml = getCreditsHtml(QStringList());
+    QString chtml = getCreditsHtml();
     ui->creditsText->setHtml(chtml);
 
     QString lhtml = getLicenseHtml();
@@ -104,15 +96,6 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
     else
         ui->channelLabel->setVisible(false);
 
-    ui->redistributionText->setHtml(tr(
-"<p>We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license.</p>\n"
-"<p>Part of the reason for using the Apache license is we don't want people using the &quot;MultiMC&quot; name when redistributing the project. "
-"This means people must take the time to go through the source code and remove all references to &quot;MultiMC&quot;, including but not limited to the project "
-"icon and the title of windows, (no <b>MultiMC-fork</b> in the title).</p>\n"
-"<p>The Apache license covers reasonable use for the name - a mention of the project's origins in the About dialog and the license is acceptable. "
-"However, it should be abundantly clear that the project is a fork <b>without</b> implying that you have our blessing.</p>"
-    ));
-
     QString urlText("<html><head/><body><p><a href=\"%1\">%1</a></p></body></html>");
     ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT));
 
@@ -122,28 +105,9 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
     connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
 
     connect(ui->aboutQt, &QPushButton::clicked, &QApplication::aboutQt);
-
-    loadPatronList();
 }
 
 AboutDialog::~AboutDialog()
 {
     delete ui;
 }
-
-void AboutDialog::loadPatronList()
-{
-    netJob = new NetJob("Patreon Patron List");
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl("https://files.multimc.org/patrons.txt"), &dataSink));
-    connect(netJob.get(), &NetJob::succeeded, this, &AboutDialog::patronListLoaded);
-    netJob->start(APPLICATION->network());
-}
-
-void AboutDialog::patronListLoaded()
-{
-    QString patronListStr(dataSink);
-    dataSink.clear();
-    QString html = getCreditsHtml(patronListStr.split("\n", QString::SkipEmptyParts));
-    ui->creditsText->setHtml(html);
-}
-

launcher/ui/dialogs/AboutDialog.h

@@ -31,17 +31,10 @@ public:
     explicit AboutDialog(QWidget *parent = 0);
     ~AboutDialog();
 
-public
-slots:
-    /// Starts loading a list of Patreon patrons.
-    void loadPatronList();
-    
-    /// Slot for when the patron list loads successfully.
-    void patronListLoaded();
-
 private:
     Ui::AboutDialog *ui;
 
     NetJob::Ptr netJob;
     QByteArray dataSink;
 };
+

launcher/ui/dialogs/AboutDialog.ui

@@ -251,20 +251,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="forkingTab">
-      <attribute name="title">
-       <string>Forking/Redistribution</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QTextEdit" name="redistributionText">
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
    <item>
@@ -307,7 +293,6 @@
   <tabstop>tabWidget</tabstop>
   <tabstop>creditsText</tabstop>
   <tabstop>licenseText</tabstop>
-  <tabstop>redistributionText</tabstop>
   <tabstop>aboutQt</tabstop>
   <tabstop>closeButton</tabstop>
  </tabstops>

launcher/ui/dialogs/UpdateDialog.cpp

@@ -34,7 +34,7 @@ UpdateDialog::~UpdateDialog()
 void UpdateDialog::loadChangelog()
 {
     auto channel = APPLICATION->settings()->get("UpdateChannel").toString();
-    dljob.reset(new NetJob("Changelog"));
+    dljob = new NetJob("Changelog", APPLICATION->network());
     QString url;
     if(channel == "stable")
     {
@@ -49,7 +49,7 @@ void UpdateDialog::loadChangelog()
     dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData));
     connect(dljob.get(), &NetJob::succeeded, this, &UpdateDialog::changelogLoaded);
     connect(dljob.get(), &NetJob::failed, this, &UpdateDialog::changelogFailed);
-    dljob->start(APPLICATION->network());
+    dljob->start();
 }
 
 QString reprocessMarkdown(QByteArray markdown)

launcher/ui/pages/global/LauncherPage.cpp

@@ -73,11 +73,6 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
     {
         ui->updateSettingsBox->setHidden(true);
     }
-    // Analytics
-    if(BuildConfig.ANALYTICS_ID.isEmpty())
-    {
-        ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->analyticsTab));
-    }
     connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
     connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
 
@@ -321,12 +316,6 @@ void LauncherPage::applySettings()
         s->set("InstSortMode", "Name");
         break;
     }
-
-    // Analytics
-    if(!BuildConfig.ANALYTICS_ID.isEmpty())
-    {
-        s->set("Analytics", ui->analyticsCheck->isChecked());
-    }
 }
 void LauncherPage::loadSettings()
 {
@@ -422,12 +411,6 @@ void LauncherPage::loadSettings()
     {
         ui->sortByNameBtn->setChecked(true);
     }
-
-    // Analytics
-    if(!BuildConfig.ANALYTICS_ID.isEmpty())
-    {
-        ui->analyticsCheck->setChecked(s->get("Analytics").toBool());
-    }
 }
 
 void LauncherPage::refreshFontPreview()

launcher/ui/pages/global/LauncherPage.ui

@@ -485,69 +485,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="analyticsTab">
-      <attribute name="title">
-       <string>Analytics</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_8">
-       <item>
-        <widget class="QGroupBox" name="consoleSettingsBox_2">
-         <property name="title">
-          <string>Analytics Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <item>
-           <widget class="QCheckBox" name="analyticsCheck">
-            <property name="text">
-             <string>Send anonymous usage statistics?</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;
-&lt;body&gt;
-&lt;p&gt;The launcher sends anonymous usage statistics on every start of the application.&lt;/p&gt;&lt;p&gt;The following data is collected:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Launcher version.&lt;/li&gt;
-&lt;li&gt;Operating system name, version and architecture.&lt;/li&gt;
-&lt;li&gt;CPU architecture (kernel architecture on linux).&lt;/li&gt;
-&lt;li&gt;Size of system memory.&lt;/li&gt;
-&lt;li&gt;Java version, architecture and memory settings.&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
   </layout>

launcher/ui/pages/instance/ScreenshotsPage.cpp

@@ -304,7 +304,7 @@ void ScreenshotsPage::on_actionUpload_triggered()
         return;
 
     QList<ScreenShot::Ptr> uploaded;
-    auto job = NetJob::Ptr(new NetJob("Screenshot Upload"));
+    auto job = NetJob::Ptr(new NetJob("Screenshot Upload", APPLICATION->network()));
     if(selection.size() < 2)
     {
         auto item = selection.at(0);
@@ -314,6 +314,7 @@ void ScreenshotsPage::on_actionUpload_triggered()
 
         m_uploadActive = true;
         ProgressDialog dialog(this);
+
         if(dialog.execWithTask(job.get()) != QDialog::Accepted)
         {
             CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"),
@@ -345,7 +346,7 @@ void ScreenshotsPage::on_actionUpload_triggered()
         job->addNetAction(ImgurUpload::make(screenshot));
     }
     SequentialTask task;
-    auto albumTask = NetJob::Ptr(new NetJob("Imgur Album Creation"));
+    auto albumTask = NetJob::Ptr(new NetJob("Imgur Album Creation", APPLICATION->network()));
     auto imgurAlbum = ImgurAlbumCreation::make(uploaded);
     albumTask->addNetAction(imgurAlbum);
     task.addTask(job);
@@ -354,8 +355,12 @@ void ScreenshotsPage::on_actionUpload_triggered()
     ProgressDialog prog(this);
     if (prog.execWithTask(&task) != QDialog::Accepted)
     {
-        CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"),
+        CustomMessageBox::selectable(
-                                     tr("Unknown error"), QMessageBox::Warning)->exec();
+            this,
+            tr("Failed to upload screenshots!"),
+            tr("Unknown error"),
+            QMessageBox::Warning
+        )->exec();
     }
     else
     {

launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp

@@ -86,11 +86,11 @@ void ListModel::request()
     modpacks.clear();
     endResetModel();
 
-    auto *netJob = new NetJob("Atl::Request");
+    auto *netJob = new NetJob("Atl::Request", APPLICATION->network());
     auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/json/packsnew.json");
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(url), &response));
     jobPtr = netJob;
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 
     QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::requestFinished);
     QObject::connect(netJob, &NetJob::failed, this, &ListModel::requestFailed);
@@ -183,7 +183,7 @@ void ListModel::requestLogo(QString file, QString url)
     }
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
-    NetJob *job = new NetJob(QString("ATLauncher Icon Download %1").arg(file));
+    NetJob *job = new NetJob(QString("ATLauncher Icon Download %1").arg(file), APPLICATION->network());
     job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
@@ -201,7 +201,7 @@ void ListModel::requestLogo(QString file, QString url)
         emit logoFailed(file);
     });
 
-    job->start(APPLICATION->network());
+    job->start();
 
     m_loadingLogos.append(file);
 }

launcher/ui/pages/modplatform/flame/FlameModel.cpp

@@ -100,7 +100,7 @@ void ListModel::requestLogo(QString logo, QString url)
     }
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
-    NetJob *job = new NetJob(QString("Flame Icon Download %1").arg(logo));
+    NetJob *job = new NetJob(QString("Flame Icon Download %1").arg(logo), APPLICATION->network());
     job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
@@ -118,7 +118,7 @@ void ListModel::requestLogo(QString logo, QString url)
         emit logoFailed(logo);
     });
 
-    job->start(APPLICATION->network());
+    job->start();
 
     m_loadingLogos.append(logo);
 }
@@ -158,7 +158,7 @@ void ListModel::fetchMore(const QModelIndex& parent)
 
 void ListModel::performPaginatedSearch()
 {
-    NetJob *netJob = new NetJob("Flame::Search");
+    NetJob *netJob = new NetJob("Flame::Search", APPLICATION->network());
     auto searchUrl = QString(
         "https://addons-ecs.forgesvc.net/api/v2/addon/search?"
         "categoryId=0&"
@@ -171,7 +171,7 @@ void ListModel::performPaginatedSearch()
     ).arg(nextSearchOffset).arg(currentSearchTerm).arg(currentSort);
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
     QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::searchRequestFinished);
     QObject::connect(netJob, &NetJob::failed, this, &ListModel::searchRequestFailed);
 }

launcher/ui/pages/modplatform/flame/FlamePage.cpp

@@ -109,7 +109,7 @@ void FlamePage::onSelectionChanged(QModelIndex first, QModelIndex second)
     if (current.versionsLoaded == false)
     {
         qDebug() << "Loading flame modpack versions";
-        NetJob *netJob = new NetJob(QString("Flame::PackVersions(%1)").arg(current.name));
+        NetJob *netJob = new NetJob(QString("Flame::PackVersions(%1)").arg(current.name), APPLICATION->network());
         std::shared_ptr<QByteArray> response = std::make_shared<QByteArray>();
         int addonId = current.addonId;
         netJob->addNetAction(Net::Download::makeByteArray(QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files").arg(addonId), response.get()));
@@ -140,7 +140,7 @@ void FlamePage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
             suggestCurrent();
         });
-        netJob->start(APPLICATION->network());
+        netJob->start();
     }
     else
     {

launcher/ui/pages/modplatform/ftb/FtbListModel.cpp

@@ -107,11 +107,11 @@ void ListModel::request()
     modpacks.clear();
     endResetModel();
 
-    auto *netJob = new NetJob("Ftb::Request");
+    auto *netJob = new NetJob("Ftb::Request", APPLICATION->network());
     auto url = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/all");
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(url), &response));
     jobPtr = netJob;
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 
     QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::requestFinished);
     QObject::connect(netJob, &NetJob::failed, this, &ListModel::requestFailed);
@@ -150,12 +150,11 @@ void ListModel::requestFailed(QString reason)
 
 void ListModel::requestPack()
 {
-    auto *netJob = new NetJob("Ftb::Search");
+    auto *netJob = new NetJob("Ftb::Search", APPLICATION->network());
-    auto searchUrl = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/%1")
+    auto searchUrl = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/%1").arg(currentPack);
-            .arg(currentPack);
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
 
     QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::packRequestFinished);
     QObject::connect(netJob, &NetJob::failed, this, &ListModel::packRequestFailed);
@@ -271,7 +270,7 @@ void ListModel::requestLogo(QString logo, QString url)
 
     bool stale = entry->isStale();
 
-    NetJob *job = new NetJob(QString("FTB Icon Download %1").arg(logo));
+    NetJob *job = new NetJob(QString("FTB Icon Download %1").arg(logo), APPLICATION->network());
     job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
@@ -288,7 +287,7 @@ void ListModel::requestLogo(QString logo, QString url)
     auto &newLogoEntry = m_logoMap[logo];
     newLogoEntry.downloadJob = job;
     newLogoEntry.fullpath = fullPath;
-    job->start(APPLICATION->network());
+    job->start();
 }
 
 }

launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp

@@ -216,7 +216,7 @@ void ListModel::requestLogo(QString file)
     }
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
-    NetJob *job = new NetJob(QString("FTB Icon Download for %1").arg(file));
+    NetJob *job = new NetJob(QString("FTB Icon Download for %1").arg(file), APPLICATION->network());
     job->addNetAction(Net::Download::makeCached(QUrl(QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
 
     auto fullPath = entry->getFullPath();
@@ -234,7 +234,7 @@ void ListModel::requestLogo(QString file)
         emit logoFailed(file);
     });
 
-    job->start(APPLICATION->network());
+    job->start();
 
     m_loadingLogos.append(file);
 }

launcher/ui/pages/modplatform/technic/TechnicModel.cpp

@@ -91,7 +91,7 @@ void Technic::ListModel::searchWithTerm(const QString& term)
 
 void Technic::ListModel::performSearch()
 {
-    NetJob *netJob = new NetJob("Technic::Search");
+    NetJob *netJob = new NetJob("Technic::Search", APPLICATION->network());
     QString searchUrl = "";
     if (currentSearchTerm.isEmpty()) {
         searchUrl = "https://api.technicpack.net/trending?build=multimc";
@@ -104,7 +104,7 @@ void Technic::ListModel::performSearch()
     }
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
-    jobPtr->start(APPLICATION->network());
+    jobPtr->start();
     QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::searchRequestFinished);
     QObject::connect(netJob, &NetJob::failed, this, &ListModel::searchRequestFailed);
 }
@@ -216,7 +216,7 @@ void Technic::ListModel::requestLogo(QString logo, QString url)
     }
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("TechnicPacks", QString("logos/%1").arg(logo));
-    NetJob *job = new NetJob(QString("Technic Icon Download %1").arg(logo));
+    NetJob *job = new NetJob(QString("Technic Icon Download %1").arg(logo), APPLICATION->network());
     job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
@@ -231,7 +231,7 @@ void Technic::ListModel::requestLogo(QString logo, QString url)
         logoFailed(logo);
     });
 
-    job->start(APPLICATION->network());
+    job->start();
 
     m_loadingLogos.append(logo);
 }

launcher/ui/pages/modplatform/technic/TechnicPage.cpp

@@ -110,8 +110,8 @@ void TechnicPage::suggestCurrent()
         metadataLoaded();
         return;
     }
-    
+
-    NetJob *netJob = new NetJob(QString("Technic::PackMeta(%1)").arg(current.name));
+    NetJob *netJob = new NetJob(QString("Technic::PackMeta(%1)").arg(current.name), APPLICATION->network());
     std::shared_ptr<QByteArray> response = std::make_shared<QByteArray>();
     QString slug = current.slug;
     netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.technicpack.net/modpack/%1?build=multimc").arg(slug), response.get()));
@@ -167,7 +167,7 @@ void TechnicPage::suggestCurrent()
         current.metadataLoaded = true;
         metadataLoaded();
     });
-    netJob->start(APPLICATION->network());
+    netJob->start();
 }
 
 // expects current.metadataLoaded to be true

launcher/ui/setupwizard/AnalyticsWizardPage.cpp

@@ -1,63 +0,0 @@
-#include "AnalyticsWizardPage.h"
-#include <Application.h>
-
-#include <QVBoxLayout>
-#include <QTextBrowser>
-#include <QCheckBox>
-
-#include <ganalytics.h>
-#include <BuildConfig.h>
-
-AnalyticsWizardPage::AnalyticsWizardPage(QWidget *parent)
-    : BaseWizardPage(parent)
-{
-    setObjectName(QStringLiteral("analyticsPage"));
-    verticalLayout_3 = new QVBoxLayout(this);
-    verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3"));
-    textBrowser = new QTextBrowser(this);
-    textBrowser->setObjectName(QStringLiteral("textBrowser"));
-    textBrowser->setAcceptRichText(false);
-    textBrowser->setOpenExternalLinks(true);
-    verticalLayout_3->addWidget(textBrowser);
-
-    checkBox = new QCheckBox(this);
-    checkBox->setObjectName(QStringLiteral("checkBox"));
-    checkBox->setChecked(true);
-    verticalLayout_3->addWidget(checkBox);
-    retranslate();
-}
-
-AnalyticsWizardPage::~AnalyticsWizardPage()
-{
-}
-
-bool AnalyticsWizardPage::validatePage()
-{
-    auto settings = APPLICATION->settings();
-    auto analytics = APPLICATION->analytics();
-    auto status = checkBox->isChecked();
-    settings->set("AnalyticsSeen", analytics->version());
-    settings->set("Analytics", status);
-    return true;
-}
-
-void AnalyticsWizardPage::retranslate()
-{
-    setTitle(tr("Analytics"));
-    setSubTitle(tr("We track some anonymous statistics about users."));
-    textBrowser->setHtml(tr(
-        "<html><body>"
-        "<p>The launcher sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.</p>"
-        "<p>The data is processed by Google Analytics, see their <a href=\"https://support.google.com/analytics/answer/6004245?hl=en\">article on the "
-        "matter</a>.</p>"
-        "<p>The following data is collected:</p>"
-        "<ul><li>A random unique ID of the installation.<br />It is stored in the application settings file.</li>"
-        "<li>Anonymized (partial) IP address.</li>"
-        "<li>Launcher version.</li>"
-        "<li>Operating system name, version and architecture.</li>"
-        "<li>CPU architecture (kernel architecture on linux).</li>"
-        "<li>Size of system memory.</li>"
-        "<li>Java version, architecture and memory settings.</li></ul>"
-        "<p>If we change the tracked information, you will see this page again.</p></body></html>"));
-    checkBox->setText(tr("Enable Analytics"));
-}

launcher/ui/setupwizard/AnalyticsWizardPage.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include "BaseWizardPage.h"
-
-class QVBoxLayout;
-class QTextBrowser;
-class QCheckBox;
-
-class AnalyticsWizardPage : public BaseWizardPage
-{
-    Q_OBJECT
-public:
-    explicit AnalyticsWizardPage(QWidget *parent = Q_NULLPTR);
-    virtual ~AnalyticsWizardPage();
-
-    bool validatePage() override;
-
-protected:
-    void retranslate() override;
-
-private:
-    QVBoxLayout *verticalLayout_3 = nullptr;
-    QTextBrowser *textBrowser = nullptr;
-    QCheckBox *checkBox = nullptr;
-};

launcher/ui/setupwizard/SetupWizard.cpp

@@ -2,12 +2,10 @@
 
 #include "LanguageWizardPage.h"
 #include "JavaWizardPage.h"
-#include "AnalyticsWizardPage.h"
 
 #include "translations/TranslationsModel.h"
 #include <Application.h>
 #include <FileSystem.h>
-#include <ganalytics.h>
 
 #include <QAbstractButton>
 #include <BuildConfig.h>

launcher/ui/widgets/JavaSettingsWidget.cpp

@@ -319,7 +319,7 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
     }
     CustomMessageBox::selectable(
         this,
-        failed ? QObject::tr("Java test success") : QObject::tr("Java test failure"),
+        failed ? QObject::tr("Java test failure") : QObject::tr("Java test success"),
         text,
         failed ? QMessageBox::Critical : QMessageBox::Information
     )->show();

launcher/updater/DownloadTask.cpp

@@ -47,7 +47,7 @@ void DownloadTask::loadVersionInfo()
 {
     setStatus(tr("Loading version information..."));
 
-    NetJob *netJob = new NetJob("Version Info");
+    NetJob *netJob = new NetJob("Version Info", m_network);
 
     // Find the index URL.
     QUrl newIndexUrl = QUrl(m_status.newRepoUrl).resolved(QString::number(m_status.newVersionId) + ".json");
@@ -67,7 +67,7 @@ void DownloadTask::loadVersionInfo()
     connect(netJob, &NetJob::succeeded, this, &DownloadTask::processDownloadedVersionInfo);
     connect(netJob, &NetJob::failed, this, &DownloadTask::vinfoDownloadFailed);
     m_vinfoNetJob.reset(netJob);
-    netJob->start(m_network);
+    netJob->start();
 }
 
 void DownloadTask::vinfoDownloadFailed()
@@ -121,7 +121,7 @@ void DownloadTask::processDownloadedVersionInfo()
     setStatus(tr("Processing file lists - figuring out how to install the update..."));
 
     // make a new netjob for the actual update files
-    NetJob::Ptr netJob (new NetJob("Update Files"));
+    NetJob::Ptr netJob = new NetJob("Update Files", m_network);
 
     // fill netJob and operationList
     if (!processFileLists(m_currentVersionFileList, m_newVersionFileList, m_status.rootPath, m_updateFilesDir.path(), netJob, m_operations))
@@ -145,7 +145,7 @@ void DownloadTask::processDownloadedVersionInfo()
     }
     qDebug() << "Begin downloading update files to" << m_updateFilesDir.path();
     m_filesNetJob = netJob;
-    m_filesNetJob->start(m_network);
+    m_filesNetJob->start();
 }
 
 void DownloadTask::fileDownloadFinished()

launcher/updater/DownloadTask_test.cpp

@@ -179,7 +179,8 @@ slots:
 
         OperationList operations;
 
-        processFileLists(currentVersion, newVersion, QDir::currentPath(), tempFolder, new NetJob("Dummy"), operations);
+        shared_qobject_ptr<QNetworkAccessManager> network = new QNetworkAccessManager();
+        processFileLists(currentVersion, newVersion, QDir::currentPath(), tempFolder, new NetJob("Dummy", network), operations);
         qDebug() << (operations == expectedOperations);
         qDebug() << operations;
         qDebug() << expectedOperations;

launcher/updater/UpdateChecker.cpp

@@ -104,11 +104,11 @@ void UpdateChecker::checkForUpdate(QString updateChannel, bool notifyNoUpdate)
 
     QUrl indexUrl = QUrl(m_newRepoUrl).resolved(QUrl("index.json"));
 
-    indexJob = new NetJob("GoUpdate Repository Index");
+    indexJob = new NetJob("GoUpdate Repository Index", m_network);
     indexJob->addNetAction(Net::Download::makeByteArray(indexUrl, &indexData));
     connect(indexJob.get(), &NetJob::succeeded, [this, notifyNoUpdate](){ updateCheckFinished(notifyNoUpdate); });
     connect(indexJob.get(), &NetJob::failed, this, &UpdateChecker::updateCheckFailed);
-    indexJob->start(m_network);
+    indexJob->start();
 }
 
 void UpdateChecker::updateCheckFinished(bool notifyNoUpdate)
@@ -191,11 +191,11 @@ void UpdateChecker::updateChanList(bool notifyNoUpdate)
     }
 
     m_chanListLoading = true;
-    chanListJob = new NetJob("Update System Channel List");
+    chanListJob = new NetJob("Update System Channel List", m_network);
     chanListJob->addNetAction(Net::Download::makeByteArray(QUrl(m_channelUrl), &chanlistData));
     connect(chanListJob.get(), &NetJob::succeeded, [this, notifyNoUpdate]() { chanListDownloadFinished(notifyNoUpdate); });
     connect(chanListJob.get(), &NetJob::failed, this, &UpdateChecker::chanListDownloadFailed);
-    chanListJob->start(m_network);
+    chanListJob->start();
 }
 
 void UpdateChecker::chanListDownloadFinished(bool notifyNoUpdate)

libraries/README.md

@@ -9,13 +9,6 @@ This library has served as a base for some (much more full-featured and advanced
 
 Copyright belongs to Petr Mrázek, unless explicitly stated otherwise in the source files. Available under the Apache 2.0 license.
 
-## ganalytics
-A Google Analytics library for Qt.
-
-BSD licensed, derived from [qt-google-analytics](https://github.com/HSAnet/qt-google-analytics).
-
-Modifications include better handling of IP anonymization (can be enabled) and general improvements of the API (application handles persistence and ID generation instead of the library).
-
 ## hoedown
 Hoedown is a revived fork of Sundown, the Markdown parser based on the original code of the Upskirt library by Natacha Porté.
 

libraries/ganalytics/CMakeLists.txt

@@ -1,17 +0,0 @@
-project(ganalytics)
-
-find_package(Qt5Core)
-find_package(Qt5Gui)
-find_package(Qt5Network)
-
-set(ganalytics_SOURCES
-src/ganalytics.cpp
-src/ganalytics_worker.cpp
-src/ganalytics_worker.h
-include/ganalytics.h
-)
-
-add_library(ganalytics STATIC ${ganalytics_SOURCES})
-target_link_libraries(ganalytics Qt5::Core Qt5::Gui Qt5::Network)
-target_include_directories(ganalytics PUBLIC include)
-target_link_libraries(ganalytics systeminfo)

libraries/ganalytics/LICENSE.txt

@@ -1,24 +0,0 @@
-Copyright (c) 2014-2015, University of Applied Sciences Augsburg
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the University of Applied Sciences Augsburg nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
-OODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
-UT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

libraries/ganalytics/README.md

@@ -1,34 +0,0 @@
-qt-google-analytics
-================
-
-Qt5 classes for providing google analytics usage in a Qt/QML application.
-
-## Building
-Include ```qt-google-analytics.pri``` in your .pro file.
-
-## Using
-Please make sure you have set your application information using ```QApplication::setApplicationName``` and ```QApplication::setApplicationVersion```.
-
-### In C++:
-```
-GAnalytics tracker("UA-my-id");
-tracker.sendScreenView("Main Screen");
-```
-
-### In QtQuick:
-Register the class on the C++ side using ```qmlRegisterType<GAnalytics>("analytics", 0, 1, "Tracker");```
-```
-Tracker {
-  id: tracker
-  trackingID: "UA-my-id"
-}
-
-[...]
-tracker.sendScreenView("Main Screen")
-```
-
-There is also an example application in the examples folder.
-
-## License
-Copyright (c) 2014-2016, University of Applied Sciences Augsburg.
-All rights reserved. Distributed under the terms and conditions of the BSD License. See separate LICENSE.txt.

libraries/ganalytics/include/ganalytics.h

@@ -1,67 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QVariantMap>
-
-class QNetworkAccessManager;
-class GAnalyticsWorker;
-
-class GAnalytics : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(LogLevel)
-
-public:
-    explicit GAnalytics(const QString &trackingID, const QString &clientID, const int version, QObject *parent = 0);
-    ~GAnalytics();
-
-public:
-    enum LogLevel
-    {
-        Debug,
-        Info,
-        Error
-    };
-
-    int version();
-
-    void setLogLevel(LogLevel logLevel);
-    LogLevel logLevel() const;
-
-    // Getter and Setters
-    void setViewportSize(const QString &viewportSize);
-    QString viewportSize() const;
-
-    void setLanguage(const QString &language);
-    QString language() const;
-
-    void setAnonymizeIPs(bool anonymize);
-    bool anonymizeIPs();
-
-    void setSendInterval(int milliseconds);
-    int sendInterval() const;
-
-    void enable(bool state = true);
-    bool isEnabled();
-
-    /// Get or set the network access manager. If none is set, the class creates its own on the first request
-    void setNetworkAccessManager(QNetworkAccessManager *networkAccessManager);
-    QNetworkAccessManager *networkAccessManager() const;
-
-public slots:
-    void sendScreenView(const QString &screenName, const QVariantMap &customValues = QVariantMap());
-    void sendEvent(const QString &category, const QString &action, const QString &label = QString(), const QVariant &value = QVariant(),
-                   const QVariantMap &customValues = QVariantMap());
-    void sendException(const QString &exceptionDescription, bool exceptionFatal = true, const QVariantMap &customValues = QVariantMap());
-    void startSession();
-    void endSession();
-
-private:
-    GAnalyticsWorker *d;
-
-    friend QDataStream &operator<<(QDataStream &outStream, const GAnalytics &analytics);
-    friend QDataStream &operator>>(QDataStream &inStream, GAnalytics &analytics);
-};
-
-QDataStream &operator<<(QDataStream &outStream, const GAnalytics &analytics);
-QDataStream &operator>>(QDataStream &inStream, GAnalytics &analytics);

libraries/ganalytics/src/ganalytics.cpp

@@ -1,237 +0,0 @@
-#include "ganalytics.h"
-#include "ganalytics_worker.h"
-#include "sys.h"
-
-#include <QDataStream>
-#include <QDebug>
-#include <QLocale>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QQueue>
-#include <QSettings>
-#include <QTimer>
-#include <QUrlQuery>
-#include <QUuid>
-
-GAnalytics::GAnalytics(const QString &trackingID, const QString &clientID, const int version, QObject *parent) : QObject(parent)
-{
-    d = new GAnalyticsWorker(this);
-    d->m_trackingID = trackingID;
-    d->m_clientID = clientID;
-    d->m_version = version;
-}
-
-/**
- * Destructor of class GAnalytics.
- */
-GAnalytics::~GAnalytics()
-{
-    delete d;
-}
-
-void GAnalytics::setLogLevel(GAnalytics::LogLevel logLevel)
-{
-    d->m_logLevel = logLevel;
-}
-
-GAnalytics::LogLevel GAnalytics::logLevel() const
-{
-    return d->m_logLevel;
-}
-
-// SETTER and GETTER
-void GAnalytics::setViewportSize(const QString &viewportSize)
-{
-    d->m_viewportSize = viewportSize;
-}
-
-QString GAnalytics::viewportSize() const
-{
-    return d->m_viewportSize;
-}
-
-void GAnalytics::setLanguage(const QString &language)
-{
-    d->m_language = language;
-}
-
-QString GAnalytics::language() const
-{
-    return d->m_language;
-}
-
-void GAnalytics::setAnonymizeIPs(bool anonymize)
-{
-    d->m_anonymizeIPs = anonymize;
-}
-
-bool GAnalytics::anonymizeIPs()
-{
-    return d->m_anonymizeIPs;
-}
-
-void GAnalytics::setSendInterval(int milliseconds)
-{
-    d->m_timer.setInterval(milliseconds);
-}
-
-int GAnalytics::sendInterval() const
-{
-    return (d->m_timer.interval());
-}
-
-bool GAnalytics::isEnabled()
-{
-    return d->m_isEnabled;
-}
-
-void GAnalytics::enable(bool state)
-{
-    d->enable(state);
-}
-
-int GAnalytics::version()
-{
-    return d->m_version;
-}
-
-void GAnalytics::setNetworkAccessManager(QNetworkAccessManager *networkAccessManager)
-{
-    if (d->networkManager != networkAccessManager)
-    {
-        // Delete the old network manager if it was our child
-        if (d->networkManager && d->networkManager->parent() == this)
-        {
-            d->networkManager->deleteLater();
-        }
-
-        d->networkManager = networkAccessManager;
-    }
-}
-
-QNetworkAccessManager *GAnalytics::networkAccessManager() const
-{
-    return d->networkManager;
-}
-
-static void appendCustomValues(QUrlQuery &query, const QVariantMap &customValues)
-{
-    for (QVariantMap::const_iterator iter = customValues.begin(); iter != customValues.end(); ++iter)
-    {
-        query.addQueryItem(iter.key(), iter.value().toString());
-    }
-}
-
-/**
- * Sent screen view is called when the user changed the applications view.
- * These action of the user should be noticed and reported. Therefore
- * a QUrlQuery is build in this method. It holts all the parameter for
- * a http POST. The UrlQuery will be stored in a message Queue.
- */
-void GAnalytics::sendScreenView(const QString &screenName, const QVariantMap &customValues)
-{
-    d->logMessage(Info, QString("ScreenView: %1").arg(screenName));
-
-    QUrlQuery query = d->buildStandardPostQuery("screenview");
-    query.addQueryItem("cd", screenName);
-    query.addQueryItem("an", d->m_appName);
-    query.addQueryItem("av", d->m_appVersion);
-    appendCustomValues(query, customValues);
-
-    d->enqueQueryWithCurrentTime(query);
-}
-
-/**
- * This method is called whenever a button was pressed in the application.
- * A query for a POST message will be created to report this event. The
- * created query will be stored in a message queue.
- */
-void GAnalytics::sendEvent(const QString &category, const QString &action, const QString &label, const QVariant &value, const QVariantMap &customValues)
-{
-    QUrlQuery query = d->buildStandardPostQuery("event");
-    query.addQueryItem("an", d->m_appName);
-    query.addQueryItem("av", d->m_appVersion);
-    query.addQueryItem("ec", category);
-    query.addQueryItem("ea", action);
-    if (!label.isEmpty())
-        query.addQueryItem("el", label);
-    if (value.isValid())
-        query.addQueryItem("ev", value.toString());
-
-    appendCustomValues(query, customValues);
-
-    d->enqueQueryWithCurrentTime(query);
-}
-
-/**
- * Method is called after an exception was raised. It builds a
- * query for a POST message. These query will be stored in a
- * message queue.
- */
-void GAnalytics::sendException(const QString &exceptionDescription, bool exceptionFatal, const QVariantMap &customValues)
-{
-    QUrlQuery query = d->buildStandardPostQuery("exception");
-    query.addQueryItem("an", d->m_appName);
-    query.addQueryItem("av", d->m_appVersion);
-
-    query.addQueryItem("exd", exceptionDescription);
-
-    if (exceptionFatal)
-    {
-        query.addQueryItem("exf", "1");
-    }
-    else
-    {
-        query.addQueryItem("exf", "0");
-    }
-    appendCustomValues(query, customValues);
-
-    d->enqueQueryWithCurrentTime(query);
-}
-
-/**
- * Session starts. This event will be sent by a POST message.
- * Query is setup in this method and stored in the message
- * queue.
- */
-void GAnalytics::startSession()
-{
-    QVariantMap customValues;
-    customValues.insert("sc", "start");
-    sendEvent("Session", "Start", QString(), QVariant(), customValues);
-}
-
-/**
- * Session ends. This event will be sent by a POST message.
- * Query is setup in this method and stored in the message
- * queue.
- */
-void GAnalytics::endSession()
-{
-    QVariantMap customValues;
-    customValues.insert("sc", "end");
-    sendEvent("Session", "End", QString(), QVariant(), customValues);
-}
-
-/**
- * Qut stream to persist class GAnalytics.
- */
-QDataStream &operator<<(QDataStream &outStream, const GAnalytics &analytics)
-{
-    outStream << analytics.d->persistMessageQueue();
-
-    return outStream;
-}
-
-/**
- * In stream to read GAnalytics from file.
- */
-QDataStream &operator>>(QDataStream &inStream, GAnalytics &analytics)
-{
-    QList<QString> dataList;
-    inStream >> dataList;
-    analytics.d->readMessagesFromFile(dataList);
-
-    return inStream;
-}

libraries/ganalytics/src/ganalytics_worker.cpp

@@ -1,254 +0,0 @@
-#include "ganalytics.h"
-#include "ganalytics_worker.h"
-#include "sys.h"
-
-#include <QCoreApplication>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-
-#include <QGuiApplication>
-#include <QScreen>
-
-const QLatin1String GAnalyticsWorker::dateTimeFormat("yyyy,MM,dd-hh:mm::ss:zzz");
-
-GAnalyticsWorker::GAnalyticsWorker(GAnalytics *parent)
-    : QObject(parent), q(parent), m_logLevel(GAnalytics::Error)
-{
-    m_appName = QCoreApplication::instance()->applicationName();
-    m_appVersion = QCoreApplication::instance()->applicationVersion();
-    m_request.setUrl(QUrl("https://www.google-analytics.com/collect"));
-    m_request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    m_request.setHeader(QNetworkRequest::UserAgentHeader, getUserAgent());
-
-    m_language = QLocale::system().name().toLower().replace("_", "-");
-    m_screenResolution = getScreenResolution();
-
-    m_timer.setInterval(m_timerInterval);
-    connect(&m_timer, &QTimer::timeout, this, &GAnalyticsWorker::postMessage);
-}
-
-void GAnalyticsWorker::enable(bool state)
-{
-    // state change to the same is not valid.
-    if(m_isEnabled == state)
-    {
-        return;
-    }
-
-    m_isEnabled = state;
-    if(m_isEnabled)
-    {
-        // enable -> start doing things :)
-        m_timer.start();
-    }
-    else
-    {
-        // disable -> stop the timer
-        m_timer.stop();
-    }
-}
-
-void GAnalyticsWorker::logMessage(GAnalytics::LogLevel level, const QString &message)
-{
-    if (m_logLevel > level)
-    {
-        return;
-    }
-
-    qDebug() << "[Analytics]" << message;
-}
-
-/**
- * Build the POST query. Adds all parameter to the query
- * which are used in every POST.
- * @param type      Type of POST message. The event which is to post.
- * @return query    Most used parameter in a query for a POST.
- */
-QUrlQuery GAnalyticsWorker::buildStandardPostQuery(const QString &type)
-{
-    QUrlQuery query;
-    query.addQueryItem("v", "1");
-    query.addQueryItem("tid", m_trackingID);
-    query.addQueryItem("cid", m_clientID);
-    if (!m_userID.isEmpty())
-    {
-        query.addQueryItem("uid", m_userID);
-    }
-    query.addQueryItem("t", type);
-    query.addQueryItem("ul", m_language);
-    query.addQueryItem("vp", m_viewportSize);
-    query.addQueryItem("sr", m_screenResolution);
-    if(m_anonymizeIPs)
-    {
-        query.addQueryItem("aip", "1");
-    }
-    return query;
-}
-
-/**
- * Get primary screen resolution.
- * @return      A QString like "800x600".
- */
-QString GAnalyticsWorker::getScreenResolution()
-{
-    QScreen *screen = QGuiApplication::primaryScreen();
-    QSize size = screen->size();
-
-    return QString("%1x%2").arg(size.width()).arg(size.height());
-}
-
-/**
- * Try to gain information about the system where this application
- * is running. It needs to get the name and version of the operating
- * system, the language and screen resolution.
- * All this information will be send in POST messages.
- * @return agent        A QString with all the information formatted for a POST message.
- */
-QString GAnalyticsWorker::getUserAgent()
-{
-    return QString("%1/%2").arg(m_appName).arg(m_appVersion);
-}
-
-/**
- * The message queue contains a list of QueryBuffer object.
- * QueryBuffer holds a QUrlQuery object and a QDateTime object.
- * These both object are freed from the buffer object and
- * inserted as QString objects in a QList.
- * @return dataList     The list with concartinated queue data.
- */
-QList<QString> GAnalyticsWorker::persistMessageQueue()
-{
-    QList<QString> dataList;
-    foreach (QueryBuffer buffer, m_messageQueue)
-    {
-        dataList << buffer.postQuery.toString();
-        dataList << buffer.time.toString(dateTimeFormat);
-    }
-    return dataList;
-}
-
-/**
- * Reads persistent messages from a file.
- * Gets all message data as a QList<QString>.
- * Two lines in the list build a QueryBuffer object.
- */
-void GAnalyticsWorker::readMessagesFromFile(const QList<QString> &dataList)
-{
-    QListIterator<QString> iter(dataList);
-    while (iter.hasNext())
-    {
-        QString queryString = iter.next();
-        QString dateString = iter.next();
-        QUrlQuery query;
-        query.setQuery(queryString);
-        QDateTime dateTime = QDateTime::fromString(dateString, dateTimeFormat);
-        QueryBuffer buffer;
-        buffer.postQuery = query;
-        buffer.time = dateTime;
-        m_messageQueue.enqueue(buffer);
-    }
-}
-
-/**
- * Takes a QUrlQuery object and wrapp it together with
- * a QTime object into a QueryBuffer struct. These struct
- * will be stored in the message queue.
- */
-void GAnalyticsWorker::enqueQueryWithCurrentTime(const QUrlQuery &query)
-{
-    QueryBuffer buffer;
-    buffer.postQuery = query;
-    buffer.time = QDateTime::currentDateTime();
-
-    m_messageQueue.enqueue(buffer);
-}
-
-/**
- * This function is called by a timer interval.
- * The function tries to send a messages from the queue.
- * If message was successfully send then this function
- * will be called back to send next message.
- * If message queue contains more than one message then
- * the connection will kept open.
- * The message POST is asyncroniously when the server
- * answered a signal will be emitted.
- */
-void GAnalyticsWorker::postMessage()
-{
-    if (m_messageQueue.isEmpty())
-    {
-        // queue empty -> try sending later
-        m_timer.start();
-        return;
-    }
-    else
-    {
-        // queue has messages -> stop timer and start sending
-        m_timer.stop();
-    }
-
-    QString connection = "close";
-    if (m_messageQueue.count() > 1)
-    {
-        connection = "keep-alive";
-    }
-
-    QueryBuffer buffer = m_messageQueue.head();
-    QDateTime sendTime = QDateTime::currentDateTime();
-    qint64 timeDiff = buffer.time.msecsTo(sendTime);
-
-    if (timeDiff > fourHours)
-    {
-        // too old.
-        m_messageQueue.dequeue();
-        emit postMessage();
-        return;
-    }
-
-    buffer.postQuery.addQueryItem("qt", QString::number(timeDiff));
-    m_request.setRawHeader("Connection", connection.toUtf8());
-    m_request.setHeader(QNetworkRequest::ContentLengthHeader, buffer.postQuery.toString().length());
-
-    logMessage(GAnalytics::Debug, "Query string = " + buffer.postQuery.toString());
-
-    // Create a new network access manager if we don't have one yet
-    if (networkManager == NULL)
-    {
-        networkManager = new QNetworkAccessManager(this);
-    }
-
-    QNetworkReply *reply = networkManager->post(m_request, buffer.postQuery.query(QUrl::EncodeUnicode).toUtf8());
-    connect(reply, SIGNAL(finished()), this, SLOT(postMessageFinished()));
-}
-
-/**
- * NetworkAccsessManager has finished to POST a message.
- * If POST message was successfully send then the message
- * query should be removed from queue.
- * SIGNAL "postMessage" will be emitted to send next message
- * if there is any.
- * If message couldn't be send then next try is when the
- * timer emits its signal.
- */
-void GAnalyticsWorker::postMessageFinished()
-{
-    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
-
-    int httpStausCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    if (httpStausCode < 200 || httpStausCode > 299)
-    {
-        logMessage(GAnalytics::Error, QString("Error posting message: %1").arg(reply->errorString()));
-
-        // An error ocurred. Try sending later.
-        m_timer.start();
-        return;
-    }
-    else
-    {
-        logMessage(GAnalytics::Debug, "Message sent");
-    }
-
-    m_messageQueue.dequeue();
-    postMessage();
-    reply->deleteLater();
-}

libraries/ganalytics/src/ganalytics_worker.h

@@ -1,65 +0,0 @@
-#pragma once
-
-#include <QUrlQuery>
-#include <QDateTime>
-#include <QTimer>
-#include <QNetworkRequest>
-#include <QQueue>
-
-struct QueryBuffer
-{
-    QUrlQuery postQuery;
-    QDateTime time;
-};
-
-class GAnalyticsWorker : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit GAnalyticsWorker(GAnalytics *parent = 0);
-
-    GAnalytics *q;
-
-    QNetworkAccessManager *networkManager = nullptr;
-
-    QQueue<QueryBuffer> m_messageQueue;
-    QTimer m_timer;
-    QNetworkRequest m_request;
-    GAnalytics::LogLevel m_logLevel;
-
-    QString m_trackingID;
-    QString m_clientID;
-    QString m_userID;
-    QString m_appName;
-    QString m_appVersion;
-    QString m_language;
-    QString m_screenResolution;
-    QString m_viewportSize;
-
-    bool m_anonymizeIPs = false;
-    bool m_isEnabled = false;
-    int m_timerInterval = 30000;
-    int m_version = 0;
-
-    const static int fourHours = 4 * 60 * 60 * 1000;
-    const static QLatin1String dateTimeFormat;
-
-public:
-    void logMessage(GAnalytics::LogLevel level, const QString &message);
-
-    QUrlQuery buildStandardPostQuery(const QString &type);
-    QString getScreenResolution();
-    QString getUserAgent();
-    QList<QString> persistMessageQueue();
-    void readMessagesFromFile(const QList<QString> &dataList);
-
-    void enqueQueryWithCurrentTime(const QUrlQuery &query);
-    void setIsSending(bool doSend);
-    void enable(bool state);
-
-public slots:
-    void postMessage();
-    void postMessageFinished();
-};
-

libraries/iconfix/internal/qiconloader.cpp

@@ -320,7 +320,7 @@ Description: Make it so that the QIcon loader honors /usr/share/pixmaps
              icon theme specification.
 Bug: https://bugreports.qt.nokia.com/browse/QTBUG-12874
  *********************************************************************/
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     /* Freedesktop standard says to look in /usr/share/pixmaps last */
     if (entries.isEmpty())
     {

libraries/katabasis/CMakeLists.txt

@@ -5,14 +5,6 @@ if(IS_IN_SOURCE_BUILD)
     message(FATAL_ERROR "You are building Katabasis in-source. Please separate the build tree from the source tree.")
 endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR
-        CMAKE_HOST_SYSTEM_VERSION MATCHES ".*WSL.*"
-    )
-        message(FATAL_ERROR "Building Katabasis is not supported in Linux-on-Windows distributions. Use a real Linux machine, not a fraudulent one.")
-    endif()
-endif()
-
 project(Katabasis)
 enable_testing()
 

libraries/systeminfo/src/sys_unix.cpp

@@ -47,6 +47,7 @@ Sys::KernelInfo Sys::getKernelInfo()
 uint64_t Sys::getSystemRam()
 {
     std::string token;
+#ifdef Q_OS_LINUX
     std::ifstream file("/proc/meminfo");
     while(file >> token)
     {
@@ -65,6 +66,19 @@ uint64_t Sys::getSystemRam()
         // ignore rest of the line
         file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
     }
+#elif defined(Q_OS_FREEBSD)
+    char buff[512];
+    FILE *fp = popen("sysctl hw.physmem", "r");
+    if (fp != NULL)
+    {
+	while(fgets(buff, 512, fp) != NULL)
+	{
+	    std::string str(buff);
+	    uint64_t mem = std::stoull(str.substr(12, std::string::npos));
+	    return mem * 1024ull;
+	}
+    }
+#endif
     return 0; // nothing found
 }
 

packages/flatpak/BUILDING.md

@@ -1,28 +0,0 @@
-# Building the flatpak
-
-### 1. Install tools
-
-Install `flatpak` and `flatpak-builder` from your distribution repositories.
-
-### 2. Install SDK
-
-`flatpak install org.kde.Sdk org.kde.Platform`  
-Pick version `5.15`
-
-### 3. Get the yml flatpak file
-
-You can download it directly from github, or clone the repo.
-
-### 4. Build it
-
-```
-flatpak-builder --ccache --force-clean flatbuild packages/flatpak/org.polymc.PolyMC.yml
-```
-
-If you didn't clone the repo, the path might be different.
-
-### 5. Install the custom build
-
-```
-flatpak-builder --user --install --ccache --force-clean flatbuild packages/org.polymc.PolyMC.yml
-```

packages/flatpak/org.polymc.PolyMC.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PolyMC
-Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
-Type=Application
-Terminal=false
-Exec=polymc
-StartupNotify=true
-Icon=null
-Categories=Game;
-Keywords=game;minecraft;launcher;