From 5b507a894435f3c266d9ba5e8463c29349706e80 Mon Sep 17 00:00:00 2001 From: Lenny McLennington Date: Wed, 9 Feb 2022 22:59:21 +0000 Subject: Add info about translating PolyMC to the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 5c23444b..6f15ad0d 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ In general, in order of importance: ## Translations -TODO +The translation effort for PolyMC is hosted on [Weblate](https://hosted.weblate.org/polymc/polymc and information about translating PolyMC is available at https://github.com/PolyMC/Translations ## Forking/Redistributing/Custom builds policy -- cgit From 7531a2894b152c0efdaf4e259407b4a752410503 Mon Sep 17 00:00:00 2001 From: Lenny McLennington Date: Wed, 9 Feb 2022 23:13:33 +0000 Subject: Missed a closing parenthesis in README.md, oops. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 6f15ad0d..ef95f6dd 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ In general, in order of importance: ## Translations -The translation effort for PolyMC is hosted on [Weblate](https://hosted.weblate.org/polymc/polymc and information about translating PolyMC is available at https://github.com/PolyMC/Translations +The translation effort for PolyMC is hosted on [Weblate](https://hosted.weblate.org/polymc/polymc) and information about translating PolyMC is available at https://github.com/PolyMC/Translations ## Forking/Redistributing/Custom builds policy -- cgit From b9111517862e58db865c2eee2cc2bebbac46d0e9 Mon Sep 17 00:00:00 2001 From: helpimnotdrowning <35247379+helpimnotdrowning@users.noreply.github.com> Date: Wed, 9 Feb 2022 21:40:57 -0600 Subject: Fix Weblate link in README original link was missing /projects/ dir and leading to a nonexistant page --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index ef95f6dd..ba7f9914 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ In general, in order of importance: ## Translations -The translation effort for PolyMC is hosted on [Weblate](https://hosted.weblate.org/polymc/polymc) and information about translating PolyMC is available at https://github.com/PolyMC/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 ## Forking/Redistributing/Custom builds policy -- cgit From 35d2ae3ef789eef49bb7514d42deca43f339fda3 Mon Sep 17 00:00:00 2001 From: Lenny McLennington Date: Thu, 10 Feb 2022 11:21:25 +0000 Subject: Remove drama from readme and remove mmc discord link --- README.md | 2 +- launcher/ui/pages/instance/LegacyUpgradePage.ui | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index ef95f6dd..981ec0a4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 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. +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.
# Installation diff --git a/launcher/ui/pages/instance/LegacyUpgradePage.ui b/launcher/ui/pages/instance/LegacyUpgradePage.ui index 4e803358..b22c03e5 100644 --- a/launcher/ui/pages/instance/LegacyUpgradePage.ui +++ b/launcher/ui/pages/instance/LegacyUpgradePage.ui @@ -26,7 +26,14 @@ - <html><body><h1>Upgrade is required</h1><p>PolyMC now supports old Minecraft versions and all the required features in the new (OneSix) instance format. As a consequence, the old (Legacy) format has been entirely disabled and old instances need to be upgraded.</p><p>The upgrade will create a new instance with the same contents as the current one, in the new format. The original instance will remain untouched, in case anything goes wrong in the process.</p><p>Please report any issues on our <a href="https://github.com/PolyMC/PolyMC/issues">github issues page</a>.</p><p>There is also a <a href="https://discord.gg/GtPmv93">discord channel for testing here</a>.</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Noto Sans'; font-size:11pt; font-weight:400; font-style:normal;"> +<h1 style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:600;">Upgrade is required</span></h1> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">PolyMC now supports old Minecraft versions and all the required features in the new (OneSix) instance format. As a consequence, the old (Legacy) format has been entirely disabled and old instances need to be upgraded.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The upgrade will create a new instance with the same contents as the current one, in the new format. The original instance will remain untouched, in case anything goes wrong in the process.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please report any issues on our <a href="https://github.com/PolyMC/PolyMC/issues"><span style=" text-decoration: underline; color:#3584e4;">github issues page</span></a>.</p></body></html> true -- cgit From 0ba61bb5903a22044decaa9390437e83be0dadd7 Mon Sep 17 00:00:00 2001 From: txtsd Date: Tue, 8 Feb 2022 08:55:52 +0530 Subject: Implement even more PR suggestions --- .github/scripts/prepare_JREs.sh | 38 +++++++++++++++----------------------- .github/workflows/build.yml | 2 +- README.md | 5 +++++ 3 files changed, 21 insertions(+), 24 deletions(-) (limited to 'README.md') diff --git a/.github/scripts/prepare_JREs.sh b/.github/scripts/prepare_JREs.sh index 1525fdb9..b85e9c2f 100755 --- a/.github/scripts/prepare_JREs.sh +++ b/.github/scripts/prepare_JREs.sh @@ -13,33 +13,25 @@ for file in *; do mkdir temp - # Handle OpenJDK17 archive - re='(OpenJDK17U-jre_x64_linux_hotspot_17.(.*).tar.gz)' + re='(OpenJDK([[:digit:]]+)U-jre_x64_linux_hotspot_([[:digit:]]+)(.*).tar.gz)' if [[ $file =~ $re ]]; then - version=${BASH_REMATCH[2]} - version_edit=$(echo $version | sed -e 's/_/+/g') - dir_name=jdk-17.$version_edit-jre - echo $dir_name - mkdir jre17 + version_major=${BASH_REMATCH[2]} + version_trailing=${BASH_REMATCH[4]} + + if [ $version_major = 17 ]; + then + hyphen='-' + else + hyphen='' + fi + + version_edit=$(echo $version_trailing | sed -e 's/_/+/g' | sed -e 's/b/-b/g') + dir_name=jdk$hyphen$version_major$version_edit-jre + mkdir jre$version_major tar -xzf $file -C temp pushd temp/$dir_name - cp -r . ../../jre17 - popd - - fi - - # Handle OpenJDK8 archive - re='(OpenJDK8U-jre_x64_linux_hotspot_8(.*).tar.gz)' - if [[ $file =~ $re ]]; - then - version=${BASH_REMATCH[2]} - version_edit=$(echo $version | sed -e 's/b/-b/g') - dir_name=jdk8$version_edit-jre - mkdir jre8 - tar -xzf $file -C temp - pushd temp/$dir_name - cp -r . ../../jre8 + cp -r . ../../jre$version_major popd fi diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 600831c0..42661b09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -124,7 +124,7 @@ jobs: LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk/lib/server" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk/lib" - ./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_DIR }} --output appimage --plugin qt -d ${{ env.INSTALL_DIR }}/usr/share/applications/org.polymc.polymc.desktop -i ${{ env.INSTALL_DIR }}/usr/share/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg + ./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_DIR }} --output appimage --plugin qt -i ${{ env.INSTALL_DIR }}/usr/share/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg - name: Run windeployqt if: runner.os == 'Windows' diff --git a/README.md b/README.md index 74d0493c..99f69b27 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,11 @@ sudo dnf install polymc MacOS currently does not have any packages. We are still working on setting up MacOS packaging. Meanwhile, you can [build](https://github.com/PolyMC/PolyMC/blob/develop/BUILD.md#macos) it for yourself. +## 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. +Builds are provided for Linux, AppImage on Linux, Windows, and macOS. + # Help & Support Feel free to create an issue if you need help. However, you might find it easier to ask in the Discord server. -- cgit