diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 247675fc..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -open_collective: polymc diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index ab3c8a29..24ae5b7a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -5,8 +5,6 @@ body: - type: markdown attributes: value: | - If you need help with running Minecraft, please visit us on our Discord before making a bug report. - Before submitting a bug report, please make sure you have read this *entire* form, and that: * You have read the [PolyMC wiki](https://polymc.org/wiki/) and it has not answered your question. * Your bug is not caused by Minecraft or any mods you have installed. @@ -25,15 +23,15 @@ body: - Other - type: textarea attributes: - label: Version of PolyMC - description: The version of PolyMC used in the bug report. - placeholder: PolyMC 1.4.1 + label: Version of PollyMC + description: The version of PollyMC used in the bug report. + placeholder: PollyMC 1.4.1 validations: required: true - type: textarea attributes: label: Version of Qt - description: The version of Qt used in the bug report. You can find it in Help -> About PolyMC -> About Qt. + description: The version of Qt used in the bug report. You can find it in Help -> About PollyMC -> About Qt. placeholder: Qt 6.3.0 validations: required: true @@ -41,14 +39,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 parrot button should show a parrot, but it showed a cat 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 parrot button" validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 932d0c8f..0086358d 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1 @@ blank_issues_enabled: true -contact_links: - - 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/.github/ISSUE_TEMPLATE/rfc.yml b/.github/ISSUE_TEMPLATE/rfc.yml index 0a40d01d..323aa9b3 100644 --- a/.github/ISSUE_TEMPLATE/rfc.yml +++ b/.github/ISSUE_TEMPLATE/rfc.yml @@ -6,38 +6,38 @@ body: - type: markdown attributes: value: | - ### Use this form to suggest a larger change for PolyMC. + ### Use this form to suggest a larger change for PollyMC. - type: textarea attributes: label: Goal description: Short description, 1-2 sentences. - placeholder: Remove the cat from the launcher. + placeholder: Remove the parrot from the launcher. validations: required: true - type: textarea attributes: label: Motivation description: | - Introduce the topic. If this is a not-well-known section of PolyMC, a detailed explanation of the background is recommended. + Introduce the topic. If this is a not-well-known section of PollyMC, a detailed explanation of the background is recommended. Some example points of discussion: - What specific problems are you facing right now that you're trying to address? - Are there any previous discussions? Link to them and summarize them (don't force your readers to read them though!). - Is there any precedent set by other software? If so, link to resources. - placeholder: I don't like cats. I think many users also don't like cats. + placeholder: I don't like parrots. I think many users also don't like parrots. validations: required: true - type: textarea attributes: label: Specification description: A concrete, thorough explanation of what is being planned. - placeholder: Remove the cat button and all references to the cat from the codebase. Including resource files. + placeholder: Remove the parrot button and all references to the parrot from the codebase. Including resource files. validations: required: true - type: textarea attributes: label: Drawbacks description: Carefully consider every possible objection and issue with your proposal. This section should be updated as feedback comes in from discussion. - placeholder: Some users might like cats. + placeholder: Some users might like parrots. validations: required: true - type: textarea @@ -47,14 +47,14 @@ body: Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed? Be careful here -- an RFC with a lot of remaining questions is likely to be stalled. If your RFC is mostly unresolved questions and not too much substance, it may not be ready. - placeholder: Do a lot of users care about the cat? + placeholder: Do a lot of users care about the parrot? validations: required: true - type: textarea attributes: label: Alternatives Considered description: A list of alternatives, that have been considered and offer equal or similar features to the proposed change. - placeholder: Maybe the cat could be replaced with an axolotl? + placeholder: Maybe the parrot could be replaced with a dog? validations: required: true - type: checkboxes diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml index 48f157b3..69d34ea9 100644 --- a/.github/ISSUE_TEMPLATE/suggestion.yml +++ b/.github/ISSUE_TEMPLATE/suggestion.yml @@ -5,26 +5,26 @@ body: - type: markdown attributes: value: | - ### Use this form to suggest a feature for PolyMC. + ### Use this form to suggest a feature for PollyMC. - type: input attributes: label: Role - description: In what way do you use PolyMC that needs this feature? + description: In what way do you use PollyMC that needs this feature? placeholder: I play modded Minecraft. validations: required: true - type: input attributes: label: Suggestion - description: What do you want PolyMC to do? - placeholder: I want the cat button to meow. + description: What do you want PollyMC to do? + placeholder: I want the parrot button to squawk. validations: required: true - type: input attributes: label: Benefit - description: Why do you need PolyMC to do this? - placeholder: so that I can always hear a cat when I need to. + description: Why do you need PollyMC to do this? + placeholder: so that I can always hear a parrot when I need to. validations: required: true - type: checkboxes diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99d9cd07..3feb345c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: qt_host: linux qt_version: '6.2.4' qt_modules: 'qt5compat qtimageformats' - qt_path: /home/runner/work/PolyMC/Qt + qt_path: /home/runner/work/PollyMC/Qt - os: windows-2022 name: "Windows-Legacy" @@ -45,7 +45,7 @@ jobs: qt_host: mac qt_version: '6.3.0' qt_modules: 'qt5compat qtimageformats' - qt_path: /Users/runner/work/PolyMC/Qt + qt_path: /Users/runner/work/PollyMC/Qt runs-on: ${{ matrix.os }} @@ -229,9 +229,9 @@ jobs: cmake --install ${{ env.BUILD_DIR }} cd ${{ env.INSTALL_DIR }} - chmod +x "PolyMC.app/Contents/MacOS/polymc" - sudo codesign --sign - --deep --force --entitlements "../program_info/App.entitlements" --options runtime "PolyMC.app/Contents/MacOS/polymc" - tar -czf ../PolyMC.tar.gz * + chmod +x "PollyMC.app/Contents/MacOS/pollymc" + sudo codesign --sign - --deep --force --entitlements "../program_info/App.entitlements" --options runtime "PollyMC.app/Contents/MacOS/pollymc" + tar -czf ../PollyMC.tar.gz * - name: Make Sparkle signature (macOS) if: runner.os == 'macOS' @@ -239,7 +239,7 @@ jobs: if [ '${{ secrets.SPARKLE_ED25519_KEY }}' != '' ]; then brew install openssl@3 echo '${{ secrets.SPARKLE_ED25519_KEY }}' > ed25519-priv.pem - signature=$(/usr/local/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/PolyMC.tar.gz -inkey ed25519-priv.pem | openssl base64 | tr -d \\n) + signature=$(/usr/local/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/PollyMC.tar.gz -inkey ed25519-priv.pem | openssl base64 | tr -d \\n) rm ed25519-priv.pem cat >> $GITHUB_STEP_SUMMARY << EOF ### Artifact Information :information_source: @@ -285,7 +285,7 @@ jobs: cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_DIR }} cd ${{ env.INSTALL_DIR }} - tar --owner root --group root -czf ../PolyMC.tar.gz * + tar --owner root --group root -czf ../PollyMC.tar.gz * - name: Package (Linux, portable) if: runner.os == 'Linux' @@ -294,7 +294,7 @@ jobs: cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable cd ${{ env.INSTALL_PORTABLE_DIR }} - tar -czf ../PolyMC-portable.tar.gz * + tar -czf ../PollyMC-portable.tar.gz * - name: Package AppImage (Linux) if: runner.os == 'Linux' && matrix.qt_ver != 5 @@ -302,7 +302,7 @@ jobs: run: | cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr - export OUTPUT="PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage" + export OUTPUT="PollyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage" chmod +x linuxdeploy-*.AppImage @@ -313,7 +313,7 @@ jobs: cp -r ${{ github.workspace }}/JREs/jre17/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk - cp -r /home/runner/work/PolyMC/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines + cp -r /home/runner/work/PollyMC/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/ cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}//usr/lib/ @@ -325,7 +325,7 @@ jobs: LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk/lib" export LD_LIBRARY_PATH - ./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_APPIMAGE_DIR }} --output appimage --plugin qt -i ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg + ./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_APPIMAGE_DIR }} --output appimage --plugin qt -i ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/icons/hicolor/scalable/apps/org.fn2006.PollyMC.svg ## # UPLOAD BUILDS @@ -335,63 +335,63 @@ jobs: if: runner.os == 'macOS' uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }} - path: PolyMC.tar.gz + name: PollyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }} + path: PollyMC.tar.gz - name: Upload binary zip (Windows) if: runner.os == 'Windows' uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }} + name: PollyMC-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }} path: ${{ env.INSTALL_DIR }}/** - name: Upload binary zip (Windows, portable) if: runner.os == 'Windows' uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }} + name: PollyMC-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }} path: ${{ env.INSTALL_PORTABLE_DIR }}/** - name: Upload installer (Windows) if: runner.os == 'Windows' uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }} - path: PolyMC-Setup.exe + name: PollyMC-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }} + path: PollyMC-Setup.exe - name: Upload binary tarball (Linux, Qt 5) if: runner.os == 'Linux' && matrix.qt_ver != 6 uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }} - path: PolyMC.tar.gz + name: PollyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }} + path: PollyMC.tar.gz - name: Upload binary tarball (Linux, portable, Qt 5) if: runner.os == 'Linux' && matrix.qt_ver != 6 uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ runner.os }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }} - path: PolyMC-portable.tar.gz + name: PollyMC-${{ runner.os }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }} + path: PollyMC-portable.tar.gz - name: Upload binary tarball (Linux, Qt 6) if: runner.os == 'Linux' && matrix.qt_ver !=5 uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ runner.os }}-Qt6-${{ env.VERSION }}-${{ inputs.build_type }} - path: PolyMC.tar.gz + name: PollyMC-${{ runner.os }}-Qt6-${{ env.VERSION }}-${{ inputs.build_type }} + path: PollyMC.tar.gz - name: Upload binary tarball (Linux, portable, Qt 6) if: runner.os == 'Linux' && matrix.qt_ver != 5 uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }} - path: PolyMC-portable.tar.gz + name: PollyMC-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }} + path: PollyMC-portable.tar.gz - name: Upload AppImage (Linux) if: runner.os == 'Linux' && matrix.qt_ver != 5 uses: actions/upload-artifact@v3 with: - name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage - path: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage + name: PollyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage + path: PollyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage diff --git a/.github/workflows/trigger_builds.yml b/.github/workflows/trigger_builds.yml index 55b4fdd4..ee9eb4ea 100644 --- a/.github/workflows/trigger_builds.yml +++ b/.github/workflows/trigger_builds.yml @@ -11,7 +11,6 @@ on: - '**.nix' - 'packages/**' - '.github/ISSUE_TEMPLATE/**' - - '.markdownlint**' pull_request: paths-ignore: - '**.md' @@ -20,7 +19,6 @@ on: - '**.nix' - 'packages/**' - '.github/ISSUE_TEMPLATE/**' - - '.markdownlint**' workflow_dispatch: jobs: diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml index 45ef7281..af5c2137 100644 --- a/.github/workflows/trigger_release.yml +++ b/.github/workflows/trigger_release.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v3 with: submodules: 'true' - path: 'PolyMC-source' + path: 'PollyMC-source' - name: Download artifacts uses: actions/download-artifact@v3 - name: Grab and store version @@ -34,25 +34,25 @@ jobs: echo "VERSION=$tag_name" >> $GITHUB_ENV - name: Package artifacts properly run: | - mv ${{ github.workspace }}/PolyMC-source PolyMC-${{ env.VERSION }} - mv PolyMC-Linux-Qt6-Portable*/PolyMC-portable.tar.gz PolyMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz - mv PolyMC-Linux-Qt6*/PolyMC.tar.gz PolyMC-Linux-Qt6-${{ env.VERSION }}.tar.gz - mv PolyMC-Linux-Portable*/PolyMC-portable.tar.gz PolyMC-Linux-Portable-${{ env.VERSION }}.tar.gz - mv PolyMC-Linux*/PolyMC.tar.gz PolyMC-Linux-${{ env.VERSION }}.tar.gz - mv PolyMC-*.AppImage/PolyMC-*.AppImage PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage - mv PolyMC-macOS*/PolyMC.tar.gz PolyMC-macOS-${{ env.VERSION }}.tar.gz + mv ${{ github.workspace }}/PollyMC-source PollyMC-${{ env.VERSION }} + mv PollyMC-Linux-Qt6-Portable*/PollyMC-portable.tar.gz PollyMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz + mv PollyMC-Linux-Qt6*/PollyMC.tar.gz PollyMC-Linux-Qt6-${{ env.VERSION }}.tar.gz + mv PollyMC-Linux-Portable*/PollyMC-portable.tar.gz PollyMC-Linux-Portable-${{ env.VERSION }}.tar.gz + mv PollyMC-Linux*/PollyMC.tar.gz PollyMC-Linux-${{ env.VERSION }}.tar.gz + mv PollyMC-*.AppImage/PollyMC-*.AppImage PollyMC-Linux-${{ env.VERSION }}-x86_64.AppImage + mv PollyMC-macOS*/PollyMC.tar.gz PollyMC-macOS-${{ env.VERSION }}.tar.gz - tar -czf PolyMC-${{ env.VERSION }}.tar.gz PolyMC-${{ env.VERSION }} + tar -czf PollyMC-${{ env.VERSION }}.tar.gz PollyMC-${{ env.VERSION }} - for d in PolyMC-Windows-*; do + for d in PollyMC-Windows-*; do cd "${d}" || continue LEGACY="$(echo -n ${d} | grep -o Legacy || true)" INST="$(echo -n ${d} | grep -o Setup || true)" PORT="$(echo -n ${d} | grep -o Portable || true)" - NAME="PolyMC-Windows" + NAME="PollyMC-Windows" test -z "${LEGACY}" || NAME="${NAME}-Legacy" test -z "${PORT}" || NAME="${NAME}-Portable" - test -z "${INST}" || mv PolyMC-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe + test -z "${INST}" || mv PollyMC-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" * cd .. done @@ -64,20 +64,20 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref }} - name: PolyMC ${{ env.VERSION }} + name: PollyMC ${{ env.VERSION }} draft: true prerelease: false files: | - PolyMC-Linux-${{ env.VERSION }}.tar.gz - PolyMC-Linux-Portable-${{ env.VERSION }}.tar.gz - PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage - PolyMC-Windows-Legacy-${{ env.VERSION }}.zip - PolyMC-Linux-Qt6-${{ env.VERSION }}.tar.gz - PolyMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz - PolyMC-Windows-Legacy-Portable-${{ env.VERSION }}.zip - PolyMC-Windows-Legacy-Setup-${{ env.VERSION }}.exe - PolyMC-Windows-${{ env.VERSION }}.zip - PolyMC-Windows-Portable-${{ env.VERSION }}.zip - PolyMC-Windows-Setup-${{ env.VERSION }}.exe - PolyMC-macOS-${{ env.VERSION }}.tar.gz - PolyMC-${{ env.VERSION }}.tar.gz + PollyMC-Linux-${{ env.VERSION }}.tar.gz + PollyMC-Linux-Portable-${{ env.VERSION }}.tar.gz + PollyMC-Linux-${{ env.VERSION }}-x86_64.AppImage + PollyMC-Windows-Legacy-${{ env.VERSION }}.zip + PollyMC-Linux-Qt6-${{ env.VERSION }}.tar.gz + PollyMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz + PollyMC-Windows-Legacy-Portable-${{ env.VERSION }}.zip + PollyMC-Windows-Legacy-Setup-${{ env.VERSION }}.exe + PollyMC-Windows-${{ env.VERSION }}.zip + PollyMC-Windows-Portable-${{ env.VERSION }}.zip + PollyMC-Windows-Setup-${{ env.VERSION }}.exe + PollyMC-macOS-${{ env.VERSION }}.tar.gz + PollyMC-${{ env.VERSION }}.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 3708ec1e..41546fcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ set(Launcher_META_URL "https://meta.polymc.org/v1/" CACHE STRING "URL to fetch L set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application") # Bug tracker URL -set(Launcher_BUG_TRACKER_URL "" CACHE STRING "URL for the bug tracker.") +set(Launcher_BUG_TRACKER_URL "https://github.com/fn2006/PollyMC/issues" CACHE STRING "URL for the bug tracker.") # Translations Platform URL set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/polymc/polymc/" CACHE STRING "URL for the translations platform.") @@ -201,7 +201,7 @@ endif() ####################################### Program Info ####################################### -set(Launcher_APP_BINARY_NAME "polymc" CACHE STRING "Name of the Launcher binary") +set(Launcher_APP_BINARY_NAME "pollymc" CACHE STRING "Name of the Launcher binary") add_subdirectory(program_info) ####################################### Install layout ####################################### diff --git a/README.md b/README.md index 6ff868e0..e5c84015 100644 --- a/README.md +++ b/README.md @@ -1,100 +1,13 @@

-PolyMC logo -PolyMC logo +PollyMC logo +PollyMC logo

-PolyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity. +PollyMC is a **fork** of PolyMC and is not endorsed by or affiliated with the PolyMC project. +If you have any problems open an issue here, do not bug the PolyMC maintainers. -This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. -If you want to read about why this fork was created, check out [our FAQ page](https://polymc.org/wiki/overview/faq/). -
+Binaries can be found in releases. -# Installation +Workaround for downloading mods from CurseForge not working [here](https://github.com/fn2006/PollyMC/wiki/CurseForge-Workaround). -- All downloads and instructions for PolyMC can be found [here](https://polymc.org/download/) -- Last build status: - -## Development Builds - -There are per-commit development builds available [here](https://github.com/PolyMC/PolyMC/actions). These have debug information in the binaries, so their file sizes are relatively larger. -Portable builds are provided for AppImage on Linux, Windows, and macOS. - -For Debian and Arch, you can use these packages for the latest development versions: -[![polymc-git](https://img.shields.io/badge/aur-polymc--git-blue)](https://aur.archlinux.org/packages/polymc-git/) -[![polymc-git](https://img.shields.io/badge/mpr-polymc--git-orange)](https://mpr.makedeb.org/packages/polymc-git) -For flatpak, you can use [flathub-beta](https://discourse.flathub.org/t/how-to-use-flathub-beta/2111) - -# Help & Support - -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) - -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:matrix.org?label=PolyMC%20space)](https://matrix.to/#/#polymc:matrix.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: - -[![Development](https://img.shields.io/matrix/polymc-development:matrix.org?label=PolyMC%20Development)](https://matrix.to/#/#polymc-development:matrix.org) -[![Discussion](https://img.shields.io/matrix/polymc-discussion:matrix.org?label=PolyMC%20Discussion)](https://matrix.to/#/#polymc-discussion:matrix.org) -[![Github](https://img.shields.io/matrix/polymc-github:matrix.org?label=PolyMC%20Github)](https://matrix.to/#/#polymc-github:matrix.org) -[![Maintainers](https://img.shields.io/matrix/polymc-maintainers:matrix.org?label=PolyMC%20Maintainers)](https://matrix.to/#/#polymc-maintainers:matrix.org) -[![News](https://img.shields.io/matrix/polymc-news:matrix.org?label=PolyMC%20News)](https://matrix.to/#/#polymc-news:matrix.org) -[![Offtopic](https://img.shields.io/matrix/polymc-offtopic:matrix.org?label=PolyMC%20Offtopic)](https://matrix.to/#/#polymc-offtopic:matrix.org) -[![Support](https://img.shields.io/matrix/polymc-support:matrix.org?label=PolyMC%20Support)](https://matrix.to/#/#polymc-support:matrix.org) -[![Voice](https://img.shields.io/matrix/polymc-voice:matrix.org?label=PolyMC%20Voice)](https://matrix.to/#/#polymc-voice:matrix.org) - -We also have a subreddit you can post your issues and suggestions on: - -[r/PolyMCLauncher](https://www.reddit.com/r/PolyMCLauncher/) - -# Development - -If you want to contribute to PolyMC you might find it useful to join our Discord Server or Matrix Space. - -## Building - -If you want to build PolyMC yourself, check [Build Instructions](https://polymc.org/wiki/development/build-instructions/) for build instructions. - -## 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 - -## Download information - -To modify download information or change packaging information send a pull request or issue to the website [here](https://github.com/PolyMC/polymc.github.io/tree/master/src/download). - -## Forking/Redistributing/Custom builds policy - -We don't care what you do with your fork/custom build as long as you follow the terms of the [license](LICENSE) (this is a legal responsibility), and if you made code changes rather than just packaging a custom build, please do the following as a basic courtesy: - -- Make it clear that your fork is not PolyMC and is not endorsed by or affiliated with the PolyMC project (). -- Go through [CMakeLists.txt](CMakeLists.txt) and change PolyMC's API keys to your own or set them to empty strings (`""`) to disable them (this way the program will still compile but the functionality requiring those keys will be disabled). - -If you have any questions or want any clarification on the above conditions please make an issue and ask us. - -Be aware that if you build this software without removing the provided API keys in [CMakeLists.txt](CMakeLists.txt) you are accepting the following terms and conditions: - -- [Microsoft Identity Platform Terms of Use](https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use) -- [CurseForge 3rd Party API Terms and Conditions](https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions) - -If you do not agree with these terms and conditions, then remove the associated API keys from the [CMakeLists.txt](CMakeLists.txt) file by setting them to an empty string (`""`). - -All launcher code is available under the GPL-3.0-only license. - -The logo and related assets are under the CC BY-SA 4.0 license. - -## Sponsors - -Thank you to all our generous backers over at Open Collective! Support PolyMC by [becoming a backer](https://opencollective.com/polymc). - -[![OpenCollective Backers](https://opencollective.com/polymc/backers.svg?width=890&limit=1000)](https://opencollective.com/polymc#backers) - -Also, thanks to JetBrains for providing us a few licenses for all their products, as part of their [Open Source program](https://www.jetbrains.com/opensource/). - -[![JetBrains](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/opensource/) - -Additionally, thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes! - -Powered by MacStadium +To build this yourself, follow the instructions on the PolyMC website but clone this repo instead. diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 11ce59ac..c3480b46 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1202,7 +1202,8 @@ void Application::setIconTheme(const QString& name) QIcon Application::getThemedIcon(const QString& name) { if(name == "logo") { - return QIcon(":/org.polymc.PolyMC.svg"); + // why is this hardcoded lol + return QIcon(":/org.fn2006.PollyMC.svg"); } return QIcon::fromTheme(name); } diff --git a/launcher/resources/OSX/scalable/launcher.svg b/launcher/resources/OSX/scalable/launcher.svg index c192d503..64c6d335 100644 --- a/launcher/resources/OSX/scalable/launcher.svg +++ b/launcher/resources/OSX/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/resources/backgrounds/Polly.png b/launcher/resources/backgrounds/Polly.png new file mode 100644 index 00000000..6e4e70a0 Binary files /dev/null and b/launcher/resources/backgrounds/Polly.png differ diff --git a/launcher/resources/backgrounds/PollyChristmas.png b/launcher/resources/backgrounds/PollyChristmas.png new file mode 100644 index 00000000..99dd0ca0 Binary files /dev/null and b/launcher/resources/backgrounds/PollyChristmas.png differ diff --git a/launcher/resources/backgrounds/PollyParty.png b/launcher/resources/backgrounds/PollyParty.png new file mode 100644 index 00000000..e82463d5 Binary files /dev/null and b/launcher/resources/backgrounds/PollyParty.png differ diff --git a/launcher/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc index 52921512..45cc67b1 100644 --- a/launcher/resources/backgrounds/backgrounds.qrc +++ b/launcher/resources/backgrounds/backgrounds.qrc @@ -1,8 +1,8 @@ - catbgrnd2.png - catmas.png - cattiversary.png + Polly.png + PollyChristmas.png + PollyParty.png diff --git a/launcher/resources/backgrounds/licenses b/launcher/resources/backgrounds/licenses new file mode 100644 index 00000000..2b865305 --- /dev/null +++ b/launcher/resources/backgrounds/licenses @@ -0,0 +1,6 @@ +licenses for images here; +Polly.png cc0 +santa-hat.png cc0 +party-hat.png Pixabay License +PollyChristmas.png cc0 +PollyParty.png Pixabay License diff --git a/launcher/resources/backgrounds/party-hat.png b/launcher/resources/backgrounds/party-hat.png new file mode 100644 index 00000000..35dcfcbe Binary files /dev/null and b/launcher/resources/backgrounds/party-hat.png differ diff --git a/launcher/resources/backgrounds/santa-hat.png b/launcher/resources/backgrounds/santa-hat.png new file mode 100644 index 00000000..6026e2cc Binary files /dev/null and b/launcher/resources/backgrounds/santa-hat.png differ diff --git a/launcher/resources/flat/scalable/launcher.svg b/launcher/resources/flat/scalable/launcher.svg index c192d503..64c6d335 100644 --- a/launcher/resources/flat/scalable/launcher.svg +++ b/launcher/resources/flat/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/resources/iOS/scalable/launcher.svg b/launcher/resources/iOS/scalable/launcher.svg index c192d503..64c6d335 100644 --- a/launcher/resources/iOS/scalable/launcher.svg +++ b/launcher/resources/iOS/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg index c192d503..64c6d335 100644 --- a/launcher/resources/multimc/scalable/launcher.svg +++ b/launcher/resources/multimc/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/resources/pe_blue/scalable/launcher.svg b/launcher/resources/pe_blue/scalable/launcher.svg index c192d503..64c6d335 100644 --- a/launcher/resources/pe_blue/scalable/launcher.svg +++ b/launcher/resources/pe_blue/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/resources/pe_colored/scalable/launcher.svg b/launcher/resources/pe_colored/scalable/launcher.svg index c192d503..64c6d335 100644 --- a/launcher/resources/pe_colored/scalable/launcher.svg +++ b/launcher/resources/pe_colored/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/resources/pe_dark/scalable/launcher.svg b/launcher/resources/pe_dark/scalable/launcher.svg index c192d503..64c6d335 100644 --- a/launcher/resources/pe_dark/scalable/launcher.svg +++ b/launcher/resources/pe_dark/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/resources/pe_light/scalable/launcher.svg b/launcher/resources/pe_light/scalable/launcher.svg index a9dfe87a..64c6d335 100644 --- a/launcher/resources/pe_light/scalable/launcher.svg +++ b/launcher/resources/pe_light/scalable/launcher.svg @@ -1,21 +1,99 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + head + + + + + + diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 299401f5..cc6fed64 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -406,7 +406,7 @@ public: actionCAT->setCheckable(true); actionCAT->setIcon(APPLICATION->getThemedIcon("cat")); actionCAT.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&Meow")); - actionCAT.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "It's a fluffy kitty :3")); + actionCAT.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "It's a pretty parrot :D")); actionCAT->setPriority(QAction::LowPriority); all_actions.append(&actionCAT); diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp index c5367d5b..eb69435d 100644 --- a/launcher/ui/dialogs/AboutDialog.cpp +++ b/launcher/ui/dialogs/AboutDialog.cpp @@ -71,6 +71,16 @@ QString getCreditsHtml() //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers" stream << "

" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_NAME) << "

\n"; + stream << QString("

fn2006 %1

\n") .arg(getGitHub("fn2006")); + stream << "
\n"; + + //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Contributors" + stream << "

" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_NAME) << "

\n"; + stream << QString("

anoraktrend %1

\n") .arg(getGitHub("anoraktrend")); + stream << "
\n"; + + //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers" + stream << "

" << QObject::tr("%1 Developers", "About Credits").arg("PolyMC") << "

\n"; stream << QString("

LennyMcLennington %1

\n") .arg(getGitHub("LennyMcLennington")); stream << QString("

Sefa Eyeoglu (Scrumplex) %1

\n") .arg(getWebsite("https://scrumplex.net")); stream << QString("

dada513 %1

\n") .arg(getGitHub("dada513")); @@ -81,7 +91,7 @@ QString getCreditsHtml() stream << "
\n"; //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Contributors" - stream << "

" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_NAME) << "

\n"; + stream << "

" << QObject::tr("%1 Contributors", "About Credits").arg("PolyMC") << "

\n"; stream << QString("

DioEgizio %1

\n") .arg(getGitHub("DioEgizio")); stream << QString("

flowln %1

\n") .arg(getGitHub("flowln")); stream << QString("

swirl %1

\n") .arg(getWebsite("https://swurl.xyz/")); @@ -160,7 +170,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia QString urlText("

%1

"); ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT)); - QString copyText("© 2021-2022 %1"); + QString copyText("%1"); ui->copyLabel->setText(copyText.arg(BuildConfig.LAUNCHER_COPYRIGHT)); connect(ui->closeButton, SIGNAL(clicked()), SLOT(close())); diff --git a/nix/NIX.md b/nix/NIX.md index 047dd82f..96af194b 100644 --- a/nix/NIX.md +++ b/nix/NIX.md @@ -5,22 +5,22 @@ To import with flakes use ```nix { inputs = { - polymc.url = "github:PolyMC/PolyMC"; + pollymc.url = "github:fn2006/PollyMC"; }; ... - nixpkgs.overlays = [ inputs.polymc.overlay ]; ## Within configuration.nix - environment.systemPackages = with pkgs; [ polymc ]; ## + nixpkgs.overlays = [ inputs.pollymc.overlay ]; ## Within configuration.nix + environment.systemPackages = with pkgs; [ pollymc ]; ## } ``` To import without flakes use channels: ```sh -nix-channel --add https://github.com/PolyMC/PolyMC/archive/master.tar.gz polymc -nix-channel --update polymc -nix-env -iA polymc +nix-channel --add https://github.com/fn2006/PollyMC/archive/master.tar.gz pollymc +nix-channel --update pollymc +nix-env -iA pollymc ``` or alternatively you can use @@ -28,9 +28,9 @@ or alternatively you can use ```nix { nixpkgs.overlays = [ - (import (builtins.fetchTarball "https://github.com/PolyMC/PolyMC/archive/develop.tar.gz")).overlay + (import (builtins.fetchTarball "https://github.com/fn2006/PollyMC/archive/develop.tar.gz")).overlay ]; - environment.systemPackages = with pkgs; [ polymc ]; + environment.systemPackages = with pkgs; [ pollymc ]; } ``` diff --git a/nix/default.nix b/nix/default.nix index 42ddda18..2cee82f3 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -43,7 +43,7 @@ let in stdenv.mkDerivation rec { - pname = "polymc"; + pname = "pollymc"; inherit version; src = lib.cleanSource self; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # we have to check if the system is NixOS before adding stdenv.cc.cc.lib (#923) postInstall = '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapQtApp $out/bin/polymc \ + wrapQtApp $out/bin/pollymc \ --run '[ -f /etc/NIXOS ] && export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH"' \ --prefix LD_LIBRARY_PATH : ${gameLibraryPath} \ --prefix POLYMC_JAVA_PATHS : ${javaPaths} \ @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://polymc.org/"; - downloadPage = "https://polymc.org/download/"; - changelog = "https://github.com/PolyMC/PolyMC/releases"; + homepage = "https://github.com/fn2006/PollyMC"; + downloadPage = "https://github.com/fn2006/PollyMC/releases"; + changelog = "https://github.com/fn2006/PollyMC/releases"; description = "A free, open source launcher for Minecraft"; longDescription = '' Allows you to have multiple, separate instances of Minecraft (each with diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index b1ba89df..9ce3623f 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -8,44 +8,44 @@ if(UNIX) endif() endif() -set(Launcher_CommonName "PolyMC") +set(Launcher_CommonName "PollyMC") -set(Launcher_Copyright "PolyMC Contributors\\n© 2012-2021 MultiMC Contributors") +set(Launcher_Copyright "© 2022 PollyMC Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors") set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE) -set(Launcher_Domain "polymc.org" PARENT_SCOPE) +set(Launcher_Domain "" PARENT_SCOPE) set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_CommonName}" PARENT_SCOPE) -set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE) -set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE) -set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE) -set(Launcher_DesktopFileName "org.polymc.PolyMC.desktop" PARENT_SCOPE) +set(Launcher_UserAgent "PolyMC/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE) +set(Launcher_ConfigFile "pollymc.cfg" PARENT_SCOPE) +set(Launcher_Git "https://github.com/fn2006/PollyMC" PARENT_SCOPE) +set(Launcher_DesktopFileName "org.fn2006.PollyMC.desktop" PARENT_SCOPE) -set(Launcher_Desktop "program_info/org.polymc.PolyMC.desktop" PARENT_SCOPE) -set(Launcher_MetaInfo "program_info/org.polymc.PolyMC.metainfo.xml" PARENT_SCOPE) -set(Launcher_SVG "program_info/org.polymc.PolyMC.svg" PARENT_SCOPE) +set(Launcher_Desktop "program_info/org.fn2006.PollyMC.desktop" PARENT_SCOPE) +set(Launcher_MetaInfo "program_info/org.fn2006.PollyMC.metainfo.xml" PARENT_SCOPE) +set(Launcher_SVG "program_info/org.fn2006.PollyMC.svg" PARENT_SCOPE) set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE) -set(Launcher_Branding_ICO "program_info/polymc.ico") +set(Launcher_Branding_ICO "program_info/pollymc.ico") set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE) -set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE) +set(Launcher_Branding_WindowsRC "program_info/pollymc.rc" PARENT_SCOPE) set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE) set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE) -configure_file(org.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop) -configure_file(org.polymc.PolyMC.metainfo.xml.in org.polymc.PolyMC.metainfo.xml) -configure_file(polymc.rc.in polymc.rc @ONLY) -configure_file(polymc.manifest.in polymc.manifest @ONLY) -configure_file(polymc.ico polymc.ico COPYONLY) +configure_file(org.fn2006.PollyMC.desktop.in org.fn2006.PollyMC.desktop) +configure_file(org.fn2006.PollyMC.metainfo.xml.in org.fn2006.PollyMC.metainfo.xml) +configure_file(pollymc.rc.in pollymc.rc @ONLY) +configure_file(pollymc.manifest.in pollymc.manifest @ONLY) +configure_file(pollymc.ico pollymc.ico COPYONLY) configure_file(win_install.nsi.in win_install.nsi @ONLY) if(SCDOC_FOUND) - set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/polymc.6.scd") - set(out_man "${CMAKE_CURRENT_BINARY_DIR}/polymc.6") + set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/pollymc.6.scd") + set(out_man "${CMAKE_CURRENT_BINARY_DIR}/pollymc.6") add_custom_command( DEPENDS "${in_scd}" OUTPUT "${out_man}" COMMAND ${SCDOC_SCDOC} < "${in_scd}" > "${out_man}" ) add_custom_target(man ALL DEPENDS ${out_man}) - set(Launcher_ManPage "program_info/polymc.6" PARENT_SCOPE) + set(Launcher_ManPage "program_info/pollymc.6" PARENT_SCOPE) endif() diff --git a/program_info/genicons.sh b/program_info/genicons.sh index 313bdb53..60a437d8 100755 --- a/program_info/genicons.sh +++ b/program_info/genicons.sh @@ -2,38 +2,38 @@ # ICO -inkscape -w 16 -h 16 -o polymc_16.png org.polymc.PolyMC.svg -inkscape -w 24 -h 24 -o polymc_24.png org.polymc.PolyMC.svg -inkscape -w 32 -h 32 -o polymc_32.png org.polymc.PolyMC.svg -inkscape -w 48 -h 48 -o polymc_48.png org.polymc.PolyMC.svg -inkscape -w 64 -h 64 -o polymc_64.png org.polymc.PolyMC.svg -inkscape -w 128 -h 128 -o polymc_128.png org.polymc.PolyMC.svg +inkscape -w 16 -h 16 -o pollymc_16.png org.fn2006.PollyMC.svg +inkscape -w 24 -h 24 -o pollymc_24.png org.fn2006.PollyMC.svg +inkscape -w 32 -h 32 -o pollymc_32.png org.fn2006.PollyMC.svg +inkscape -w 48 -h 48 -o pollymc_48.png org.fn2006.PollyMC.svg +inkscape -w 64 -h 64 -o pollymc_64.png org.fn2006.PollyMC.svg +inkscape -w 128 -h 128 -o pollymc_128.png org.fn2006.PollyMC.svg -convert polymc_128.png polymc_64.png polymc_48.png polymc_32.png polymc_24.png polymc_16.png polymc.ico +convert pollymc_128.png pollymc_64.png pollymc_48.png pollymc_32.png pollymc_24.png pollymc_16.png pollymc.ico -rm -f polymc_*.png +rm -f pollymc_*.png -inkscape -w 1024 -h 1024 -o polymc_1024.png org.polymc.PolyMC.bigsur.svg +inkscape -w 1024 -h 1024 -o pollymc_1024.png org.fn2006.PollyMC.bigsur.svg -mkdir polymc.iconset +mkdir pollymc.iconset -sips -z 16 16 polymc_1024.png --out polymc.iconset/icon_16x16.png -sips -z 32 32 polymc_1024.png --out polymc.iconset/icon_16x16@2x.png -sips -z 32 32 polymc_1024.png --out polymc.iconset/icon_32x32.png -sips -z 64 64 polymc_1024.png --out polymc.iconset/icon_32x32@2x.png -sips -z 128 128 polymc_1024.png --out polymc.iconset/icon_128x128.png -sips -z 256 256 polymc_1024.png --out polymc.iconset/icon_128x128@2x.png -sips -z 256 256 polymc_1024.png --out polymc.iconset/icon_256x256.png -sips -z 512 512 polymc_1024.png --out polymc.iconset/icon_256x256@2x.png -sips -z 512 512 polymc_1024.png --out polymc.iconset/icon_512x512.png -cp polymc_1024.png polymc.iconset/icon_512x512@2x.png +magick pollymc_1024.png -resize 16x16 pollymc.iconset/icon_16x16.png +magick pollymc_1024.png -resize 32x32 pollymc.iconset/icon_16x16@2x.png +magick pollymc_1024.png -resize 32x32 pollymc.iconset/icon_32x32.png +magick pollymc_1024.png -resize 64x64 pollymc.iconset/icon_32x32@2x.png +magick pollymc_1024.png -resize 128x128 pollymc.iconset/icon_128x128.png +magick pollymc_1024.png -resize 256x256 pollymc.iconset/icon_128x128@2x.png +magick pollymc_1024.png -resize 256x256 pollymc.iconset/icon_256x256.png +magick pollymc_1024.png -resize 512x512 pollymc.iconset/icon_256x256@2x.png +magick pollymc_1024.png -resize 512x512 pollymc.iconset/icon_512x512.png +cp pollymc_1024.png pollymc.iconset/icon_512x512@2x.png -iconutil -c icns polymc.iconset +icnsify -i pollymc_1024.png -o pollymc.icns -rm -f polymc_*.png -rm -rf polymc.iconset +rm -f pollymc_*.png +rm -rf pollymc.iconset for dir in ../launcher/resources/*/scalable do - cp -v org.polymc.PolyMC.svg $dir/launcher.svg + cp -v org.fn2006.PollyMC.svg $dir/launcher.svg done diff --git a/program_info/org.fn2006.PollyMC Source.svg b/program_info/org.fn2006.PollyMC Source.svg new file mode 100644 index 00000000..d09ac6ea --- /dev/null +++ b/program_info/org.fn2006.PollyMC Source.svg @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + head2 + + + head1 + + + head + + + + + + + + + + + diff --git a/program_info/org.fn2006.PollyMC.bigsur.svg b/program_info/org.fn2006.PollyMC.bigsur.svg new file mode 100644 index 00000000..e3bd4615 --- /dev/null +++ b/program_info/org.fn2006.PollyMC.bigsur.svg @@ -0,0 +1,207 @@ + +head diff --git a/program_info/org.fn2006.PollyMC.desktop.in b/program_info/org.fn2006.PollyMC.desktop.in new file mode 100755 index 00000000..12a3a6d0 --- /dev/null +++ b/program_info/org.fn2006.PollyMC.desktop.in @@ -0,0 +1,13 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Version=1.0 +Name=PollyMC +Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. +Type=Application +Terminal=false +Exec=@Launcher_APP_BINARY_NAME@ +StartupNotify=true +Icon=org.fn2006.PollyMC +Categories=Game; +Keywords=game;minecraft;launcher;mc; +StartupWMClass=PollyMC diff --git a/program_info/org.fn2006.PollyMC.metainfo.xml.in b/program_info/org.fn2006.PollyMC.metainfo.xml.in new file mode 100644 index 00000000..eb6ff667 --- /dev/null +++ b/program_info/org.fn2006.PollyMC.metainfo.xml.in @@ -0,0 +1,33 @@ + + + org.fn2006.PollyMC + + org.fn2006.PollyMC + + org.fn2006.PollyMC.desktop + PollyMC + fn2006 + A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once + CC0-1.0 + GPL-3.0-only + +

PollyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.

+

Features:

+
    +
  • Easily install game modifications, such as Fabric or Forge
    • +
  • Control your java settings
    • +
  • Manage worlds and resource packs from the launcher
    • +
  • See logs and other details easily
    • +
  • Kill Minecraft in case of a crash/freeze
    • +
  • Isolate minecraft instances to keep everything clean
    • +
  • Install mods directly from the launcher
    • +
+ + + + + + moderate + intense + + diff --git a/program_info/org.fn2006.PollyMC.svg b/program_info/org.fn2006.PollyMC.svg new file mode 100644 index 00000000..64f8da74 --- /dev/null +++ b/program_info/org.fn2006.PollyMC.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + diff --git a/program_info/pollymc-header-black.svg b/program_info/pollymc-header-black.svg new file mode 100644 index 00000000..9289d138 --- /dev/null +++ b/program_info/pollymc-header-black.svg @@ -0,0 +1,143 @@ + + + + diff --git a/program_info/pollymc-header.Source.svg b/program_info/pollymc-header.Source.svg new file mode 100644 index 00000000..f05a73b9 --- /dev/null +++ b/program_info/pollymc-header.Source.svg @@ -0,0 +1,145 @@ + + + +PollyMC diff --git a/program_info/pollymc-header.svg b/program_info/pollymc-header.svg new file mode 100644 index 00000000..ad67d9f9 --- /dev/null +++ b/program_info/pollymc-header.svg @@ -0,0 +1,143 @@ + + + + diff --git a/program_info/pollymc.6.scd b/program_info/pollymc.6.scd new file mode 100644 index 00000000..3a34d544 --- /dev/null +++ b/program_info/pollymc.6.scd @@ -0,0 +1,61 @@ +pollymc(6) + + +# NAME + +pollymc - a launcher and instance manager for Minecraft. + + +# SYNOPSIS + +*pollymc* [OPTIONS...] + + +# DESCRIPTION + +PollyMC is a custom launcher for Minecraft that allows you to easily manage +multiple installations of Minecraft at once. It also allows you to easily +install and remove mods by simply dragging and dropping. +Here are the current features of PollyMC. + +# OPTIONS + +*-d, --dir*=DIRECTORY + Use DIRECTORY as the PollyMC root. + +*-l, --launch*=INSTANCE_ID + Launch the instance specified by INSTANCE_ID. + +*--alive* + Write a small 'live.check' file after PollyMC starts. + +*-h, --help* + Display help text and exit. + +*-v, --version* + Display program version and exit. + +*-a, --profile*=PROFILE + Use the account specified by PROFILE (only valid in combination with --launch). + +# EXIT STATUS + +*0* + Success + +*1* + Failure (syntax or usage error; configuration error; unexpected error). + +# BUGS + +https://github.com/fn2006/PollyMC/issues + +# RESOURCES + +GitHub: https://github.com/fn2006/PollyMC + +# AUTHORS + +PollyMC Contributors + +PolyMC Contributors diff --git a/program_info/pollymc.icns b/program_info/pollymc.icns new file mode 100644 index 00000000..d9a1b86b Binary files /dev/null and b/program_info/pollymc.icns differ diff --git a/program_info/pollymc.ico b/program_info/pollymc.ico new file mode 100644 index 00000000..8664059e Binary files /dev/null and b/program_info/pollymc.ico differ diff --git a/program_info/pollymc.manifest.in b/program_info/pollymc.manifest.in new file mode 100644 index 00000000..3756c706 --- /dev/null +++ b/program_info/pollymc.manifest.in @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + Custom Minecraft launcher for managing multiple installs. + + + + + + + + + + + + + diff --git a/program_info/pollymc.qrc b/program_info/pollymc.qrc new file mode 100644 index 00000000..44558322 --- /dev/null +++ b/program_info/pollymc.qrc @@ -0,0 +1,6 @@ + + + + org.fn2006.PollyMC.svg + + diff --git a/program_info/pollymc.rc.in b/program_info/pollymc.rc.in new file mode 100644 index 00000000..b9a6e0a5 --- /dev/null +++ b/program_info/pollymc.rc.in @@ -0,0 +1,29 @@ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#include + +IDI_ICON1 ICON DISCARDABLE "pollymc.ico" +1 RT_MANIFEST "pollymc.manifest" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION @Launcher_RELEASE_VERSION_NAME4_COMMA@ +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", "MultiMC & PolyMC & PollyMC Contributors" + VALUE "FileDescription", "PollyMC" + VALUE "FileVersion", "@Launcher_RELEASE_VERSION_NAME4@" + VALUE "ProductName", "PollyMC" + VALUE "ProductVersion", "@Launcher_RELEASE_VERSION_NAME4@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0000, 0x04b0 // Unicode + END +END diff --git a/program_info/polymc.qrc b/program_info/polymc.qrc index 9ea695de..44558322 100644 --- a/program_info/polymc.qrc +++ b/program_info/polymc.qrc @@ -1,6 +1,6 @@ - org.polymc.PolyMC.svg + org.fn2006.PollyMC.svg