diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2d86121403..156ed44cba 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -27,14 +27,14 @@ body: attributes: label: Description of bug description: What did you expect to happen, what happened, and why is it incorrect? - placeholder: The cat button should show a cat, but it showed a dog instead! + placeholder: The Sneed button should show Sneed, but it showed Chuck instead! validations: required: true - type: textarea attributes: label: Steps to reproduce description: A bulleted list, or an exported instance if relevant. - placeholder: "* Press the cat button" + placeholder: "* Press the Sneed button" validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml index fe626148c9..27950555f7 100644 --- a/.github/ISSUE_TEMPLATE/suggestion.yml +++ b/.github/ISSUE_TEMPLATE/suggestion.yml @@ -17,14 +17,14 @@ body: attributes: label: Suggestion description: What do you want SneedMC to do? - placeholder: I want the cat button to meow. + placeholder: I want the Sneed button to play "Well, well. Look at the city slicker pulling up in his fancy German car.". validations: required: true - type: input attributes: label: Benefit description: Why do you need SneedMC to do this? - placeholder: so that I can always hear a cat when I need to. + placeholder: so that I can always hear Sneed talking. validations: required: true - type: checkboxes diff --git a/CMakeLists.txt b/CMakeLists.txt index 98e59e8fa9..701c419eb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ set(Launcher_META_URL "https://meta.multimc.org/v1/" CACHE STRING "URL to fetch set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application") # MSA Client ID -set(Launcher_MSA_CLIENT_ID "0d742867-f14f-4ad9-9d0b-13692c38dc3a" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application") +set(Launcher_MSA_CLIENT_ID "499546d9-bbfe-4b9b-a086-eb3d75afb78f" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application") # Bug tracker URL set(Launcher_BUG_TRACKER_URL "https://github.com/Sneederix/SneedMC/issues" CACHE STRING "URL for the bug tracker.") diff --git a/LICENSE b/LICENSE index f288702d2f..65c942a158 100644 --- a/LICENSE +++ b/LICENSE @@ -1,26 +1,96 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +The Giant Sneed License (GSL) +Copyright (c) + + + ▄▄██▄██▄▄ + ▄█ █ █▄ + ▄█ █▄ + █ █ + █ █ + █ █ + █ █ + █ █ + █▄ █ ▄█ + █ ▄▄▄ █ + █ █ + █ █ + █ █ + █ █ + █ █ + █ █ + █ █ + █ █ + █ █ + █ █ + █ █ + █ █ + ▄████▄█ █▄████▄ + ▄█ █▄ + █ █ + █ █ + █ █ + █ █ + █ ▄▄█▄▄ █ + █ █ █ █ + █▄ ▄█ █▄ ▄█ + █▄▄▄▄▄█ █▄▄▄▄▄█ + + %%&&&&&&&%%%%%%&&&%% + %%&&&&&%%%&&&&&&&&&&&&&(%%%%%%%%&%%&&&%& + %&&%%%%%%%%%%%%%%%%%%%%%%%%(&&%%%%%%%%&%%%%%%%%%&& + %&%%%%%%%%%%%%%%%%%%%%%%%%%%%%&(%%%%%%%&%%%%%%%%%%%%&&& + &%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%&%%%%%&%%%%%%%%%%%%%%%%&% + %&%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%&%%&%%%%%%%%%%%%%%%%%%%& + %&%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%&%%%%%%%%%%%%%%%%%%%%%% + %&%%%%%&%%%(//////(((((%%%%&&%%%&%%%%%%%%%%%%%%%%%%%&% + &&%/****************************%&%%%%%%%%%%%%%%%&% + %******************************%,,,/&%%%%%%%%%%&%% + %&(*******************************%*,,,,*%%%%%%%%&% + %%***/***********/&/...,(%************(,,,,,/&&&&&% + %%&,..,,.********(%.,,,,,,,%**********&*,,,**%%&&&%% + %&*.,,,,,((*******&,.,,(&/%(**************%*//%%(**& + %&&%%%%%************(((/******************//******&% + %&*********************************************%&% + %&&*********************************************&% + %%&&&*/*****************************************(&% + %%&*******************************************%& + &%*********************************************&% + %&*******************/*//************************&% + %&&///**//((*%//(/******/***********************/&& + &******************************************/&& + %&(**********************************(%&#((//&&%% + (****************************(&%(///(#&&&@%%#%&& + &&**********************/%&#/((%&%(/#&#((((((((#%@ + &%%****************/#&#(/(%&#(((((&#((((((%&#(/((((&&# + %((#%((&//&%********(%&#((((&%(((((((#&((((((%&(((((((((((// + &((#%(/(((%%(((((((((((((#&#((((((((((&((((((%#((((((((#%%#(((# + @#/(%((%((((((((((&%((((#%&#(((((((((((((&#(((((%#(((((/%%(/(((/((( + ((##&((#%&((%/(((((((((((((((((((((((((((((((#%(((((%%/(((((&((((((((((/( + (%%/##&%#&##&(#%((((((((((((((((((((((((((((#%(((((&((((((&(/((((//////// + &((((#%#(#%((((((((((((((((((##%%%&&%#((%#&%&(((((&(((((&((((((((///(/(// + //(%#((((((((((((((((((((((((((((((((((((#&%&%#(#&&&&/&(((((((((////(//// + /((%((#%#########(((((((((((((((((((((((((((%((%%((((#%/((((((((((/((((((( + (&#((#&%((#%%%%%###((((&&#(#%%&%##((((((((((((((%#((&(/((((((((((((((((((( + %(((%((#&%(((((((((((%#%#(#%%&&#((((((#%%#(((((((&(&/((((((((((((((((((((( + ((((%((&(((((((((%###&(%(((((((((((((((#%&&%#(#(((%%/(((((((((((((((((((((( +(((%#(((%((((((((#%((%(&(((((((((((((((((((((&(((((%&#(%/******//((&&%(((((( Preamble - The GNU General Public License is a free, copyleft license for + The Giant Sneed 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 +the Giant Sneed 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 +software for all its users. We, the Giant Sneed Foundation, use the +Giant Sneed 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 +price. Our Giant Sneed 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 @@ -37,13 +107,13 @@ 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: + Developers that use the GSL 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 + For the developers' and authors' protection, the GSL 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 +authors' sake, the GSL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. @@ -53,16 +123,16 @@ 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 +have designed this version of the GSL 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. +of the GSL, 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 +make it effectively proprietary. To prevent this, the GSL assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and @@ -72,7 +142,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to the Giant Sneed License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +619,35 @@ 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. + 13. Use with the Affero Giant Sneed 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 +under version 3 of the Affero Giant Sneed 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, +but the special requirements of the Affero Giant Sneed 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 + The Giant Sneed Foundation may publish revised and/or new versions of +the Giant Sneed 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 +Program specifies that a certain numbered version of the Giant Sneed +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 +version or of any later version published by the Giant Sneed 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. +Giant Sneed License, you may choose any version ever published +by the Giant Sneed 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 +versions of the Giant Sneed License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,17 +705,17 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) 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 + it under the terms of the Giant Sneed License as published by + the Giant Sneed 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. + Giant Sneed License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the Giant Sneed License + along with this program. If not, see Also add information on how to contact you by electronic and paper mail. @@ -658,17 +728,17 @@ notice like this when it starts in an interactive mode: 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 +parts of the Giant Sneed 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 -. +For more information on this, and how to apply and follow the GSL, see + - The GNU General Public License does not permit incorporating your program + The Giant Sneed 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 -. +the library. If this is what you want to do, use the Lesser Giant Sneed +License instead of this License. But first, please read + diff --git a/README.md b/README.md index 019557d85e..08c552b101 100644 --- a/README.md +++ b/README.md @@ -85,13 +85,6 @@ sudo dnf copr enable polymc/polymc sudo dnf install polymc ``` -Alternatively, a COPR maintained by a PolyMC user (instead of Jenkins' automated builds) is available [here](https://copr.fedorainfracloud.org/coprs/sentry/polymc). - -```sh -sudo dnf copr enable sentry/polymc -sudo dnf install polymc -``` - ### Slackware [A SlackBuild](https://codeberg.org/glowiak/SlackBuilds/src/branch/master/repository/polymc.md) is available. You will need [qt5](http://slackbuilds.org/repository/14.2/libraries/qt5/) (on 15.0 installed by default), [a JDK](https://codeberg.org/glowiak/SlackBuilds/src/branch/master/repository/adoptium-jdk8.md), and if you're on 14.2, you need to compile newer CMake version manually. To build, type in extracted directory with all dependiences met: @@ -136,11 +129,11 @@ Builds are provided for Linux, AppImage on Linux, Windows, and macOS. Feel free to create an issue if you need help. However, you might find it easier to ask in the Discord server. -[![PolyMC Discord](https://img.shields.io/discord/923671181020766230?label=PolyMC%20Discord)](https://discord.gg/xq7fxrgtMP) +[![SneedMC Discord](https://img.shields.io/discord/923671181020766230?label=SneedMC%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: -[![PolyMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=PolyMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org) +[![SneedMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=SneedMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org) 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: @@ -151,11 +144,11 @@ If there are any issues with the space or you are using a client that does not s # Development -If you want to contribute to PolyMC you might find it useful to join our Discord Server or Matrix Space. +If you want to contribute to SneedMC you might find it useful to join our Discord Server or Matrix Space. ## Building -If you want to build PolyMC yourself, check [BUILD.md](BUILD.md) for build instructions. +If you want to build SneedMC yourself, check [BUILD.md](BUILD.md) for build instructions. ## Code formatting Just follow the existing formatting. @@ -170,7 +163,7 @@ In general, in order of importance: ## Translations -The translation effort for PolyMC is hosted on [Weblate](https://hosted.weblate.org/projects/polymc/polymc/) and information about translating PolyMC is available at https://github.com/PolyMC/Translations +The translation effort for SneedMC is hosted on [Weblate](https://hosted.weblate.org/projects/polymc/polymc/) and information about translating SneedMC is available at https://github.com/PolyMC/Translations ## Forking/Redistributing/Custom builds policy diff --git a/SNEED.md b/SNEED.md new file mode 100644 index 0000000000..0fcb00a37b --- /dev/null +++ b/SNEED.md @@ -0,0 +1 @@ +The sign is a subtle joke. The shop is called "Sneed's Feed & Seed", where feed and seed both end in the sound "-eed", thus rhyming with the name of the owner, Sneed. The sign says that the shop was "Formerly Chuck's", implying that the two words beginning with "F" and "S" would have ended with "-uck", rhyming with "Chuck". So, when Chuck owned the shop, it would have been called "Chuck's Feeduck and Seeduck". diff --git a/launcher/resources/OSX/scalable/launcher.svg b/launcher/resources/OSX/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/OSX/scalable/launcher.svg +++ b/launcher/resources/OSX/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/launcher/resources/flat/scalable/launcher.svg b/launcher/resources/flat/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/flat/scalable/launcher.svg +++ b/launcher/resources/flat/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/launcher/resources/iOS/scalable/launcher.svg b/launcher/resources/iOS/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/iOS/scalable/launcher.svg +++ b/launcher/resources/iOS/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/multimc/scalable/launcher.svg +++ b/launcher/resources/multimc/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/launcher/resources/pe_blue/scalable/launcher.svg b/launcher/resources/pe_blue/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/pe_blue/scalable/launcher.svg +++ b/launcher/resources/pe_blue/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/launcher/resources/pe_colored/scalable/launcher.svg b/launcher/resources/pe_colored/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/pe_colored/scalable/launcher.svg +++ b/launcher/resources/pe_colored/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/launcher/resources/pe_dark/scalable/launcher.svg b/launcher/resources/pe_dark/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/pe_dark/scalable/launcher.svg +++ b/launcher/resources/pe_dark/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/launcher/resources/pe_light/scalable/launcher.svg b/launcher/resources/pe_light/scalable/launcher.svg index 02aa494a76..63613cf7e5 100644 --- a/launcher/resources/pe_light/scalable/launcher.svg +++ b/launcher/resources/pe_light/scalable/launcher.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/program_info/org.sneederix.SneedMC.svg b/program_info/org.sneederix.SneedMC.svg index 02aa494a76..63613cf7e5 100644 --- a/program_info/org.sneederix.SneedMC.svg +++ b/program_info/org.sneederix.SneedMC.svg @@ -3,11 +3,11 @@ + id="defs59" /> + inkscape:current-layer="g61" /> + id="g61"> + id="image63" /> diff --git a/program_info/sneedmc.icns b/program_info/sneedmc.icns index 4e45d8d814..750ad6d0c9 100644 Binary files a/program_info/sneedmc.icns and b/program_info/sneedmc.icns differ diff --git a/program_info/sneedmc.ico b/program_info/sneedmc.ico index 1fce02e019..6c05816c32 100644 Binary files a/program_info/sneedmc.ico and b/program_info/sneedmc.ico differ