diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 1a7bf9de0..932d0c8f9 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - - name: PolyMC Discord - url: https://example.com + - name: PolyMC Matrix Support Room + url: https://matrix.to/#/#support:polymc.org about: Please ask for support here before opening an issue. diff --git a/README.md b/README.md index 2e00fc925..dda80ac35 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. The Poly - [ ] Packaging for MacOS/Windows - [ ] Stop relying on MultiMC-Hosted metadata services - [ ] Remove references to MultiMC +- [ ] Change up packaging, remove the install script junk +- [ ] AppImage, Flatpak, .deb, ebuild, and AUR packages - [ ] Meson - [x] Long-term solution for the MSA client ID issue - [x] Figure out a way to switch to GPL. @@ -48,6 +50,17 @@ TODO ## Forking/Redistributing/Custom builds policy Do whatever you want, we don't care. Just follow the license. If you have any questions about this feel free to ask in an issue. +## Help & Support +Feel free to create an issue if you need help. However, you should always ask the Matrix room. Be sure to enable spaces first (Settings -> Labs -> Spaces), and then you may join the space: + + + +If this doesn't work for you, then you may simply join the support room: + + + +Discord will be made soon. + ## Copyright Copyright 2013-2021 MultiMC contributors Copyright 2021 PolyMC contributors diff --git a/launcher/package/rpm/MultiMC5.spec b/launcher/package/rpm/MultiMC5.spec index 20839f118..da93912b6 100644 --- a/launcher/package/rpm/MultiMC5.spec +++ b/launcher/package/rpm/MultiMC5.spec @@ -1,17 +1,17 @@ -Name: MultiMC5 +Name: PolyMC Version: 1.4 Release: 3%{?dist} -Summary: A local install wrapper for MultiMC +Summary: A local install wrapper for PolyMC License: ASL 2.0 -URL: https://multimc.org +URL: https://polymc.org BuildArch: x86_64 Requires: zenity qt5-qtbase wget xrandr -Provides: multimc MultiMC multimc5 +Provides: polymc PolyMC polymc5 %description -A local install wrapper for MultiMC +A local install wrapper for PolyMC %prep @@ -19,24 +19,24 @@ A local install wrapper for MultiMC %build %install -mkdir -p %{buildroot}/opt/multimc -install -m 0644 ../ubuntu/multimc/opt/multimc/icon.svg %{buildroot}/opt/multimc/icon.svg -install -m 0755 ../ubuntu/multimc/opt/multimc/run.sh %{buildroot}/opt/multimc/run.sh +mkdir -p %{buildroot}/opt/polymc +install -m 0644 ../ubuntu/polymc/opt/polymc/icon.svg %{buildroot}/opt/polymc/icon.svg +install -m 0755 ../ubuntu/polymc/opt/polymc/run.sh %{buildroot}/opt/polymc/run.sh mkdir -p %{buildroot}/%{_datadir}/applications -install -m 0644 ../ubuntu/multimc/usr/share/applications/multimc.desktop %{buildroot}/%{_datadir}/applications/multimc.desktop +install -m 0644 ../ubuntu/polymc/usr/share/applications/polymc.desktop %{buildroot}/%{_datadir}/applications/polymc.desktop mkdir -p %{buildroot}/%{_datadir}/metainfo -install -m 0644 ../ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml %{buildroot}/%{_datadir}/metainfo/multimc.metainfo.xml +install -m 0644 ../ubuntu/polymc/usr/share/metainfo/polymc.metainfo.xml %{buildroot}/%{_datadir}/metainfo/polymc.metainfo.xml mkdir -p %{buildroot}/%{_mandir}/man1 -install -m 0644 ../ubuntu/multimc/usr/share/man/man1/multimc.1 %{buildroot}/%{_mandir}/man1/multimc.1 +install -m 0644 ../ubuntu/polymc/usr/share/man/man1/polymc.1 %{buildroot}/%{_mandir}/man1/polymc.1 %files -%dir /opt/multimc -/opt/multimc/icon.svg -/opt/multimc/run.sh -%{_datadir}/applications/multimc.desktop -%{_datadir}/metainfo/multimc.metainfo.xml +%dir /opt/polymc +/opt/polymc/icon.svg +/opt/polymc/run.sh +%{_datadir}/applications/polymc.desktop +%{_datadir}/metainfo/polymc.metainfo.xml %dir /usr/share/man/man1 -%{_mandir}/man1/multimc.1.gz +%{_mandir}/man1/polymc.1.gz %changelog * Sun Oct 03 2021 imperatorstorm <30777770+ImperatorStorm@users.noreply.github.com> diff --git a/launcher/package/ubuntu/README.md b/launcher/package/ubuntu/README.md index ddc97ae64..93b72d9c9 100644 --- a/launcher/package/ubuntu/README.md +++ b/launcher/package/ubuntu/README.md @@ -1,14 +1,14 @@ # What is this? -A simple Ubuntu package for MultiMC that contains a script that downloads and installs real MultiMC on Ubuntu based systems. +A simple Ubuntu package for PolyMC that contains a script that downloads and installs real PolyMC on Ubuntu based systems. It contains a `.desktop` file, an icon, and a simple script that does the heavy lifting. This is also the source for the files in the [RPM package](../rpm). If you rename, create or delete files here, you'll likely also have to update the RPM spec file there. # How to build this? -You need dpkg utils. Rename the `multimc` folder to `multimc_1.6-1` and then run: +You need dpkg utils. Rename the `polymc` folder to `polymc_1.6-1` and then run: ``` -fakeroot dpkg-deb --build multimc_1.6-1 +fakeroot dpkg-deb --build polymc_1.6-1 ``` Replace the version with whatever is appropriate. diff --git a/launcher/package/ubuntu/multimc/DEBIAN/control b/launcher/package/ubuntu/polymc/DEBIAN/control similarity index 75% rename from launcher/package/ubuntu/multimc/DEBIAN/control rename to launcher/package/ubuntu/polymc/DEBIAN/control index bfa3f1f2b..500404581 100644 --- a/launcher/package/ubuntu/multimc/DEBIAN/control +++ b/launcher/package/ubuntu/polymc/DEBIAN/control @@ -1,4 +1,4 @@ -Package: multimc +Package: polymc Version: 1.6-2 Architecture: all Maintainer: Petr Mrázek @@ -7,6 +7,5 @@ Priority: optional Installed-Size: 75 Depends: zenity, desktop-file-utils, libqt5widgets5, libqt5gui5, libqt5network5, libqt5core5a, libqt5xml5, libqt5concurrent5, wget Recommends: openjdk-8-jre -Homepage: http://multimc.org -Description: A local install wrapper for MultiMC - +Homepage: http://polymc.org +Description: A local install wrapper for PolyMC diff --git a/launcher/package/ubuntu/multimc/DEBIAN/postrm b/launcher/package/ubuntu/polymc/DEBIAN/postrm similarity index 100% rename from launcher/package/ubuntu/multimc/DEBIAN/postrm rename to launcher/package/ubuntu/polymc/DEBIAN/postrm diff --git a/launcher/package/ubuntu/multimc/opt/multimc/icon.svg b/launcher/package/ubuntu/polymc/opt/polymc/icon.svg similarity index 100% rename from launcher/package/ubuntu/multimc/opt/multimc/icon.svg rename to launcher/package/ubuntu/polymc/opt/polymc/icon.svg diff --git a/launcher/package/ubuntu/multimc/opt/multimc/run.sh b/launcher/package/ubuntu/polymc/opt/polymc/run.sh similarity index 92% rename from launcher/package/ubuntu/multimc/opt/multimc/run.sh rename to launcher/package/ubuntu/polymc/opt/polymc/run.sh index 12a9b45c5..b59bd2bca 100755 --- a/launcher/package/ubuntu/multimc/opt/multimc/run.sh +++ b/launcher/package/ubuntu/polymc/opt/polymc/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/multimc" +INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/polymc" if [ `getconf LONG_BIT` = "64" ] then diff --git a/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop b/launcher/package/ubuntu/polymc/usr/share/applications/multimc.desktop similarity index 100% rename from launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop rename to launcher/package/ubuntu/polymc/usr/share/applications/multimc.desktop diff --git a/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1 b/launcher/package/ubuntu/polymc/usr/share/man/man1/multimc.1 similarity index 100% rename from launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1 rename to launcher/package/ubuntu/polymc/usr/share/man/man1/multimc.1 diff --git a/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml b/launcher/package/ubuntu/polymc/usr/share/metainfo/multimc.metainfo.xml similarity index 89% rename from launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml rename to launcher/package/ubuntu/polymc/usr/share/metainfo/multimc.metainfo.xml index 3bccba47b..e3a67c597 100644 --- a/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml +++ b/launcher/package/ubuntu/polymc/usr/share/metainfo/multimc.metainfo.xml @@ -23,25 +23,25 @@ - https://multimc.org/images/screenshots/main.png + https://polymc.org/images/screenshots/main.png - https://multimc.org/images/screenshots/editmods.png + https://polymc.org/images/screenshots/editmods.png - https://multimc.org/images/screenshots/version.png + https://polymc.org/images/screenshots/version.png - https://multimc.org/images/screenshots/console.png + https://polymc.org/images/screenshots/console.png - https://multimc.org/images/screenshots/settings.png + https://polymc.org/images/screenshots/settings.png - https://multimc.org/ + https://polymc.org/ https://discord.com/invite/0k2zsXGNHs0fE4Wm https://github.com/MultiMC/Launcher/wiki/FAQ https://github.com/MultiMC/Launcher/issues