Merge branch 'develop' into develop

.gitignore

@@ -48,3 +48,5 @@ builddir
 packages/debian/polymc/usr/
 packages/debian/polymc.deb
 packages/debian/polymc/DEBIAN/control
+# Nix/NixOS
+result/

BUILD.md

@@ -45,6 +45,18 @@ cd packages/debian
 
 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.
 

CMakeLists.txt

@@ -13,14 +13,6 @@ 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)

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,10 +1,8 @@
 <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>
-
-PolyMC 5
-=========
-
+<br>
 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.
@@ -12,10 +10,13 @@ This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. The Poly
 ## Packages
 Several source build packages are available, along with experimental pre-built generic packages.
 
-- An [AUR package](https://aur.archlinux.org/packages/polymc-git/) is 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>
+<br>
+[![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.
-- A Flatpak is available in [Flathub](https://flathub.org/apps/details/org.polymc.PolyMC). You can install it from there or build it yourself using [this source](https://github.com/flathub/org.polymc.PolyMC).
+- The Flatpak can be built using [this source](https://github.com/flathub/org.polymc.PolyMC).
+- An RPM package is available, by going to the `packages/rpm` directory and running `./makerpm.sh`.
 - 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://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.
@@ -30,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.
 
@@ -51,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)

flake.lock

@@ -0,0 +1,77 @@
+{
+  "nodes": {
+    "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-utils": "flake-utils",
+        "libnbtplusplus": "libnbtplusplus",
+        "nixpkgs": "nixpkgs",
+        "quazip": "quazip"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -1,7 +1,50 @@
 {
-  description = "PolyMC";
-
-  outputs = inputs: {
-    overlay = import ./packages/nix/overlay.nix;
+  description = "PolyMC flake";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  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;
+          };
+        };
+
+        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/resources/multimc/scalable/launcher.svg

@@ -1,9 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -0.5 64 64" shape-rendering="crispEdges">
-<metadata>Made with Pixels to Svg https://codepen.io/shshaw/pen/XbxvNj</metadata>
-<path stroke="#f3e38d" d="M0 0h3M61 0h3M1 1h3M60 1h3M2 2h3M59 2h3M3 3h3M8 3h11M45 3h11M58 3h3M4 4h10M50 4h10M5 5h4M55 5h4M5 6h3M56 6h3M4 7h3M57 7h3M4 8h2M58 8h2M4 9h2M58 9h2M4 10h2M58 10h2M4 11h2M58 11h2M4 12h2M58 12h2M4 13h1M59 13h1M4 14h1M59 14h1M4 15h1M59 15h1M4 16h1M59 16h1M4 17h1M59 17h1M4 46h1M59 46h1M4 47h1M59 47h1M4 48h1M59 48h1M4 49h1M59 49h1M4 50h1M59 50h1M4 51h2M58 51h2M4 52h2M58 52h2M4 53h2M58 53h2M4 54h2M58 54h2M4 55h2M58 55h2M4 56h3M57 56h3M5 57h3M56 57h3M5 58h4M55 58h4M4 59h10M50 59h10M3 60h3M8 60h11M45 60h11M58 60h3M2 61h3M59 61h3M1 62h3M60 62h3M0 63h3M61 63h3" />
-<path stroke="#d8b041" d="M3 0h58M0 1h1M4 1h56M63 1h1M0 2h2M5 2h54M62 2h2M0 3h3M6 3h2M56 3h2M61 3h3M0 4h4M60 4h4M0 5h5M59 5h5M0 6h5M59 6h5M0 7h4M60 7h4M0 8h4M60 8h4M0 9h4M60 9h4M0 10h4M60 10h4M0 11h4M60 11h4M0 12h4M60 12h4M0 13h4M60 13h4M0 14h4M60 14h4M0 15h4M60 15h4M0 16h4M60 16h4M0 17h4M60 17h4M0 18h4M60 18h4M0 19h4M60 19h4M0 20h4M60 20h4M0 21h4M60 21h4M0 22h4M60 22h4M0 23h4M60 23h4M0 24h4M60 24h4M0 25h4M60 25h4M0 26h4M60 26h4M0 27h4M60 27h4M0 28h4M60 28h4M0 29h4M60 29h4M0 30h4M60 30h4M0 31h4M60 31h4M0 32h4M60 32h4M0 33h4M60 33h4M0 34h4M60 34h4M0 35h4M60 35h4M0 36h4M60 36h4M0 37h4M60 37h4M0 38h4M60 38h4M0 39h4M60 39h4M0 40h4M60 40h4M0 41h4M60 41h4M0 42h4M60 42h4M0 43h4M60 43h4M0 44h4M60 44h4M0 45h4M60 45h4M0 46h4M60 46h4M0 47h4M60 47h4M0 48h4M60 48h4M0 49h4M60 49h4M0 50h4M60 50h4M0 51h4M60 51h4M0 52h4M60 52h4M0 53h4M60 53h4M0 54h4M60 54h4M0 55h4M60 55h4M0 56h4M60 56h4M0 57h5M59 57h5M0 58h5M59 58h5M0 59h4M60 59h4M0 60h3M6 60h2M56 60h2M61 60h3M0 61h2M5 61h54M62 61h2M0 62h1M4 62h56M63 62h1M3 63h58" />
-<path stroke="#ecd246" d="M19 3h26M14 4h36M9 5h46M8 6h48M7 7h50M6 8h52M6 9h52M6 10h52M6 11h52M6 12h52M5 13h54M5 14h54M5 15h54M5 16h14M21 16h38M5 17h13M22 17h37M4 18h13M23 18h37M4 19h12M25 19h35M4 20h13M26 20h34M4 21h15M28 21h32M4 22h16M29 22h9M50 22h10M4 23h17M30 23h8M50 23h10M4 24h10M30 24h6M52 24h8M4 25h10M31 25h5M52 25h8M4 26h8M17 26h5M31 26h3M40 26h8M54 26h6M4 27h8M16 27h5M32 27h2M40 27h8M54 27h6M4 28h6M14 28h5M38 28h12M56 28h4M4 29h6M14 29h3M38 29h12M56 29h4M4 30h5M13 30h4M24 30h2M37 30h14M57 30h3M4 31h5M12 31h6M22 31h4M36 31h16M57 31h3M4 32h5M12 32h16M36 32h16M57 32h3M4 33h5M12 33h16M38 33h14M57 33h3M4 34h5M14 34h12M38 34h12M57 34h3M4 35h5M14 35h12M40 35h10M56 35h4M4 36h6M16 36h8M40 36h8M56 36h4M4 37h6M17 37h6M42 37h5M56 37h4M4 38h6M30 38h4M54 38h6M4 39h6M30 39h4M54 39h6M4 40h8M26 40h10M52 40h8M4 41h8M26 41h12M52 41h8M4 42h12M24 42h16M48 42h12M4 43h12M24 43h16M48 43h12M4 44h56M4 45h56M5 46h54M5 47h54M5 48h54M5 49h54M5 50h54M6 51h52M6 52h52M6 53h52M6 54h52M6 55h52M7 56h50M8 57h48M9 58h46M14 59h36M19 60h26" />
-<path stroke="#000000" d="M19 16h2M18 17h4M17 18h6M16 19h9M17 20h9M19 21h9M20 22h9M44 22h6M21 23h4M27 23h3M42 23h8M22 24h3M27 24h3M40 24h12M15 25h3M22 25h9M39 25h13M12 26h1M15 26h2M22 26h9M38 26h2M48 26h6M12 27h4M21 27h11M38 27h2M48 27h6M10 28h2M19 28h13M37 28h1M50 28h6M10 29h2M17 29h17M37 29h1M50 29h6M9 30h4M17 30h7M26 30h8M51 30h6M9 31h3M18 31h4M26 31h10M52 31h5M9 32h3M28 32h8M52 32h5M9 33h3M28 33h10M52 33h5M9 34h5M30 34h8M50 34h7M9 35h5M30 35h10M50 35h6M10 36h6M24 36h2M32 36h8M48 36h8M10 37h7M23 37h2M32 37h10M47 37h9M10 38h15M34 38h20M10 39h14M34 39h20M12 40h11M36 40h16M12 41h10M38 41h14M16 42h5M40 42h8M16 43h2M40 43h8" />
-<path stroke="#595959" d="M38 22h6M38 23h4M14 24h8M36 24h4M14 25h1M18 25h4M36 25h3M13 26h2M34 26h4M34 27h4M12 28h2M32 28h5M12 29h2M34 29h3M34 30h3M26 34h4M26 35h4M26 36h6M25 37h7M25 38h5M24 39h6M23 40h3M22 41h4M21 42h3M18 43h6" />
-<path stroke="#488737" d="M25 23h2M25 24h2" />
+<?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">
+ <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>

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()
 

packages/nix/overlay.nix

@@ -1,3 +0,0 @@
-self: super: rec {
-  polymc = super.libsForQt5.callPackage ./polymc {};
-}

packages/nix/polymc/0001-pick-latest-java-first.patch

@@ -1,48 +0,0 @@
-From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com>
-Date: Tue, 22 Jun 2021 21:50:11 +0300
-Subject: [PATCH] pick latest java first
-
----
- launcher/java/JavaInstallList.cpp | 4 ++--
- launcher/java/JavaUtils.cpp       | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
-index 0bded03c..40898e20 100644
---- a/launcher/java/JavaInstallList.cpp
-+++ b/launcher/java/JavaInstallList.cpp
-@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions)
- 
- bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
- {
--    auto rleft = std::dynamic_pointer_cast<JavaInstall>(left);
--    auto rright = std::dynamic_pointer_cast<JavaInstall>(right);
-+    auto rleft = std::dynamic_pointer_cast<JavaInstall>(right);
-+    auto rright = std::dynamic_pointer_cast<JavaInstall>(left);
-     return (*rleft) > (*rright);
- }
- 
-diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
-index 5f004a10..6d633631 100644
---- a/launcher/java/JavaUtils.cpp
-+++ b/launcher/java/JavaUtils.cpp
-@@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths()
-     qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
- 
-     QList<QString> javas;
--    javas.append(this->GetDefaultJava()->path);
-     auto scanJavaDir = [&](const QString & dirPath)
-     {
-         QDir dir(dirPath);
-@@ -379,6 +378,7 @@ QList<QString> JavaUtils::FindJavaPaths()
-     // general locations used by distro packaging
-     scanJavaDir("/usr/lib/jvm");
-     scanJavaDir("/usr/lib32/jvm");
-+    javas.append(this->GetDefaultJava()->path);
-     // javas stored in MultiMC's folder
-     scanJavaDir("java");
-     return javas;
--- 
-2.31.1
-

packages/nix/polymc/default.nix

@@ -1,49 +1,79 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, makeDesktopItem
+, substituteAll
+, fetchpatch
+, cmake
+, ninja
+, jdk8
+, jdk
+, zlib
+, file
+, makeWrapper
+, xorg
+, libpulseaudio
+, qtbase
+, libGL
+# submodules
+, self
+, submoduleNbt
+, submoduleQuazip
+}:
 
 let
-  libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
+  gameLibraryPath = with xorg; lib.makeLibraryPath [
+    libX11
+    libXext
+    libXcursor
+    libXrandr
+    libXxf86vm
+    libpulseaudio
+    libGL
+  ];
 in
+
 mkDerivation rec {
   pname = "polymc";
-  version = "1.0.4";
-  src = fetchFromGitHub {
-    owner = "PolyMC";
-    repo = "PolyMC";
-    rev = "${version}";
-    sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk=";
-    fetchSubmodules = true;
-  };
-  nativeBuildInputs = [ cmake file makeWrapper ];
+  version = "nightly";
+
+  src = lib.cleanSource self;
+
+  nativeBuildInputs = [ cmake ninja file makeWrapper ];
   buildInputs = [ qtbase jdk8 zlib ];
 
-  patches = [ ./0001-pick-latest-java-first.patch ];
-
-  postPatch = ''
-    # hardcode jdk paths
-    substituteInPlace launcher/java/JavaUtils.cpp \
-      --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \
-      --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
+  postUnpack = ''
+    rm -rf source/libraries/{libnbtplusplus,quazip}
+    mkdir source/libraries/{libnbtplusplus,quazip}
+    cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus
+    cp -a ${submoduleQuazip}/* source/libraries/quazip
+    chmod a+r+w source/libraries/{libnbtplusplus,quazip}/*
   '';
 
-  cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ];
+  cmakeFlags = [
+    "-GNinja"
+    "-DLauncher_LAYOUT=lin-system"
+  ];
+
+  desktopItem = makeDesktopItem {
+    name = "polymc";
+    exec = "polymc";
+    icon = "polymc";
+    desktopName = "PolyMC";
+    genericName = "Minecraft Launcher";
+    comment = "A custom launcher for Minecraft";
+    categories = "Game;";
+    extraEntries = ''
+      Keywords=game;Minecraft;
+    '';
+  };
 
   postInstall = ''
+    install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/multimc.svg
+    install -Dm755 ${desktopItem}/share/applications/polymc.desktop -t $out/share/applications
     # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
     wrapProgram $out/bin/polymc \
-      --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
-      --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
-
-    substituteInPlace $out/share/applications/org.polymc.PolyMC.desktop --replace 'Exec=' 'Exec=${placeholder "out"}/bin/polymc'
+      --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${gameLibraryPath} \
+      --prefix PATH : ${lib.makeBinPath [ xorg.xrandr jdk ]}
   '';
-
-  meta = with lib; {
-    homepage = "https://github.com/PolyMC/PolyMC";
-    description = "A free, open source launcher for Minecraft";
-    longDescription = ''
-      Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface.
-    '';
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ cidkid ];
-  };
 }

packages/rpm/makerpm.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+git submodule init
+git submodule update
+VERSION=$(git describe --tags | sed 's/-.*//')
+DIR=$(pwd)
+sed -i "s/Version:.*/Version: ${VERSION}/" polymc.spec
+sudo dnf builddep polymc.spec
+rpmbuild -ba polymc.spec

packages/rpm/polymc.spec

@@ -0,0 +1,55 @@
+%global _origdir %(pwd)
+
+Name: polymc
+Version: 
+Release: 1%{?dist}
+Summary: A custom launcher for Minecraft
+License: GPLv3
+URL: https://polymc.org/
+
+BuildArch: x86_64
+BuildRequires:  java-devel
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(Qt5)
+BuildRequires:  pkgconfig(zlib)
+
+Requires: java-headless
+Requires: pkgconfig(gl)
+Requires: pkgconfig(Qt5)
+Requires: pkgconfig(zlib)
+
+%description
+A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once
+
+%prep
+mkdir -p %{_builddir}/%{name}
+cp -r %{_origdir}/../../* %{_builddir}/%{name}
+
+%build
+cd %{_builddir}/%{name}
+cmake \
+  -DLauncher_LAYOUT=lin-system \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DLauncher_LIBRARY_DEST_DIR=%{_lib} \
+  .
+
+%cmake_build
+
+%install
+cd %{_builddir}/%{name}
+%cmake_install
+
+%files
+%{_bindir}/polymc
+%{_datadir}/applications/org.polymc.PolyMC.desktop
+%{_datadir}/metainfo/org.polymc.PolyMC.metainfo.xml
+%{_datadir}/polymc/jars/*
+%{_datadir}/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg
+%{_libdir}/libLauncher_nbt++.so
+%{_libdir}/libLauncher_quazip.so
+%{_libdir}/libLauncher_rainbow.so
+%{_libdir}/libLauncher_iconfix.so
+
+%changelog
+* Fri Jan 7 2022 getchoo <getchoo at tuta dot io> - 1.0.4
+- Initial polymc spec

program_info/org.polymc.PolyMC.Source.svg

@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   inkscape:export-ydpi="1620.0001"
+   inkscape:export-xdpi="1620.0001"
+   inkscape:export-filename="/home/z/Pictures/Polymchd.png"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="org.polymc.PolyMC.Source.svg"
+   id="svg5"
+   version="1.1"
+   viewBox="0 0 16.933333 16.933333"
+   height="64"
+   width="64"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     width="64mm"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-midpoints="true"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="7.2348066"
+     inkscape:cx="26.331042"
+     inkscape:cy="25.84727"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:snap-center="false"
+     inkscape:snap-page="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-text-baseline="true"
+     fit-margin-left="4"
+     fit-margin-right="4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid56" />
+    <sodipodi:guide
+       position="3.5610222,0.91765532"
+       orientation="1,0"
+       id="guide1024" />
+    <sodipodi:guide
+       position="13.37231,0.91765532"
+       orientation="1,0"
+       id="guide1028" />
+    <sodipodi:guide
+       position="8.4666659,3.9526473"
+       orientation="1,0"
+       id="guide1471" />
+    <sodipodi:guide
+       position="0.52916673,10.248746"
+       orientation="-0.58778528,0.80901698"
+       id="guide1629" />
+    <sodipodi:guide
+       position="8.4666659,16.015677"
+       orientation="0.58778537,0.80901691"
+       id="guide1892" />
+    <sodipodi:guide
+       position="8.4666659,4.4818143"
+       orientation="0.58778537,0.80901691"
+       id="guide2184"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8.4666659,4.4818143"
+       orientation="-0.58778528,0.80901698"
+       id="guide2186"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="0.52916788,10.248746"
+       orientation="0,-1"
+       id="guide2188" />
+    <sodipodi:guide
+       position="8.8308337,4.2172313"
+       orientation="-0.58778528,0.80901698"
+       id="guide2190"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8.4666655,3.9526476"
+       orientation="0.58778537,0.80901691"
+       id="guide2192"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="9.7726935,4.3858037"
+       orientation="-0.58778528,0.80901698"
+       id="guide2194"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="7.1606718,4.3857603"
+       orientation="0.58778537,0.80901691"
+       id="guide2196"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient206240">
+      <stop
+         style="stop-color:#88b858;stop-opacity:1"
+         offset="0"
+         id="stop206236" />
+      <stop
+         style="stop-color:#72b147;stop-opacity:1"
+         offset="0.50000006"
+         id="stop134589" />
+      <stop
+         style="stop-color:#5a9a30;stop-opacity:1"
+         offset="1"
+         id="stop206238" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect28303"
+       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
+       is_visible="true"
+       lpeversion="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect28299"
+       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
+       is_visible="true"
+       lpeversion="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect28255"
+       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
+       is_visible="true"
+       lpeversion="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect10730"
+       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
+       is_visible="true"
+       lpeversion="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient206240"
+       id="linearGradient84726"
+       x1="4.4979167"
+       y1="3.8011212"
+       x2="12.435414"
+       y2="9.5680542"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#765338;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.5610223,16.015678 c 0,0 0,-3.564159 4.905644,-3.564159 4.9069307,0 4.9056437,3.564159 4.9056437,3.564159 z"
+       id="path90018"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#b7835a;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 8.466666,12.451519 3.5610223,16.015678 0.52916674,6.6845872 Z"
+       id="path62382" />
+    <path
+       style="fill:#5b422d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 8.466666,12.451519 7.9375,-5.7669323 -3.031856,9.3310913 z"
+       id="path100033" />
+    <path
+       style="fill:#72b147;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8.8308339,12.716102 8.4666661,12.980686 8.1024982,12.716102 c 0,-0.264583 0.3641681,-0.264583 0.3641681,-0.264583 0,0 0.3641676,0 0.3641676,0.264583 z"
+       id="path986606"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#5a9a30;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.4666663,12.451519 c 0,0 -2e-7,-5.7669302 7.9374987,-5.7669302 L 16.179097,7.3772762 15.260564,8.5737969 14.342031,8.7119827 13.423498,9.9085036 12.504965,10.046689 11.586433,11.24321 10.6679,11.381396 9.7493669,12.577916 8.830834,12.716102 Z"
+       id="path986472"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:#88b858;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8.1024983,12.716102 7.1839654,12.577916 6.2654325,11.381396 5.3468996,11.24321 4.4283667,10.046689 3.5098338,9.9085034 2.5913009,8.7119828 1.6727681,8.5737971 0.75423516,7.3772764 0.52916674,6.6845872 c 7.93749966,10e-8 7.93749956,5.7669318 7.93749956,5.7669318 z"
+       id="path986404"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:url(#linearGradient84726);stroke:none;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 0.52916674,6.6845872 8.4666663,12.451519 16.404166,6.6845867 8.4666666,0.91765555 Z"
+       id="path5260" />
+    <path
+       style="fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0"
+       d="M 0.75423516,7.3772764 0.529167,6.684588 8.466666,12.451519 16.404165,6.6845883 16.179097,7.3772762 8.466666,12.980686 Z"
+       id="path970771" />
+  </g>
+</svg>

program_info/org.polymc.PolyMC.svg

@@ -1,9 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -0.5 64 64" shape-rendering="crispEdges">
-<metadata>Made with Pixels to Svg https://codepen.io/shshaw/pen/XbxvNj</metadata>
-<path stroke="#f3e38d" d="M0 0h3M61 0h3M1 1h3M60 1h3M2 2h3M59 2h3M3 3h3M8 3h11M45 3h11M58 3h3M4 4h10M50 4h10M5 5h4M55 5h4M5 6h3M56 6h3M4 7h3M57 7h3M4 8h2M58 8h2M4 9h2M58 9h2M4 10h2M58 10h2M4 11h2M58 11h2M4 12h2M58 12h2M4 13h1M59 13h1M4 14h1M59 14h1M4 15h1M59 15h1M4 16h1M59 16h1M4 17h1M59 17h1M4 46h1M59 46h1M4 47h1M59 47h1M4 48h1M59 48h1M4 49h1M59 49h1M4 50h1M59 50h1M4 51h2M58 51h2M4 52h2M58 52h2M4 53h2M58 53h2M4 54h2M58 54h2M4 55h2M58 55h2M4 56h3M57 56h3M5 57h3M56 57h3M5 58h4M55 58h4M4 59h10M50 59h10M3 60h3M8 60h11M45 60h11M58 60h3M2 61h3M59 61h3M1 62h3M60 62h3M0 63h3M61 63h3" />
-<path stroke="#d8b041" d="M3 0h58M0 1h1M4 1h56M63 1h1M0 2h2M5 2h54M62 2h2M0 3h3M6 3h2M56 3h2M61 3h3M0 4h4M60 4h4M0 5h5M59 5h5M0 6h5M59 6h5M0 7h4M60 7h4M0 8h4M60 8h4M0 9h4M60 9h4M0 10h4M60 10h4M0 11h4M60 11h4M0 12h4M60 12h4M0 13h4M60 13h4M0 14h4M60 14h4M0 15h4M60 15h4M0 16h4M60 16h4M0 17h4M60 17h4M0 18h4M60 18h4M0 19h4M60 19h4M0 20h4M60 20h4M0 21h4M60 21h4M0 22h4M60 22h4M0 23h4M60 23h4M0 24h4M60 24h4M0 25h4M60 25h4M0 26h4M60 26h4M0 27h4M60 27h4M0 28h4M60 28h4M0 29h4M60 29h4M0 30h4M60 30h4M0 31h4M60 31h4M0 32h4M60 32h4M0 33h4M60 33h4M0 34h4M60 34h4M0 35h4M60 35h4M0 36h4M60 36h4M0 37h4M60 37h4M0 38h4M60 38h4M0 39h4M60 39h4M0 40h4M60 40h4M0 41h4M60 41h4M0 42h4M60 42h4M0 43h4M60 43h4M0 44h4M60 44h4M0 45h4M60 45h4M0 46h4M60 46h4M0 47h4M60 47h4M0 48h4M60 48h4M0 49h4M60 49h4M0 50h4M60 50h4M0 51h4M60 51h4M0 52h4M60 52h4M0 53h4M60 53h4M0 54h4M60 54h4M0 55h4M60 55h4M0 56h4M60 56h4M0 57h5M59 57h5M0 58h5M59 58h5M0 59h4M60 59h4M0 60h3M6 60h2M56 60h2M61 60h3M0 61h2M5 61h54M62 61h2M0 62h1M4 62h56M63 62h1M3 63h58" />
-<path stroke="#ecd246" d="M19 3h26M14 4h36M9 5h46M8 6h48M7 7h50M6 8h52M6 9h52M6 10h52M6 11h52M6 12h52M5 13h54M5 14h54M5 15h54M5 16h14M21 16h38M5 17h13M22 17h37M4 18h13M23 18h37M4 19h12M25 19h35M4 20h13M26 20h34M4 21h15M28 21h32M4 22h16M29 22h9M50 22h10M4 23h17M30 23h8M50 23h10M4 24h10M30 24h6M52 24h8M4 25h10M31 25h5M52 25h8M4 26h8M17 26h5M31 26h3M40 26h8M54 26h6M4 27h8M16 27h5M32 27h2M40 27h8M54 27h6M4 28h6M14 28h5M38 28h12M56 28h4M4 29h6M14 29h3M38 29h12M56 29h4M4 30h5M13 30h4M24 30h2M37 30h14M57 30h3M4 31h5M12 31h6M22 31h4M36 31h16M57 31h3M4 32h5M12 32h16M36 32h16M57 32h3M4 33h5M12 33h16M38 33h14M57 33h3M4 34h5M14 34h12M38 34h12M57 34h3M4 35h5M14 35h12M40 35h10M56 35h4M4 36h6M16 36h8M40 36h8M56 36h4M4 37h6M17 37h6M42 37h5M56 37h4M4 38h6M30 38h4M54 38h6M4 39h6M30 39h4M54 39h6M4 40h8M26 40h10M52 40h8M4 41h8M26 41h12M52 41h8M4 42h12M24 42h16M48 42h12M4 43h12M24 43h16M48 43h12M4 44h56M4 45h56M5 46h54M5 47h54M5 48h54M5 49h54M5 50h54M6 51h52M6 52h52M6 53h52M6 54h52M6 55h52M7 56h50M8 57h48M9 58h46M14 59h36M19 60h26" />
-<path stroke="#000000" d="M19 16h2M18 17h4M17 18h6M16 19h9M17 20h9M19 21h9M20 22h9M44 22h6M21 23h4M27 23h3M42 23h8M22 24h3M27 24h3M40 24h12M15 25h3M22 25h9M39 25h13M12 26h1M15 26h2M22 26h9M38 26h2M48 26h6M12 27h4M21 27h11M38 27h2M48 27h6M10 28h2M19 28h13M37 28h1M50 28h6M10 29h2M17 29h17M37 29h1M50 29h6M9 30h4M17 30h7M26 30h8M51 30h6M9 31h3M18 31h4M26 31h10M52 31h5M9 32h3M28 32h8M52 32h5M9 33h3M28 33h10M52 33h5M9 34h5M30 34h8M50 34h7M9 35h5M30 35h10M50 35h6M10 36h6M24 36h2M32 36h8M48 36h8M10 37h7M23 37h2M32 37h10M47 37h9M10 38h15M34 38h20M10 39h14M34 39h20M12 40h11M36 40h16M12 41h10M38 41h14M16 42h5M40 42h8M16 43h2M40 43h8" />
-<path stroke="#595959" d="M38 22h6M38 23h4M14 24h8M36 24h4M14 25h1M18 25h4M36 25h3M13 26h2M34 26h4M34 27h4M12 28h2M32 28h5M12 29h2M34 29h3M34 30h3M26 34h4M26 35h4M26 36h6M25 37h7M25 38h5M24 39h6M23 40h3M22 41h4M21 42h3M18 43h6" />
-<path stroke="#488737" d="M25 23h2M25 24h2" />
+<?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">
+ <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>