Adjust branding to that of ShatteredPrism

This commit is contained in:
Luna 2024-10-02 23:20:49 -05:00
parent 168b980d7a
commit 1b95061bcf
37 changed files with 469 additions and 1096 deletions

View File

@ -6,9 +6,9 @@ body:
attributes: attributes:
value: | value: |
Before submitting a bug report, please make sure you have read this *entire* form, and that: Before submitting a bug report, please make sure you have read this *entire* form, and that:
* You have read the [Fjord Launcher wiki](https://fjordlauncher.org/wiki/) and it has not answered your question. * You have read the [Prism Launcher wiki](https://prismlauncher.org/wiki/) and it has not answered your question.
* Your bug is not caused by Minecraft or any mods you have installed. * Your bug is not caused by Minecraft or any mods you have installed.
* Your issue has not been reported before, [make sure to use the search function!](https://github.com/unmojang/FjordLauncher/issues) * Your issue has not been reported before, [make sure to use the search function!](https://github.com/lunaislazier/ShatteredPrism/issues)
**Do not forget to give your issue a descriptive title.** "Bug in the instance screen" makes it hard to distinguish issues at a glance. **Do not forget to give your issue a descriptive title.** "Bug in the instance screen" makes it hard to distinguish issues at a glance.
- type: dropdown - type: dropdown
@ -23,15 +23,15 @@ body:
- Other - Other
- type: textarea - type: textarea
attributes: attributes:
label: Version of Fjord Launcher label: Version of Shattered Prism
description: The version of Fjord Launcher used in the bug report. description: The version of Shattered Prism used in the bug report.
placeholder: Fjord Launcher 5.1 placeholder: Shattered Prism 1.3
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: Version of Qt label: Version of Qt
description: The version of Qt used in the bug report. You can find it in Help -> About Fjord Launcher -> About Qt. description: The version of Qt used in the bug report. You can find it in Help -> About Shattered Prism -> About Qt.
placeholder: Qt 6.3.0 placeholder: Qt 6.3.0
validations: validations:
required: true required: true
@ -39,7 +39,7 @@ body:
attributes: attributes:
label: Description of bug label: Description of bug
description: What did you expect to happen, what happened, and why is it incorrect? description: What did you expect to happen, what happened, and why is it incorrect?
placeholder: The parrot button should show a parrot, but it showed a cat instead! placeholder: The cat button should show a cat, but it showed a parrot instead!
validations: validations:
required: true required: true
- type: textarea - type: textarea

View File

@ -6,38 +6,38 @@ body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
### Use this form to suggest a larger change for Fjord Launcher. ### Use this form to suggest a larger change for Shattered Prism.
- type: textarea - type: textarea
attributes: attributes:
label: Goal label: Goal
description: Short description, 1-2 sentences. description: Short description, 1-2 sentences.
placeholder: Remove the parrot from the launcher. placeholder: Remove the cat from the launcher.
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: Motivation label: Motivation
description: | description: |
Introduce the topic. If this is a not-well-known section of Fjord Launcher, a detailed explanation of the background is recommended. Introduce the topic. If this is a not-well-known section of Shattered Prism, a detailed explanation of the background is recommended.
Some example points of discussion: Some example points of discussion:
- What specific problems are you facing right now that you're trying to address? - 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!). - 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. - Is there any precedent set by other software? If so, link to resources.
placeholder: I don't like parrots. I think many users also don't like parrots. placeholder: I don't like cats. I think many users also don't like cats.
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: Specification label: Specification
description: A concrete, thorough explanation of what is being planned. description: A concrete, thorough explanation of what is being planned.
placeholder: Remove the parrot button and all references to the parrot from the codebase. Including resource files. placeholder: Remove the cat button and all references to the cat from the codebase. Including resource files.
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: Drawbacks label: Drawbacks
description: Carefully consider every possible objection and issue with your proposal. This section should be updated as feedback comes in from discussion. 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 parrots. placeholder: Some users might like cats.
validations: validations:
required: true required: true
- type: textarea - 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? 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. 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. 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 parrot? placeholder: Do a lot of users care about the cat?
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: Alternatives Considered label: Alternatives Considered
description: A list of alternatives, that have been considered and offer equal or similar features to the proposed change. description: A list of alternatives, that have been considered and offer equal or similar features to the proposed change.
placeholder: Maybe the parrot could be replaced with a dog? placeholder: Maybe the cat could be replaced with a dog?
validations: validations:
required: true required: true
- type: checkboxes - type: checkboxes

View File

@ -5,26 +5,26 @@ body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
### Use this form to suggest a feature for Fjord Launcher. ### Use this form to suggest a feature for Shattered Prism.
- type: input - type: input
attributes: attributes:
label: Role label: Role
description: In what way do you use Fjord Launcher that needs this feature? description: In what way do you use Shattered Prism that needs this feature?
placeholder: I play modded Minecraft. placeholder: I play modded Minecraft.
validations: validations:
required: true required: true
- type: input - type: input
attributes: attributes:
label: Suggestion label: Suggestion
description: What do you want Fjord Launcher to do? description: What do you want Shattered Prism to do?
placeholder: I want the parrot button to squawk. placeholder: I want the cat button to meow.
validations: validations:
required: true required: true
- type: input - type: input
attributes: attributes:
label: Benefit label: Benefit
description: Why do you need Fjord Launcher to do this? description: Why do you need Shattered Prism to do this?
placeholder: so that I can always hear a parrot when I need to. placeholder: so that I can always hear a cat when I need to.
validations: validations:
required: true required: true
- type: checkboxes - type: checkboxes

View File

@ -376,7 +376,7 @@ jobs:
cmake --install ${{ env.BUILD_DIR }} cmake --install ${{ env.BUILD_DIR }}
cd ${{ env.INSTALL_DIR }} cd ${{ env.INSTALL_DIR }}
chmod +x "FjordLauncher.app/Contents/MacOS/fjordlauncher" chmod +x "ShatteredPrism.app/Contents/MacOS/ShatteredPrism"
if [ -n '${{ secrets.APPLE_CODESIGN_ID }}' ]; then if [ -n '${{ secrets.APPLE_CODESIGN_ID }}' ]; then
APPLE_CODESIGN_ID='${{ secrets.APPLE_CODESIGN_ID }}' APPLE_CODESIGN_ID='${{ secrets.APPLE_CODESIGN_ID }}'
@ -384,8 +384,8 @@ jobs:
APPLE_CODESIGN_ID='-' APPLE_CODESIGN_ID='-'
fi fi
sudo codesign --sign "$APPLE_CODESIGN_ID" --deep --force --entitlements "../program_info/App.entitlements" --options runtime "FjordLauncher.app/Contents/MacOS/fjordlauncher" sudo codesign --sign "$APPLE_CODESIGN_ID" --deep --force --entitlements "../program_info/App.entitlements" --options runtime "ShatteredPrism.app/Contents/MacOS/ShatteredPrism"
mv "FjordLauncher.app" "Fjord Launcher.app" mv "ShatteredPrism.app" "Shattered Prism.app"
- name: Notarize (macOS) - name: Notarize (macOS)
if: runner.os == 'macOS' if: runner.os == 'macOS'
@ -393,25 +393,25 @@ jobs:
cd ${{ env.INSTALL_DIR }} cd ${{ env.INSTALL_DIR }}
if [ -n '${{ secrets.APPLE_NOTARIZE_PASSWORD }}' ]; then if [ -n '${{ secrets.APPLE_NOTARIZE_PASSWORD }}' ]; then
ditto -c -k --sequesterRsrc --keepParent "Fjord Launcher.app" ../FjordLauncher.zip ditto -c -k --sequesterRsrc --keepParent "Shattered Prism.app" ../ShatteredPrism.zip
xcrun notarytool submit ../FjordLauncher.zip \ xcrun notarytool submit ../ShatteredPrism.zip \
--wait --progress \ --wait --progress \
--apple-id '${{ secrets.APPLE_NOTARIZE_APPLE_ID }}' \ --apple-id '${{ secrets.APPLE_NOTARIZE_APPLE_ID }}' \
--team-id '${{ secrets.APPLE_NOTARIZE_TEAM_ID }}' \ --team-id '${{ secrets.APPLE_NOTARIZE_TEAM_ID }}' \
--password '${{ secrets.APPLE_NOTARIZE_PASSWORD }}' --password '${{ secrets.APPLE_NOTARIZE_PASSWORD }}'
xcrun stapler staple "Fjord Launcher.app" xcrun stapler staple "Shattered Prism.app"
else else
echo ":warning: Skipping notarization as credentials are not present." >> $GITHUB_STEP_SUMMARY echo ":warning: Skipping notarization as credentials are not present." >> $GITHUB_STEP_SUMMARY
fi fi
ditto -c -k --sequesterRsrc --keepParent "Fjord Launcher.app" ../FjordLauncher.zip ditto -c -k --sequesterRsrc --keepParent "Shattered Prism.app" ../ShatteredPrism.zip
- name: Make Sparkle signature (macOS) - name: Make Sparkle signature (macOS)
if: matrix.name == 'macOS' if: matrix.name == 'macOS'
run: | run: |
if [ '${{ secrets.SPARKLE_ED25519_KEY }}' != '' ]; then if [ '${{ secrets.SPARKLE_ED25519_KEY }}' != '' ]; then
echo '${{ secrets.SPARKLE_ED25519_KEY }}' > ed25519-priv.pem echo '${{ secrets.SPARKLE_ED25519_KEY }}' > ed25519-priv.pem
signature=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/FjordLauncher.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n) signature=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/ShatteredPrism.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
rm ed25519-priv.pem rm ed25519-priv.pem
cat >> $GITHUB_STEP_SUMMARY << EOF cat >> $GITHUB_STEP_SUMMARY << EOF
### Artifact Information :information_source: ### Artifact Information :information_source:
@ -453,7 +453,7 @@ jobs:
if (Get-Content ./codesign.pfx){ if (Get-Content ./codesign.pfx){
cd ${{ env.INSTALL_DIR }} cd ${{ env.INSTALL_DIR }}
# We ship the exact same executable for portable and non-portable editions, so signing just once is fine # We ship the exact same executable for portable and non-portable editions, so signing just once is fine
SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com fjordlauncher.exe fjordlauncher_updater.exe fjordlauncher_filelink.exe SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com ShatteredPrism.exe ShatteredPrism_updater.exe ShatteredPrism_filelink.exe
} else { } else {
":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
} }
@ -494,7 +494,7 @@ jobs:
if: runner.os == 'Windows' if: runner.os == 'Windows'
run: | run: |
if (Get-Content ./codesign.pfx){ if (Get-Content ./codesign.pfx){
SignTool sign /fd sha256 /td sha256 /f codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com FjordLauncher-Setup.exe SignTool sign /fd sha256 /td sha256 /f codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com ShatteredPrism-Setup.exe
} else { } else {
":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
} }
@ -507,10 +507,10 @@ jobs:
run: | run: |
cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.unmojang.FjordLauncher.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.fjordlauncher.FjordLauncher.appdata.xml mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.lunaislazier.ShatteredPrism.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.shatteredprism.ShatteredPrism.appdata.xml
export "NO_APPSTREAM=1" # we have to skip appstream checking because appstream on ubuntu 20.04 is outdated export "NO_APPSTREAM=1" # we have to skip appstream checking because appstream on ubuntu 20.04 is outdated
export OUTPUT="FjordLauncher-Linux-x86_64.AppImage" export OUTPUT="ShatteredPrism-Linux-x86_64.AppImage"
chmod +x linuxdeploy-*.AppImage chmod +x linuxdeploy-*.AppImage
@ -529,7 +529,7 @@ jobs:
chmod +x AppImageUpdate-x86_64.AppImage chmod +x AppImageUpdate-x86_64.AppImage
cp AppImageUpdate-x86_64.AppImage ${{ env.INSTALL_APPIMAGE_DIR }}/usr/bin cp AppImageUpdate-x86_64.AppImage ${{ env.INSTALL_APPIMAGE_DIR }}/usr/bin
export UPDATE_INFORMATION="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|FjordLauncher-Linux-x86_64.AppImage.zsync" export UPDATE_INFORMATION="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|ShatteredPrism-Linux-x86_64.AppImage.zsync"
if [ '${{ secrets.GPG_PRIVATE_KEY_ID }}' != '' ]; then if [ '${{ secrets.GPG_PRIVATE_KEY_ID }}' != '' ]; then
export SIGN=1 export SIGN=1
@ -541,9 +541,9 @@ jobs:
echo ":warning: Skipped code signing for Linux AppImage, as gpg key was not present." >> $GITHUB_STEP_SUMMARY echo ":warning: Skipped code signing for Linux AppImage, as gpg key was not present." >> $GITHUB_STEP_SUMMARY
fi fi
./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.unmojang.FjordLauncher.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.unmojang.ShatteredPrism.svg
mv "FjordLauncher-Linux-x86_64.AppImage" "FjordLauncher-Linux-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage" mv "ShatteredPrism-Linux-x86_64.AppImage" "ShatteredPrism-Linux-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
- name: Package (Linux, portable) - name: Package (Linux, portable)
if: runner.os == 'Linux' if: runner.os == 'Linux'
@ -572,57 +572,57 @@ jobs:
if: runner.os == 'macOS' if: runner.os == 'macOS'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }} name: ShatteredPrism-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
path: FjordLauncher.zip path: ShatteredPrism.zip
- name: Upload binary zip (Windows) - name: Upload binary zip (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }} name: ShatteredPrism-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
path: ${{ env.INSTALL_DIR }}/** path: ${{ env.INSTALL_DIR }}/**
- name: Upload binary zip (Windows, portable) - name: Upload binary zip (Windows, portable)
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }} name: ShatteredPrism-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
path: ${{ env.INSTALL_PORTABLE_DIR }}/** path: ${{ env.INSTALL_PORTABLE_DIR }}/**
- name: Upload installer (Windows) - name: Upload installer (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }} name: ShatteredPrism-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
path: FjordLauncher-Setup.exe path: ShatteredPrism-Setup.exe
- name: Upload binary tarball (Linux, portable, Qt 5) - name: Upload binary tarball (Linux, portable, Qt 5)
if: runner.os == 'Linux' && matrix.qt_ver != 6 if: runner.os == 'Linux' && matrix.qt_ver != 6
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ runner.os }}-Qt5-Portable-${{ env.VERSION }}-${{ inputs.build_type }} name: ShatteredPrism-${{ runner.os }}-Qt5-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
path: FjordLauncher-portable.tar.gz path: ShatteredPrism-portable.tar.gz
- name: Upload binary tarball (Linux, portable, Qt 6) - name: Upload binary tarball (Linux, portable, Qt 6)
if: runner.os == 'Linux' && matrix.qt_ver != 5 if: runner.os == 'Linux' && matrix.qt_ver != 5
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }} name: ShatteredPrism-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
path: FjordLauncher-portable.tar.gz path: ShatteredPrism-portable.tar.gz
- name: Upload AppImage (Linux) - name: Upload AppImage (Linux)
if: runner.os == 'Linux' && matrix.qt_ver != 5 if: runner.os == 'Linux' && matrix.qt_ver != 5
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage name: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
path: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage path: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
- name: Upload AppImage Zsync (Linux) - name: Upload AppImage Zsync (Linux)
if: runner.os == 'Linux' && matrix.qt_ver != 5 if: runner.os == 'Linux' && matrix.qt_ver != 5
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync name: ShatteredPrism-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync
path: FjordLauncher-Linux-x86_64.AppImage.zsync path: ShatteredPrism-Linux-x86_64.AppImage.zsync
- name: ccache stats (Windows MinGW-w64) - name: ccache stats (Windows MinGW-w64)
if: runner.os == 'Windows' && matrix.msystem != '' if: runner.os == 'Windows' && matrix.msystem != ''
@ -645,8 +645,8 @@ jobs:
if: inputs.build_type == 'Debug' if: inputs.build_type == 'Debug'
uses: flatpak/flatpak-github-actions/flatpak-builder@v6 uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with: with:
bundle: "Fjord Launcher.flatpak" bundle: "Shattered Prism.flatpak"
manifest-path: flatpak/org.unmojang.FjordLauncher.yml manifest-path: flatpak/org.lunaislazier.ShatteredPrism.yml
nix: nix:
name: Nix (${{ matrix.system }}) name: Nix (${{ matrix.system }})
@ -691,9 +691,9 @@ jobs:
- name: Build debug package - name: Build debug package
if: ${{ inputs.build_type == 'Debug' }} if: ${{ inputs.build_type == 'Debug' }}
run: | run: |
nix build --print-build-logs .#fjordlauncher-debug nix build --print-build-logs .#shatteredprism-debug
- name: Build release package - name: Build release package
if: ${{ inputs.build_type != 'Debug' }} if: ${{ inputs.build_type != 'Debug' }}
run: | run: |
nix build --print-build-logs .#fjordlauncher nix build --print-build-logs .#shatteredprism

View File

@ -1,6 +1,7 @@
name: Build Application and Make Release name: Build Application and Make Release
on: on:
workflow_dispatch:
push: push:
tags: tags:
- "*" - "*"
@ -36,7 +37,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: "true" submodules: "true"
path: "FjordLauncher-source" path: "ShatteredPrism-source"
- name: Download artifacts - name: Download artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
- name: Grab and store version - name: Grab and store version
@ -45,38 +46,38 @@ jobs:
echo "VERSION=$tag_name" >> $GITHUB_ENV echo "VERSION=$tag_name" >> $GITHUB_ENV
- name: Package artifacts properly - name: Package artifacts properly
run: | run: |
mv ${{ github.workspace }}/FjordLauncher-source FjordLauncher-${{ env.VERSION }} mv ${{ github.workspace }}/ShatteredPrism-source ShatteredPrism-${{ env.VERSION }}
mv FjordLauncher-Linux-Qt6-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz mv ShatteredPrism-Linux-Qt6-Portable*/ShatteredPrism-portable.tar.gz ShatteredPrism-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
mv FjordLauncher-Linux-Qt5-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz mv ShatteredPrism-Linux-Qt5-Portable*/ShatteredPrism-portable.tar.gz ShatteredPrism-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
mv FjordLauncher-*.AppImage/FjordLauncher-*.AppImage FjordLauncher-Linux-x86_64.AppImage mv ShatteredPrism-*.AppImage/ShatteredPrism-*.AppImage ShatteredPrism-Linux-x86_64.AppImage
mv FjordLauncher-*.AppImage.zsync/FjordLauncher-*.AppImage.zsync FjordLauncher-Linux-x86_64.AppImage.zsync mv ShatteredPrism-*.AppImage.zsync/ShatteredPrism-*.AppImage.zsync ShatteredPrism-Linux-x86_64.AppImage.zsync
mv FjordLauncher-macOS-Legacy*/FjordLauncher.zip FjordLauncher-macOS-Legacy-${{ env.VERSION }}.zip mv ShatteredPrism-macOS-Legacy*/ShatteredPrism.zip ShatteredPrism-macOS-Legacy-${{ env.VERSION }}.zip
mv FjordLauncher-macOS*/FjordLauncher.zip FjordLauncher-macOS-${{ env.VERSION }}.zip mv ShatteredPrism-macOS*/ShatteredPrism.zip ShatteredPrism-macOS-${{ env.VERSION }}.zip
tar --exclude='.git' -czf FjordLauncher-${{ env.VERSION }}.tar.gz FjordLauncher-${{ env.VERSION }} tar --exclude='.git' -czf ShatteredPrism-${{ env.VERSION }}.tar.gz ShatteredPrism-${{ env.VERSION }}
for d in FjordLauncher-Windows-MSVC*; do for d in ShatteredPrism-Windows-MSVC*; do
cd "${d}" || continue cd "${d}" || continue
LEGACY="$(echo -n ${d} | grep -o Legacy || true)" LEGACY="$(echo -n ${d} | grep -o Legacy || true)"
ARM64="$(echo -n ${d} | grep -o arm64 || true)" ARM64="$(echo -n ${d} | grep -o arm64 || true)"
INST="$(echo -n ${d} | grep -o Setup || true)" INST="$(echo -n ${d} | grep -o Setup || true)"
PORT="$(echo -n ${d} | grep -o Portable || true)" PORT="$(echo -n ${d} | grep -o Portable || true)"
NAME="FjordLauncher-Windows-MSVC" NAME="ShatteredPrism-Windows-MSVC"
test -z "${LEGACY}" || NAME="${NAME}-Legacy" test -z "${LEGACY}" || NAME="${NAME}-Legacy"
test -z "${ARM64}" || NAME="${NAME}-arm64" test -z "${ARM64}" || NAME="${NAME}-arm64"
test -z "${PORT}" || NAME="${NAME}-Portable" test -z "${PORT}" || NAME="${NAME}-Portable"
test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe test -z "${INST}" || mv ShatteredPrism-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" * test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
cd .. cd ..
done done
for d in FjordLauncher-Windows-MinGW-w64*; do for d in ShatteredPrism-Windows-MinGW-w64*; do
cd "${d}" || continue cd "${d}" || continue
INST="$(echo -n ${d} | grep -o Setup || true)" INST="$(echo -n ${d} | grep -o Setup || true)"
PORT="$(echo -n ${d} | grep -o Portable || true)" PORT="$(echo -n ${d} | grep -o Portable || true)"
NAME="FjordLauncher-Windows-MinGW-w64" NAME="ShatteredPrism-Windows-MinGW-w64"
test -z "${PORT}" || NAME="${NAME}-Portable" test -z "${PORT}" || NAME="${NAME}-Portable"
test -z "${INST}" || mv FjordLauncher-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe test -z "${INST}" || mv ShatteredPrism-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" * test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
cd .. cd ..
done done
@ -87,23 +88,23 @@ jobs:
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ github.ref }} tag_name: ${{ github.ref }}
name: Fjord Launcher ${{ env.VERSION }} name: Shattered Prism ${{ env.VERSION }}
draft: true draft: true
prerelease: false prerelease: false
files: | files: |
FjordLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz ShatteredPrism-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
FjordLauncher-Linux-x86_64.AppImage ShatteredPrism-Linux-x86_64.AppImage
FjordLauncher-Linux-x86_64.AppImage.zsync ShatteredPrism-Linux-x86_64.AppImage.zsync
FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz ShatteredPrism-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
FjordLauncher-Windows-MinGW-w64-${{ env.VERSION }}.zip ShatteredPrism-Windows-MinGW-w64-${{ env.VERSION }}.zip
FjordLauncher-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip ShatteredPrism-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip
FjordLauncher-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe ShatteredPrism-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe
FjordLauncher-Windows-MSVC-arm64-${{ env.VERSION }}.zip ShatteredPrism-Windows-MSVC-arm64-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip ShatteredPrism-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe ShatteredPrism-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe
FjordLauncher-Windows-MSVC-${{ env.VERSION }}.zip ShatteredPrism-Windows-MSVC-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-Portable-${{ env.VERSION }}.zip ShatteredPrism-Windows-MSVC-Portable-${{ env.VERSION }}.zip
FjordLauncher-Windows-MSVC-Setup-${{ env.VERSION }}.exe ShatteredPrism-Windows-MSVC-Setup-${{ env.VERSION }}.exe
FjordLauncher-macOS-${{ env.VERSION }}.zip ShatteredPrism-macOS-${{ env.VERSION }}.zip
FjordLauncher-macOS-Legacy-${{ env.VERSION }}.zip ShatteredPrism-macOS-Legacy-${{ env.VERSION }}.zip
FjordLauncher-${{ env.VERSION }}.tar.gz ShatteredPrism-${{ env.VERSION }}.tar.gz

View File

@ -192,7 +192,7 @@ set(Launcher_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_M
set(Launcher_BUILD_PLATFORM "unknown" CACHE STRING "A short string identifying the platform that this build was built for. Only used to display in the about dialog.") set(Launcher_BUILD_PLATFORM "unknown" CACHE STRING "A short string identifying the platform that this build was built for. Only used to display in the about dialog.")
# Github repo URL with releases for updater # Github repo URL with releases for updater
set(Launcher_UPDATER_GITHUB_REPO "https://github.com/unmojang/FjordLauncher" CACHE STRING "Base github URL for the updater.") set(Launcher_UPDATER_GITHUB_REPO "https://github.com/lunaislazier/ShatteredPrism" CACHE STRING "Base github URL for the updater.")
# Name to help updater identify valid artifacts # Name to help updater identify valid artifacts
set(Launcher_BUILD_ARTIFACT "" CACHE STRING "Artifact name to help the updater identify valid artifacts.") set(Launcher_BUILD_ARTIFACT "" CACHE STRING "Artifact name to help the updater identify valid artifacts.")
@ -204,7 +204,7 @@ set(Launcher_META_URL "https://meta.unmojang.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") set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
# Bug tracker URL # Bug tracker URL
set(Launcher_BUG_TRACKER_URL "https://github.com/unmojang/FjordLauncher/issues" CACHE STRING "URL for the bug tracker.") set(Launcher_BUG_TRACKER_URL "https://github.com/lunaislazier/ShatteredPrism/issues" CACHE STRING "URL for the bug tracker.")
# Translations Platform URL # Translations Platform URL
set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.") set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.")
@ -350,7 +350,7 @@ include(ECMQtDeclareLoggingCategory)
####################################### Program Info ####################################### ####################################### Program Info #######################################
set(Launcher_APP_BINARY_NAME "fjordlauncher" CACHE STRING "Name of the Launcher binary") set(Launcher_APP_BINARY_NAME "shatteredprism" CACHE STRING "Name of the Launcher binary")
add_subdirectory(program_info) add_subdirectory(program_info)
####################################### Install layout ####################################### ####################################### Install layout #######################################

110
README.md
View File

@ -1,104 +1,40 @@
# <img src="./program_info/org.unmojang.FjordLauncher.svg" alt="Fjord Launcher logo" width="96"/> Fjord Launcher <p align="center">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="/program_info/shatteredprism-header.svg">
<source media="(prefers-color-scheme: light)" srcset="/program_info/shatteredprism-header.svg">
<img alt="ShatteredPrism" src="/program_info/shatteredprism-header.svg" width="40%">
</picture>
</p>
Fjord Launcher is a **fork** of [Prism Launcher](https://github.com/PrismLauncher/PrismLauncher). It was based on [PollyMC](https://github.com/fn2006/PollyMC), which is now unmaintained. It is **not** endorsed by or affiliated with Prism Launcher or PollyMC. <p align="center">
ShatteredPrism is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.<br />
<br />This is a <b>fork</b> of PrismLauncher and is <b>not</b> endorsed by it.
</p>
## Advantages of this fork over Prism Launcher # Advantages over PrismLauncher
- [Support for alternative auth servers](doc/alternative-auth-servers.md) - Completely DRM-Free.
- In-App FTB Modpack Downloading restored.
- Support 3rd Party Auth Servers(courtesy of [this project](https://github.com/fn2006/PollyMC/)).
- Ability to download FTB modpacks from within the launcher
## Having a problem with the launcher?
You **will not** open an issue in the Prism Launcher repo.
You **will not** ask about Fjord Launcher in the Prism Launcher discord.
You **will** ask in #fjord-launcher in our [Matrix space](https://matrix.to/#/#unmojang:matrix.org).
You **will** open an issue [here](https://github.com/unmojang/FjordLauncher/issues).
## Installation ## Installation
### Windows - Downloads can be found on the [GitHub Releases](https://github.com/LunaisLazier/ShatteredPrism/releases).
- Last build status can be found in the [GitHub Actions](https://github.com/LunaisLazier/ShatteredPrism/actions) tab (this also includes the pull requests status).
#### [Scoop](https://scoop.sh) (recommended) ## Community & Support
```PowerShell Feel free to create a GitHub issue if you find a bug or want to suggest something, it is currently the **only** way to contact anyone regarding this project.
scoop bucket add unmojang https://github.com/unmojang/scoop-unmojang
scoop install unmojang/fjordlauncher
```
#### Windows (Manual) Do **not** ask for support on any of the official PrismLauncher channels as they cannot be held responsible for any issues caused by the changes made.
You can get installers or portable builds from the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest), MSVC builds are recommended over MinGW builds, but there's no real difference.
### macOS ## License [![https://github.com/PrismLauncher/PrismLauncher/blob/develop/LICENSE](https://img.shields.io/github/license/PrismLauncher/PrismLauncher?label=License&logo=gnu&color=C4282D)](LICENSE)
#### [Homebrew](https://brew.sh) (recommended) All launcher code is available under the GPL-3.0-only license.
```Shell The logo and related assets are under the CC BY-NC-SA 4.0 license.
brew tap unmojang/homebrew-unmojang
brew install --cask fjordlauncher
```
#### macOS (Manual)
There are builds for macOS in the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest).
### Flatpak
```Shell
flatpak remote-add --user --if-not-exists unmojang https://unmojang.github.io/unmojang-flatpak/index.flatpakrepo
flatpak install org.unmojang.FjordLauncher
```
### Arch Linux
Fjord Launcher is [available](https://aur.archlinux.org/packages?O=0&K=fjordlauncher) from the AUR:
```Shell
paru -S fjordlauncher
paru -S fjordlauncher-git # build latest Git commit from source
```
`fjordlauncher` is available in [Chaotic-AUR](https://aur.chaotic.cx/).
The `fjordlauncher-bin` AUR package is broken; see [https://github.com/unmojang/FjordLauncher/issues/20](https://github.com/unmojang/FjordLauncher/issues/20).
### Debian/Ubuntu
Install from the MPR with [Mist](https://docs.makedeb.org/using-the-mpr/mist-the-mpr-cli/#installing-mist):
```Shell
mist install fjordlauncher
mist install fjordlauncher-bin # binary package
mist install fjordlauncher-git # build latest Git commit from source
```
### Nix
This repository contains a Nix flake:
```Shell
nix run github:unmojang/FjordLauncher
```
See [nix/README.md](nix/README.md) for details.
### Gentoo
Install from the [unmojang overlay](https://github.com/unmojang/unmojang-overlay):
```Shell
eselect repository add unmojang-overlay git https://github.com/unmojang/unmojang-overlay
emerge --sync unmojang-overlay
emerge -av games-action/fjordlauncher
```
### Other Linux
AppImages are available in the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest).
## Building ## Building

View File

@ -1,11 +1,11 @@
id: org.unmojang.FjordLauncher id: org.lunaislazier.ShatteredPrism
runtime: org.kde.Platform runtime: org.kde.Platform
runtime-version: 6.7 runtime-version: 6.7
sdk: org.kde.Sdk sdk: org.kde.Sdk
sdk-extensions: sdk-extensions:
- org.freedesktop.Sdk.Extension.openjdk17 - org.freedesktop.Sdk.Extension.openjdk17
command: fjordlauncher command: shatteredprism
finish-args: finish-args:
- --share=ipc - --share=ipc
- --socket=x11 - --socket=x11
@ -27,7 +27,7 @@ modules:
# Needed for proper Wayland support # Needed for proper Wayland support
- libdecor.json - libdecor.json
- name: fjordlauncher - name: shatteredprism
buildsystem: cmake-ninja buildsystem: cmake-ninja
builddir: true builddir: true
config-opts: config-opts:
@ -135,10 +135,10 @@ modules:
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- install -Dm755 prime-run /app/bin/prime-run - install -Dm755 prime-run /app/bin/prime-run
- mv /app/bin/fjordlauncher /app/bin/fjordrun - mv /app/bin/shatteredprism /app/bin/shatteredrun
- install -Dm755 fjordlauncher /app/bin/fjordlauncher - install -Dm755 shatteredprism /app/bin/shatteredprism
sources: sources:
- type: file - type: file
path: prime-run path: prime-run
- type: file - type: file
path: fjordlauncher path: shatteredprism

View File

@ -8,4 +8,4 @@ done
export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin" export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/" export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/"
exec /app/bin/fjordrun "$@" exec /app/bin/shatteredrun "$@"

View File

@ -948,7 +948,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
// check update locks // check update locks
{ {
auto update_log_path = FS::PathCombine(m_dataPath, "logs", "fjordlauncher_update.log"); auto update_log_path = FS::PathCombine(m_dataPath, "logs", "shatteredprism_update.log");
auto update_lock = QFileInfo(FS::PathCombine(m_dataPath, ".prism_launcher_update.lock")); auto update_lock = QFileInfo(FS::PathCombine(m_dataPath, ".prism_launcher_update.lock"));
if (update_lock.exists()) { if (update_lock.exists()) {
@ -962,7 +962,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
"\n" "\n"
"This likely means that a update attempt failed. Please ensure your installation is in working order before " "This likely means that a update attempt failed. Please ensure your installation is in working order before "
"proceeding.\n" "proceeding.\n"
"Check the Fjord Launcher updater log at: \n" "Check the Shattered Prism updater log at: \n"
"%7\n" "%7\n"
"for details on the last update attempt.\n" "for details on the last update attempt.\n"
"\n" "\n"
@ -998,7 +998,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
"\n" "\n"
"Please ensure your installation is in working order before " "Please ensure your installation is in working order before "
"proceeding.\n" "proceeding.\n"
"Check the Fjord Launcher updater log at: \n" "Check the Shattered Prism updater log at: \n"
"%1\n" "%1\n"
"for details on the last update attempt.") "for details on the last update attempt.")
.arg(update_log_path); .arg(update_log_path);
@ -1029,7 +1029,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
auto infoMsg = tr("Update succeeded\n" auto infoMsg = tr("Update succeeded\n"
"\n" "\n"
"You are now running %1 .\n" "You are now running %1 .\n"
"Check the Fjord Launcher updater log at: \n" "Check the Shattered Prism updater log at: \n"
"%2\n" "%2\n"
"for details.") "for details.")
.arg(BuildConfig.printableVersionString()) .arg(BuildConfig.printableVersionString())
@ -1249,7 +1249,7 @@ void Application::performMainStartupAction()
msgBox.setWindowTitle(tr("Fetch CurseForge Core API key?")); msgBox.setWindowTitle(tr("Fetch CurseForge Core API key?"));
msgBox.setText(tr("Would you like to fetch the official CurseForge app's API key now?")); msgBox.setText(tr("Would you like to fetch the official CurseForge app's API key now?"));
msgBox.setInformativeText( msgBox.setInformativeText(
tr("Using the official CurseForge app's API key may break CurseForge's terms of service but should allow Fjord Launcher " tr("Using the official CurseForge app's API key may break CurseForge's terms of service but should allow Shattered Prism "
"to download all mods in a modpack without you needing to download any of them manually.")); "to download all mods in a modpack without you needing to download any of them manually."));
msgBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes); msgBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
msgBox.setDefaultButton(QMessageBox::Yes); msgBox.setDefaultButton(QMessageBox::Yes);

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 152 KiB

View File

@ -72,7 +72,18 @@ QString getCreditsHtml()
stream << "<center>\n"; stream << "<center>\n";
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers" //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n"; stream << "<h3>" << QObject::tr("%1 Developer", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
stream << QString("<p>LunaisLazier %1</p>\n").arg(getGitHub("lunaislazier"));
stream << "<br />\n";
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
stream << QString("<p>Chaiznt %1</p>\n").arg(getGitHub("chai-znt"));
stream << QString("<p>Raia/Lichen %1</p>\n").arg(getWebsite("https://twitter.com/LichenOnaWall"));
stream << "<br />\n";
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg("Fjord Launcher") << "</h3>\n";
stream << QString("<p>Evan Goode %1</p>\n").arg(getGitHub("evan-goode")); stream << QString("<p>Evan Goode %1</p>\n").arg(getGitHub("evan-goode"));
stream << "<br />\n"; stream << "<br />\n";

View File

@ -294,7 +294,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you probably don't need to set this if CurseForge already works.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Using the official CurseForge app's API key may break CurseForge's terms of service but should allow Fjord Launcher to download all mods in a modpack without you needing to download any of them manually.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you probably don't need to set this if CurseForge already works.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Using the official CurseForge app's API key may break CurseForge's terms of service but should allow Shattered Prism to download all mods in a modpack without you needing to download any of them manually.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

View File

@ -11,24 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>Note: CurseForge allows creators to block access to third-party tools like Prism Launcher. As such, you may need to manually download some mods to be able to install a modpack.</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@ -120,4 +102,4 @@
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

View File

@ -46,7 +46,7 @@
QString BasicCatPack::path() QString BasicCatPack::path()
{ {
const auto now = QDate::currentDate(); const auto now = QDate::currentDate();
const auto birthday = QDate(now.year(), 11, 1); const auto birthday = QDate(now.year(), 2, 4);
const auto xmas = QDate(now.year(), 12, 25); const auto xmas = QDate(now.year(), 12, 25);
const auto halloween = QDate(now.year(), 10, 31); const auto halloween = QDate(now.year(), 10, 31);

View File

@ -57,7 +57,7 @@ PrismExternalUpdater::PrismExternalUpdater(QWidget* parent, const QString& appDi
priv = new PrismExternalUpdater::Private(); priv = new PrismExternalUpdater::Private();
priv->appDir = QDir(appDir); priv->appDir = QDir(appDir);
priv->dataDir = QDir(dataDir); priv->dataDir = QDir(dataDir);
auto settings_file = priv->dataDir.absoluteFilePath("fjordlauncher_update.cfg"); auto settings_file = priv->dataDir.absoluteFilePath("shatteredprism_update.cfg");
priv->settings = std::make_unique<QSettings>(settings_file, QSettings::Format::IniFormat); priv->settings = std::make_unique<QSettings>(settings_file, QSettings::Format::IniFormat);
priv->allowBeta = priv->settings->value("allow_beta", false).toBool(); priv->allowBeta = priv->settings->value("allow_beta", false).toBool();
priv->autoCheck = priv->settings->value("auto_check", false).toBool(); priv->autoCheck = priv->settings->value("auto_check", false).toBool();

View File

@ -218,11 +218,11 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
// Command line parsing // Command line parsing
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription(QObject::tr("An auto-updater for Fjord Launcher")); parser.setApplicationDescription(QObject::tr("An auto-updater for Shattered Prism"));
parser.addOptions( parser.addOptions(
{ { { "d", "dir" }, tr("Use a custom path as application root (use '.' for current directory)."), tr("directory") }, { { { "d", "dir" }, tr("Use a custom path as application root (use '.' for current directory)."), tr("directory") },
{ { "V", "fjordlauncher-version" }, { { "V", "shatteredprism-version" },
tr("Use this version as the installed launcher version. (provided because stdout can not be reliably captured on windows)"), tr("Use this version as the installed launcher version. (provided because stdout can not be reliably captured on windows)"),
tr("installed launcher version") }, tr("installed launcher version") },
{ { "I", "install-version" }, "Install a specific version.", tr("version name") }, { { "I", "install-version" }, "Install a specific version.", tr("version name") },
@ -286,7 +286,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
m_selectUI = parser.isSet("select-ui"); m_selectUI = parser.isSet("select-ui");
m_allowDowngrade = parser.isSet("allow-downgrade"); m_allowDowngrade = parser.isSet("allow-downgrade");
auto version = parser.value("fjordlauncher-version"); auto version = parser.value("shatteredprism-version");
if (!version.isEmpty()) { if (!version.isEmpty()) {
if (version.contains('-')) { if (version.contains('-')) {
auto index = version.indexOf('-'); auto index = version.indexOf('-');
@ -364,7 +364,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
#endif #endif
} }
m_updateLogPath = FS::PathCombine(m_dataPath, "logs", "fjordlauncher_update.log"); m_updateLogPath = FS::PathCombine(m_dataPath, "logs", "shatteredprism_update.log");
{ // setup logging { // setup logging
FS::ensureFolderPathExists(FS::PathCombine(m_dataPath, "logs")); FS::ensureFolderPathExists(FS::PathCombine(m_dataPath, "logs"));
@ -588,7 +588,7 @@ void PrismUpdaterApp::run()
if (m_isFlatpak) { if (m_isFlatpak) {
showFatalErrorMessage(tr("Updating flatpack not supported"), tr("Actions outside of checking if an update is available are not " showFatalErrorMessage(tr("Updating flatpack not supported"), tr("Actions outside of checking if an update is available are not "
"supported when running the flatpak version of Fjord Launcher.")); "supported when running the flatpak version of Shattered Prism."));
return; return;
} }
if (m_isAppimage) { if (m_isAppimage) {
@ -1111,13 +1111,13 @@ void PrismUpdaterApp::backupAppDir()
if (file_list.isEmpty()) { if (file_list.isEmpty()) {
// best guess // best guess
if (BuildConfig.BUILD_ARTIFACT.toLower().contains("linux")) { if (BuildConfig.BUILD_ARTIFACT.toLower().contains("linux")) {
file_list.append({ "FjordLauncher", "bin", "share", "lib" }); file_list.append({ "ShatteredPrism", "bin", "share", "lib" });
} else { // windows by process of elimination } else { // windows by process of elimination
file_list.append({ file_list.append({
"jars", "jars",
"fjordlauncher.exe", "shatteredprism.exe",
"fjordlauncher_filelink.exe", "shatteredprism_filelink.exe",
"fjordlauncher_updater.exe", "shatteredprism_updater.exe",
"qtlogging.ini", "qtlogging.ini",
"imageformats", "imageformats",
"iconengines", "iconengines",

View File

@ -8,8 +8,8 @@ if(UNIX)
endif() endif()
endif() endif()
set(Launcher_CommonName "FjordLauncher") set(Launcher_CommonName "ShatteredPrism")
set(Launcher_DisplayName "Fjord Launcher") set(Launcher_DisplayName "Shattered Prism")
set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
@ -19,28 +19,28 @@ set(Launcher_Copyright_Mac "© 2024-2024 Fjord Launcher Contributors, © 2022-20
set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE) set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
set(Launcher_Domain "" PARENT_SCOPE) set(Launcher_Domain "" PARENT_SCOPE)
set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE) set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE)
set(Launcher_ConfigFile "fjordlauncher.cfg" PARENT_SCOPE) set(Launcher_ConfigFile "shatteredprism.cfg" PARENT_SCOPE)
set(Launcher_Git "https://github.com/unmojang/FjordLauncher" PARENT_SCOPE) set(Launcher_Git "https://github.com/lunaislazier/ShatteredPrism" PARENT_SCOPE)
set(Launcher_DesktopFileName "org.unmojang.FjordLauncher.desktop" PARENT_SCOPE) set(Launcher_DesktopFileName "org.lunaislazier.ShatteredPrism.desktop" PARENT_SCOPE)
set(Launcher_SVGFileName "org.unmojang.FjordLauncher.svg" PARENT_SCOPE) set(Launcher_SVGFileName "org.lunaislazier.ShatteredPrism.svg" PARENT_SCOPE)
set(Launcher_Desktop "program_info/org.unmojang.FjordLauncher.desktop" PARENT_SCOPE) set(Launcher_Desktop "program_info/org.lunaislazier.ShatteredPrism.desktop" PARENT_SCOPE)
set(Launcher_mrpack_MIMEInfo "program_info/modrinth-mrpack-mime.xml" PARENT_SCOPE) set(Launcher_mrpack_MIMEInfo "program_info/modrinth-mrpack-mime.xml" PARENT_SCOPE)
set(Launcher_MetaInfo "program_info/org.unmojang.FjordLauncher.metainfo.xml" PARENT_SCOPE) set(Launcher_MetaInfo "program_info/org.lunaislazier.ShatteredPrism.metainfo.xml" PARENT_SCOPE)
set(Launcher_SVG "program_info/org.unmojang.FjordLauncher.svg" PARENT_SCOPE) set(Launcher_SVG "program_info/org.lunaislazier.ShatteredPrism.svg" PARENT_SCOPE)
set(Launcher_Branding_ICNS "program_info/fjordlauncher.icns" PARENT_SCOPE) set(Launcher_Branding_ICNS "program_info/shatteredprism.icns" PARENT_SCOPE)
set(Launcher_Branding_ICO "program_info/fjordlauncher.ico") set(Launcher_Branding_ICO "program_info/shatteredprism.ico")
set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE) set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)
set(Launcher_Branding_WindowsRC "program_info/fjordlauncher.rc" PARENT_SCOPE) set(Launcher_Branding_WindowsRC "program_info/shatteredprism.rc" PARENT_SCOPE)
set(Launcher_Branding_LogoQRC "program_info/fjordlauncher.qrc" PARENT_SCOPE) set(Launcher_Branding_LogoQRC "program_info/shatteredprism.qrc" PARENT_SCOPE)
set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE) set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE)
configure_file(org.unmojang.FjordLauncher.desktop.in org.unmojang.FjordLauncher.desktop) configure_file(org.lunaislazier.ShatteredPrism.desktop.in org.lunaislazier.ShatteredPrism.desktop)
configure_file(org.unmojang.FjordLauncher.metainfo.xml.in org.unmojang.FjordLauncher.metainfo.xml) configure_file(org.lunaislazier.ShatteredPrism.metainfo.xml.in org.lunaislazier.ShatteredPrism.metainfo.xml)
configure_file(fjordlauncher.rc.in fjordlauncher.rc @ONLY) configure_file(shatteredprism.rc.in shatteredprism.rc @ONLY)
configure_file(fjordlauncher.manifest.in fjordlauncher.manifest @ONLY) configure_file(shatteredprism.manifest.in shatteredprism.manifest @ONLY)
configure_file(fjordlauncher.ico fjordlauncher.ico COPYONLY) configure_file(shatteredprism.ico shatteredprism.ico COPYONLY)
if(MSVC) if(MSVC)
set(Launcher_MSVC_Redist_NSIS_Section [=[ set(Launcher_MSVC_Redist_NSIS_Section [=[
@ -69,13 +69,13 @@ endif()
configure_file(win_install.nsi.in win_install.nsi @ONLY) configure_file(win_install.nsi.in win_install.nsi @ONLY)
if(SCDOC_FOUND) if(SCDOC_FOUND)
set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/fjordlauncher.6.scd") set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/shatteredprism.6.scd")
set(out_man "${CMAKE_CURRENT_BINARY_DIR}/fjordlauncher.6") set(out_man "${CMAKE_CURRENT_BINARY_DIR}/shatteredprism.6")
add_custom_command( add_custom_command(
DEPENDS "${in_scd}" DEPENDS "${in_scd}"
OUTPUT "${out_man}" OUTPUT "${out_man}"
COMMAND ${SCDOC_SCDOC} < "${in_scd}" > "${out_man}" COMMAND ${SCDOC_SCDOC} < "${in_scd}" > "${out_man}"
) )
add_custom_target(man ALL DEPENDS ${out_man}) add_custom_target(man ALL DEPENDS ${out_man})
set(Launcher_ManPage "program_info/fjordlauncher.6" PARENT_SCOPE) set(Launcher_ManPage "program_info/shatteredprism.6" PARENT_SCOPE)
endif() endif()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 KiB

View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC> <!DOCTYPE RCC>
<RCC version="1.0"> <RCC version="1.0">
<qresource prefix="/"> <qresource prefix="/">
<file>org.unmojang.FjordLauncher.svg</file> <file>org.lunaislazier.ShatteredPrism.svg</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -10,7 +10,7 @@ svg2png() {
} }
if command -v "svgo"; then if command -v "svgo"; then
svgo org.unmojang.FjordLauncher.Source.svg -o org.unmojang.FjordLauncher.svg svgo org.lunaislazier.ShatteredPrism.Source.svg -o org.lunaislazier.ShatteredPrism.svg
else else
echo 'ERROR: svgo not in $PATH' echo 'ERROR: svgo not in $PATH'
fi fi
@ -19,22 +19,22 @@ if command -v "inkscape" && command -v "icotool"; then
# Windows ICO # Windows ICO
d=$(mktemp -d) d=$(mktemp -d)
svg2png org.unmojang.FjordLauncher.svg "$d/fjordlauncher_16.png" 16 16 svg2png org.lunaislazier.ShatteredPrism.svg "$d/shatteredprism_16.png" 16 16
svg2png org.unmojang.FjordLauncher.svg "$d/fjordlauncher_24.png" 24 24 svg2png org.lunaislazier.ShatteredPrism.svg "$d/shatteredprism_24.png" 24 24
svg2png org.unmojang.FjordLauncher.svg "$d/fjordlauncher_32.png" 32 32 svg2png org.lunaislazier.ShatteredPrism.svg "$d/shatteredprism_32.png" 32 32
svg2png org.unmojang.FjordLauncher.svg "$d/fjordlauncher_48.png" 48 48 svg2png org.lunaislazier.ShatteredPrism.svg "$d/shatteredprism_48.png" 48 48
svg2png org.unmojang.FjordLauncher.svg "$d/fjordlauncher_64.png" 64 64 svg2png org.lunaislazier.ShatteredPrism.svg "$d/shatteredprism_64.png" 64 64
svg2png org.unmojang.FjordLauncher.svg "$d/fjordlauncher_128.png" 128 128 svg2png org.lunaislazier.ShatteredPrism.svg "$d/shatteredprism_128.png" 128 128
svg2png org.unmojang.FjordLauncher.svg "$d/fjordlauncher_256.png" 256 256 svg2png org.lunaislazier.ShatteredPrism.svg "$d/shatteredprism_256.png" 256 256
rm fjordlauncher.ico && icotool -o fjordlauncher.ico -c \ rm shatteredprism.ico && icotool -o shatteredprism.ico -c \
"$d/fjordlauncher_256.png" \ "$d/shatteredprism_256.png" \
"$d/fjordlauncher_128.png" \ "$d/shatteredprism_128.png" \
"$d/fjordlauncher_64.png" \ "$d/shatteredprism_64.png" \
"$d/fjordlauncher_48.png" \ "$d/shatteredprism_48.png" \
"$d/fjordlauncher_32.png" \ "$d/shatteredprism_32.png" \
"$d/fjordlauncher_24.png" \ "$d/shatteredprism_24.png" \
"$d/fjordlauncher_16.png" "$d/shatteredprism_16.png"
else else
echo "ERROR: Windows icons were NOT generated!" >&2 echo "ERROR: Windows icons were NOT generated!" >&2
echo "ERROR: requires inkscape and icotool in PATH" echo "ERROR: requires inkscape and icotool in PATH"
@ -44,11 +44,11 @@ if command -v "inkscape" && command -v "magick"; then
# macOS ICNS # macOS ICNS
d=$(mktemp -d) d=$(mktemp -d)
d="$d/fjordlauncher.iconset" d="$d/shatteredprism.iconset"
mkdir -p "$d" mkdir -p "$d"
svg2png org.unmojang.FjordLauncher.bigsur.svg "$d/icon_512x512@2.png" 1024 1024 svg2png org.lunaislazier.ShatteredPrism.bigsur.svg "$d/icon_512x512@2.png" 1024 1024
magick convert "$d/icon_512x512@2.png" -resize 16x16 "$d/icon_16x16.png" magick convert "$d/icon_512x512@2.png" -resize 16x16 "$d/icon_16x16.png"
magick convert "$d/icon_512x512@2.png" -resize 32x32 "$d/icon_16x16@2.png" magick convert "$d/icon_512x512@2.png" -resize 32x32 "$d/icon_16x16@2.png"
magick convert "$d/icon_512x512@2.png" -resize 32x32 "$d/icon_32x32.png" magick convert "$d/icon_512x512@2.png" -resize 32x32 "$d/icon_32x32.png"
@ -57,11 +57,11 @@ if command -v "inkscape" && command -v "magick"; then
magick convert "$d/icon_512x512@2.png" -resize 256x256 "$d/icon_128x128@2.png" magick convert "$d/icon_512x512@2.png" -resize 256x256 "$d/icon_128x128@2.png"
magick convert "$d/icon_512x512@2.png" -resize 256x256 "$d/icon_256x256.png" magick convert "$d/icon_512x512@2.png" -resize 256x256 "$d/icon_256x256.png"
magick convert "$d/icon_512x512@2.png" -resize 512x512 "$d/icon_256x256@2.png" magick convert "$d/icon_512x512@2.png" -resize 512x512 "$d/icon_256x256@2.png"
magick convert "$d"/* fjordlauncher.icns magick convert "$d"/* shatteredprism.icns
else else
echo 'ERROR: macOS icons were NOT generated!' >&2 echo 'ERROR: macOS icons were NOT generated!' >&2
echo 'ERROR: requires inkscape and magick in $PATH' echo 'ERROR: requires inkscape and magick in $PATH'
fi fi
# replace icon in themes # replace icon in themes
cp -v org.unmojang.FjordLauncher.svg "../launcher/resources/multimc/scalable/launcher.svg" cp -v org.lunaislazier.Shatteredprism.svg "../launcher/resources/multimc/scalable/launcher.svg"

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 152 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 560 KiB

View File

@ -6,7 +6,7 @@ Type=Application
Terminal=false Terminal=false
Exec=@Launcher_APP_BINARY_NAME@ %U Exec=@Launcher_APP_BINARY_NAME@ %U
StartupNotify=true StartupNotify=true
Icon=org.unmojang.FjordLauncher Icon=org.lunaislazier.ShatteredPrism
Categories=Game;ActionGame;AdventureGame;Simulation; Categories=Game;ActionGame;AdventureGame;Simulation;
Keywords=game;minecraft;mc; Keywords=game;minecraft;mc;
StartupWMClass=@Launcher_CommonName@ StartupWMClass=@Launcher_CommonName@

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop"> <component type="desktop">
<id>org.unmojang.FjordLauncher</id> <id>org.lunaislazier.ShatteredPrism</id>
<launchable type="desktop-id">org.unmojang.FjordLauncher.desktop</launchable> <launchable type="desktop-id">org.lunaislazier.ShatteredPrism.desktop</launchable>
<name>Fjord Launcher</name> <name>Shattered Prism</name>
<developer_name>fn2006</developer_name> <developer_name>fn2006</developer_name>
<summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary> <summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-only</project_license> <project_license>GPL-3.0-only</project_license>
<url type="homepage">https://github.com/unmojang/FjordLauncher</url> <url type="homepage">https://github.com/lunaislazier/ShatteredPrism</url>
<url type="bugtracker">https://github.com/unmojang/FjordLauncher/issues</url> <url type="bugtracker">https://github.com/lunaislazier/ShatteredPrism/issues</url>
<description> <description>
<p>Fjord Launcher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p> <p>Shattered Prism is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
<p>Features:</p> <p>Features:</p>
<ul> <ul>
<li>Easily install game modifications, such as Fabric, Forge and Quilt</li> <li>Easily install game modifications, such as Fabric, Forge and Quilt</li>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 152 KiB

View File

@ -1,323 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="1024"
height="1024"
viewBox="0 0 270.93333 270.93333"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
sodipodi:docname="org.unmojang.FjordLauncher.Source.svg"
inkscape:export-filename="fjord/fjordfoground.png"
inkscape:export-xdpi="192"
inkscape:export-ydpi="192"
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="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="0.64557566"
inkscape:cx="438.36845"
inkscape:cy="625.02356"
inkscape:window-width="1353"
inkscape:window-height="1056"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg5" /><defs
id="defs2"><inkscape:path-effect
effect="fillet_chamfer"
id="path-effect47"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect46"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1"
radius="48"
unit="px"
method="auto"
mode="F"
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-effect45"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect44"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect43"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,26.458333,0,1"
radius="100"
unit="px"
method="auto"
mode="F"
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-effect42"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect41"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect40"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect39"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,19.408629,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect38"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
chamfer_steps="1"
flexible="false"
use_knot_distance="true"
apply_no_radius="true"
apply_with_radius="true"
only_selected="false"
hide_knots="false" /><linearGradient
id="linearGradient26"
inkscape:collect="always"><stop
style="stop-color:#00b9e7;stop-opacity:1;"
offset="0.13695651"
id="stop25" /><stop
style="stop-color:#146e8b;stop-opacity:1;"
offset="1"
id="stop26" /></linearGradient><linearGradient
id="linearGradient8"
inkscape:collect="always"><stop
style="stop-color:#094a29;stop-opacity:1;"
offset="0"
id="stop9" /><stop
style="stop-color:#137a4a;stop-opacity:1;"
offset="1"
id="stop10" /></linearGradient><linearGradient
id="linearGradient5"
inkscape:collect="always"><stop
style="stop-color:#094a29;stop-opacity:1;"
offset="0.54209745"
id="stop6" /><stop
style="stop-color:#137a4a;stop-opacity:1;"
offset="0.98260868"
id="stop8" /></linearGradient><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="-195.52928 : 112.88888 : 0"
inkscape:vp_y="0 : 999.99999 : 0"
inkscape:vp_z="140.9876 : 81.399227 : 0"
inkscape:persp3d-origin="164.61013 : 91.238891 : 1"
id="perspective22" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8"
id="linearGradient10"
x1="46.747211"
y1="201.23958"
x2="23.307659"
y2="64.527458"
gradientUnits="userSpaceOnUse" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5"
id="radialGradient17"
cx="149.52678"
cy="185.52985"
fx="149.52678"
fy="185.52985"
r="112.93989"
gradientTransform="matrix(-1.3751118,-0.28998256,0.19048676,-0.90329778,299.04025,358.86705)"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient26"
id="linearGradient25"
x1="106.92046"
y1="252.24748"
x2="134.95892"
y2="135.69524"
gradientUnits="userSpaceOnUse" /><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath47"><use
x="0"
y="0"
xlink:href="#g46"
id="use47" /></clipPath><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient23"
id="linearGradient24"
x1="192.82516"
y1="186.66386"
x2="60.806931"
y2="49.446285"
gradientUnits="userSpaceOnUse" /><linearGradient
id="linearGradient23"
inkscape:collect="always"><stop
style="stop-color:#d7eef4;stop-opacity:0;"
offset="0.13695651"
id="stop24" /><stop
style="stop-color:#d7eef4;stop-opacity:0.32810229;"
offset="1"
id="stop23" /></linearGradient></defs><g
id="g47"
clip-path="url(#clipPath47)"
transform="matrix(1.07041,0,0,1.07041,-9.5382066,-9.5382066)"
inkscape:label="group"><g
inkscape:label="Clip"
id="g46"><path
style="fill:none;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 39.276311,25.931307 89.828649,-51.862614 a 21.997041,21.997041 179.99999 0 1 21.99704,-2e-6 l 89.82868,51.862608 a 21.997047,21.997047 59.999997 0 1 10.99852,19.05 l 1e-5,103.725231 a 21.997039,21.997039 120 0 1 -10.99852,19.05 l -89.82867,51.86258 a 21.997061,21.997061 179.99999 0 1 -21.99705,0 L 39.276292,167.75656 a 21.99703,21.99703 59.999992 0 1 -10.998523,-19.05 l 1.8e-5,-103.725251 A 21.997054,21.997054 120 0 1 39.276311,25.931307 Z"
id="path45"
inkscape:path-effect="#path-effect46"
inkscape:original-d="M 28.277789,32.281309 140.10348,-32.281309 251.9292,32.281299 251.92921,161.40653 140.1035,225.96911 28.277767,161.40656 Z"
transform="translate(-4.636822,38.622765)"
inkscape:label="clip" /></g><path
style="display:inline;fill:#c0e3ef;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 135.46666,6.3414576 247.29238,70.904065 247.29239,200.0293 135.46668,264.59188 23.640946,200.02933 23.640967,70.904073 135.46666,6.3414576"
id="path4"
inkscape:label="sky-hexagon"
inkscape:path-effect="#path-effect47"
inkscape:original-d="M 135.46666,6.3414576 247.29238,70.904065 247.29239,200.0293 135.46668,264.59188 23.640946,200.02933 23.640967,70.904073 135.46666,6.3414576" /><path
style="display:inline;fill:url(#radialGradient17);stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 247.29238,71.772095 C 135.46666,6.3414576 23.640967,70.904073 23.640967,70.904073 l 1e-6,2e-6 111.825712,193.687805 114.05406,-63.69455 0.96335,-72.63679"
id="path3"
sodipodi:nodetypes="cccccc"
inkscape:label="back-face"
inkscape:transform-center-x="49.556022"
inkscape:transform-center-y="19.416688" /><path
style="display:inline;opacity:1;fill:url(#linearGradient25);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 135.46668,264.59188 c 0,0 51.66278,-39.92584 69.27008,-94.69866 8.91543,-27.73414 -40.45821,-68.00362 -83.33229,-63.01401 -72.551007,8.44336 -97.763524,-3.91716 -97.763524,-3.91716 v 97.06728 z"
id="path1"
sodipodi:nodetypes="cssccc"
inkscape:label="water" /><path
id="path8932"
style="display:inline;mix-blend-mode:normal;fill:#ffffff;stroke-width:0.0372549"
d="m 135.06162,62.147052 c -4.6759,0.06031 -7.35816,0.636259 -12.46186,2.675667 -8.86535,3.54254 -16.93953,11.913519 -21.57184,22.364441 -3.448219,7.779493 -5.293585,17.06716 -5.247075,26.40968 l 0.0092,1.85899 v 0 c 0.724021,8.28197 1.91971,16.14125 4.20176,23.19296 0.02102,-0.0137 -6.97e-4,-5.3e-4 0,0 0.01341,0.0135 0.217385,0.5779 0.453465,1.25408 3.18255,9.11482 8.66476,18.87046 14.84055,26.51125 6.88791,-3.54475 13.09495,-7.52358 17.97381,-12.4752 -3.66305,-4.33708 -7.36248,-10.12155 -9.8542,-15.49446 -1.33466,-2.87802 -3.27604,-7.96364 -3.41984,-8.95826 -6.9e-4,-0.009 -0.006,0.009 0,0 -2.16072,-7.45308 -2.71573,-15.18022 -2.07669,-22.05322 l 0.009,-0.0489 c -0.009,-0.1008 0.16527,-0.98641 0.32214,-1.92172 1.46061,-8.709769 5.01557,-15.308133 10.35724,-19.224331 1.09571,-0.803307 3.40564,-1.807845 4.97359,-2.162798 0.39696,-0.08989 1.2404,-0.134758 2.08438,-0.134824 0.84396,-5.2e-5 1.68863,0.04468 2.08826,0.134536 1.63785,0.368056 3.85369,1.332995 5.01991,2.185954 4.91633,3.59574 8.43158,9.765032 9.98782,17.399483 8.13291,1.56961 15.9818,4.38034 22.78109,7.8164 -0.085,-2.4202 -0.30899,-5.28866 -0.60881,-7.43184 -1.62233,-11.596017 -5.62047,-21.183105 -11.86196,-28.442326 -4.65327,-5.412075 -9.50033,-8.962923 -15.1663,-11.11095 -5.02548,-1.905213 -7.78668,-2.409656 -12.83425,-2.344539 z m -0.35993,43.639918 c -4.6419,0.045 -9.00869,0.40608 -13.29722,1.09224 -0.30751,7.73921 0.0949,15.10062 1.99264,21.78623 3.96329,-0.70282 7.9872,-1.06222 12.0069,-1.07709 4.02601,-0.0149 8.04808,0.31527 12.00036,0.99097 1.97168,0.3371 3.96436,0.7665 3.93717,0.84844 -5.2e-4,0.002 -0.0184,0.0627 -0.0205,0.0695 7.4808,1.87301 14.38572,5.21637 19.97921,9.19107 l -0.006,0.0483 c 0.0438,-0.10252 0.0723,-0.13491 0.10368,-0.10777 0.0336,0.0293 0.34658,0.27638 0.6949,0.54908 7.03394,5.50766 11.23119,11.88339 12.24625,18.6022 0.28723,1.90122 -0.0508,4.98034 -0.71301,6.49166 -1.05035,2.39736 -2.33588,3.90564 -4.7158,5.53394 -1.9399,1.32724 -5.06721,2.3016 -8.47538,2.64032 -3.53593,0.35142 -7.70219,-0.1378 -11.92167,-1.39959 -0.36402,-0.10882 -0.78069,-0.24201 -1.21489,-0.38665 -5.42873,6.25364 -11.80378,11.64092 -18.20693,15.81665 2.65182,1.42151 5.77765,2.86067 8.48755,3.87154 6.63575,2.47528 12.35628,3.71086 18.45997,3.98706 9.94747,0.4501 20.44984,-2.55765 26.78624,-7.67121 3.31418,-2.67463 4.47639,-3.7756 6.06224,-5.74331 1.10974,-1.37695 1.62413,-2.17008 3.42017,-5.27171 2.00044,-3.45474 3.30298,-7.89109 3.81836,-13.0053 0.44996,-4.46494 -0.0296,-8.85692 -1.51659,-13.89263 -0.25719,-0.87083 -0.47634,-1.61699 -0.48704,-1.65797 -0.24034,-0.91977 -1.54701,-4.10194 -2.37096,-5.77447 -3.91584,-7.94874 -10.72442,-15.60027 -19.14505,-21.51484 -2.03091,-1.42645 -4.74375,-3.10298 -9.68319,-5.54011 -4.93941,-2.43712 -12.33254,-5.28719 -15.96311,-6.02375 -3.63056,-0.73658 -3.90367,-0.79486 -4.22128,-0.8638 -3.4564,-0.75039 -9.28615,-1.40692 -13.69125,-1.54184 -0.78838,-0.0242 -1.56786,-0.0398 -2.3392,-0.0472 -0.67493,-0.006 -1.34377,-0.006 -2.0069,0 z m -42.35733,11.65349 c -7.068147,4.32792 -13.69569,10.26389 -18.181987,16.35238 -6.817393,9.25205 -10.115532,20.35221 -8.8555,29.80401 0.827949,6.21068 2.119154,9.77478 5.403573,14.91478 2.987119,4.67472 8.355144,9.26751 13.878965,11.87475 4.830793,2.28011 11.249824,3.77535 16.998589,3.95974 10.67998,0.34253 22.87575,-3.07274 33.0825,-9.26443 0.52251,-0.31697 0.96153,-0.58267 0.97582,-0.59066 0.002,-7.1e-4 0.0424,0.0245 0.0514,0.0276 6.85612,-4.72908 13.0507,-9.69798 18.04359,-15.18887 l -0.1125,-0.0502 0.27292,-0.30794 c 6.44865,-7.27984 12.62371,-17.6044 16.20241,-26.93295 -6.54186,-4.15178 -13.1122,-7.50244 -19.84676,-9.22463 -2.79259,7.84558 -8.02579,16.62566 -13.69129,22.81048 -0.30031,0.32785 -0.62916,0.67676 -0.73083,0.77538 l -2.91327,2.97584 c -2.72827,2.79679 -8.98552,7.07796 -15.2399,9.90652 0.0137,0.0179 0,-0.003 0,0 0,0.0262 -0.7791,0.34291 -1.82546,0.74151 -3.52004,1.34093 -7.44177,2.23735 -10.74805,2.4571 -3.94914,0.26248 -7.634957,-0.30459 -10.889124,-1.67577 -1.361607,-0.57374 -2.789607,-1.57771 -4.212155,-2.96076 -0.803254,-0.78095 -1.785178,-2.31484 -2.368,-3.69958 -0.471064,-1.11919 -0.893186,-4.09616 -0.767061,-5.41071 0.601301,-6.26734 4.073245,-12.29725 10.160966,-17.69199 -2.726947,-7.80836 -4.240475,-15.99779 -4.688789,-23.60162 z"
sodipodi:nodetypes="csscccccscccsccccssssscccssscscssscccscssssscccssssssccccccssscsssssssccccccsccccssssssccsss"
inkscape:label="trefoil" /><path
style="display:inline;mix-blend-mode:hard-light;fill:url(#linearGradient24);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 23.640947,200.02929 23.640969,70.904076 135.46666,6.3414576 249.52073,71.772095 l 1e-5,129.125235 -114.05406,63.69455 -111.825733,-64.56255"
id="path23"
inkscape:label="fog" /><path
style="fill:url(#linearGradient10);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 23.640946,200.02929 c 0,0 33.771353,-15.00232 43.543672,-52.9216 0,0 -8.31063,-42.97371 -43.54365,-76.203615 z"
id="path2"
sodipodi:nodetypes="cccc"
inkscape:label="left-face" /></g></svg>

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,487 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="1024"
height="1024"
viewBox="0 0 1024 1024"
fill="none"
version="1.1"
id="svg1070"
sodipodi:docname="org.unmojang.FjordLauncher.bigsur.svg"
xml:space="preserve"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
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="namedview1072"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="0.21069336"
inkscape:cx="512.59328"
inkscape:cy="514.9664"
inkscape:window-width="1920"
inkscape:window-height="1080"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg1070" /><g
filter="url(#filter0_d_102_69)"
id="g998"
style="display:inline"><path
fill-rule="evenodd"
clip-rule="evenodd"
d="m 924,354.627 c 0,-9.782 0.004,-19.565 -0.056,-29.348 -0.049,-8.241 -0.144,-16.48 -0.368,-24.717 -0.484,-17.953 -1.543,-36.06 -4.736,-53.813 -3.238,-18.008 -8.526,-34.769 -16.859,-51.132 -8.192,-16.083 -18.893,-30.8 -31.661,-43.559 -12.765,-12.759 -27.486,-23.453 -43.574,-31.64 -16.38,-8.335 -33.159,-13.621 -51.188,-16.858 -17.755,-3.188 -35.867,-4.245 -53.82,-4.73 -8.243,-0.223 -16.485,-0.317 -24.73,-0.368 -9.788,-0.06 -19.576,-0.055 -29.364,-0.055 L 553.997,98 h -85 l -111.636,0.407 c -9.807,0 -19.614,-0.005 -29.421,0.055 -8.262,0.051 -16.52,0.145 -24.779,0.368 -17.994,0.485 -36.147,1.543 -53.944,4.735 -18.053,3.236 -34.857,8.52 -51.259,16.849 -16.123,8.188 -30.875,18.883 -43.667,31.644 -12.79,12.758 -23.511,27.472 -31.718,43.552 -8.356,16.371 -13.654,33.142 -16.9,51.16 -3.196,17.746 -4.255,35.847 -4.742,53.792 -0.222,8.238 -0.318,16.477 -0.368,24.717 -0.06,9.784 -0.563,21.937 -0.563,31.72 l 0.003,110.09 -0.003,85.909 0.508,112.429 c 0,9.796 -0.004,19.592 0.055,29.388 0.05,8.252 0.146,16.502 0.369,24.751 0.486,17.976 1.547,36.109 4.746,53.886 3.245,18.032 8.542,34.817 16.891,51.201 8.208,16.106 18.931,30.842 31.722,43.619 12.791,12.777 27.539,23.485 43.659,31.684 16.412,8.346 33.224,13.639 51.288,16.88 17.789,3.193 35.936,4.252 53.923,4.737 8.259,0.223 16.518,0.318 24.78,0.368 9.807,0.06 19.613,0.056 29.42,0.056 L 470.006,922 h 85.211 l 112.427,-0.004 c 9.788,0 19.576,0.005 29.364,-0.055 8.245,-0.05 16.487,-0.145 24.73,-0.368 17.96,-0.486 36.078,-1.546 53.841,-4.741 18.018,-3.241 34.789,-8.532 51.16,-16.873 16.092,-8.198 30.815,-18.908 43.581,-31.687 12.766,-12.775 23.466,-27.509 31.658,-43.612 8.338,-16.392 13.626,-33.185 16.866,-51.229 3.19,-17.77 4.248,-35.896 4.733,-53.865 0.223,-8.25 0.318,-16.5 0.367,-24.751 0.061,-9.796 0.056,-19.592 0.056,-29.388 0,0 -0.006,-110.444 -0.006,-112.429 v -85.999 c 0,-1.466 0.006,-112.372 0.006,-112.372 z"
fill="url(#paint0_linear_102_69)"
id="path996"
style="display:inline" /></g><mask
id="mask0_102_69"
style="mask-type: alpha"
maskUnits="userSpaceOnUse"
x="100"
y="98"
width="824"
height="824"><path
fill-rule="evenodd"
clip-rule="evenodd"
d="M924 354.627C924 344.845 924.004 335.062 923.944 325.279C923.895 317.038 923.8 308.799 923.576 300.562C923.092 282.609 922.033 264.502 918.84 246.749C915.602 228.741 910.314 211.98 901.981 195.617C893.789 179.534 883.088 164.817 870.32 152.058C857.555 139.299 842.834 128.605 826.746 120.418C810.366 112.083 793.587 106.797 775.558 103.56C757.803 100.372 739.691 99.315 721.738 98.83C713.495 98.607 705.253 98.513 697.008 98.462C687.22 98.402 677.432 98.407 667.644 98.407L553.997 98H468.997L357.361 98.407C347.554 98.407 337.747 98.402 327.94 98.462C319.678 98.513 311.42 98.607 303.161 98.83C285.167 99.315 267.014 100.373 249.217 103.565C231.164 106.801 214.36 112.085 197.958 120.414C181.835 128.602 167.083 139.297 154.291 152.058C141.501 164.816 130.78 179.53 122.573 195.61C114.217 211.981 108.919 228.752 105.673 246.77C102.477 264.516 101.418 282.617 100.931 300.562C100.709 308.8 100.613 317.039 100.563 325.279C100.503 335.063 100 347.216 100 356.999L100.003 467.089L100 552.998L100.508 665.427C100.508 675.223 100.504 685.019 100.563 694.815C100.613 703.067 100.709 711.317 100.932 719.566C101.418 737.542 102.479 755.675 105.678 773.452C108.923 791.484 114.22 808.269 122.569 824.653C130.777 840.759 141.5 855.495 154.291 868.272C167.082 881.049 181.83 891.757 197.95 899.956C214.362 908.302 231.174 913.595 249.238 916.836C267.027 920.029 285.174 921.088 303.161 921.573C311.42 921.796 319.679 921.891 327.941 921.941C337.748 922.001 347.554 921.997 357.361 921.997L470.006 922H555.217L667.644 921.996C677.432 921.996 687.22 922.001 697.008 921.941C705.253 921.891 713.495 921.796 721.738 921.573C739.698 921.087 757.816 920.027 775.579 916.832C793.597 913.591 810.368 908.3 826.739 899.959C842.831 891.761 857.554 881.051 870.32 868.272C883.086 855.497 893.786 840.763 901.978 824.66C910.316 808.268 915.604 791.475 918.844 773.431C922.034 755.661 923.092 737.535 923.577 719.566C923.8 711.316 923.895 703.066 923.944 694.815C924.005 685.019 924 675.223 924 665.427C924 665.427 923.994 554.983 923.994 552.998V466.999C923.994 465.533 924 354.627 924 354.627Z"
fill="white"
id="path1000" /></mask><g
mask="url(#mask0_102_69)"
id="g1009"
style="display:inline"><rect
x="42"
y="36"
width="914"
height="914"
fill="url(#paint1_linear_102_69)"
id="rect1003"
style="display:inline" /><g
filter="url(#filter1_b_102_69)"
id="g1007"
style="display:inline"><rect
x="100"
y="98"
width="824"
height="824"
rx="126"
fill="#000000"
fill-opacity="0.01"
id="rect1005" /></g></g><defs
id="defs1068"><filter
id="filter0_d_102_69"
x="90"
y="98"
width="844"
height="844"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"><feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood1025" /><feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix1027" /><feOffset
dy="10"
id="feOffset1029" /><feGaussianBlur
stdDeviation="5"
id="feGaussianBlur1031" /><feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.3 0"
id="feColorMatrix1033" /><feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_102_69"
id="feBlend1035" /><feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_102_69"
result="shape"
id="feBlend1037" /></filter><filter
id="filter1_b_102_69"
x="89.1269"
y="87.1269"
width="845.746"
height="845.746"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"><feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood1040" /><feGaussianBlur
in="BackgroundImage"
stdDeviation="5.43656"
id="feGaussianBlur1042" /><feComposite
in2="SourceAlpha"
operator="in"
result="effect1_backgroundBlur_102_69"
id="feComposite1044" /><feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_backgroundBlur_102_69"
result="shape"
id="feBlend1046" /></filter><linearGradient
id="paint0_linear_102_69"
x1="-181.14"
y1="98"
x2="-181.14"
y2="1484.28"
gradientUnits="userSpaceOnUse"><stop
stop-color="white"
id="stop1049" /><stop
offset="0.489516"
stop-color="#EFEFEF"
id="stop1051" /><stop
offset="1"
stop-color="#C0C0C0"
id="stop1053" /></linearGradient><linearGradient
id="paint1_linear_102_69"
x1="928.377"
y1="992.826"
x2="928.377"
y2="134.072"
gradientUnits="userSpaceOnUse"><stop
stop-color="#F6F3F3"
id="stop1056" /><stop
offset="1"
stop-color="white"
id="stop1058" /></linearGradient><linearGradient
id="paint2_linear_102_69"
x1="394.815"
y1="372.239"
x2="629.182"
y2="542.528"
gradientUnits="userSpaceOnUse"><stop
stop-color="#88B858"
id="stop1061" /><stop
offset="0.5"
stop-color="#72B147"
id="stop1063" /><stop
offset="1"
stop-color="#5A9A30"
id="stop1065" /></linearGradient><inkscape:path-effect
effect="powerclip"
id="path-effect5638"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false"
message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
effect="powerclip"
id="path-effect5562"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false"
message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
effect="powerclip"
id="path-effect5535"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false"
message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
effect="fillet_chamfer"
id="path-effect47"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect46"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1 @ F,0,0,1,0,12.7,0,1"
radius="48"
unit="px"
method="auto"
mode="F"
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-effect45"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect44"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect43"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,26.458333,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,26.458333,0,1"
radius="100"
unit="px"
method="auto"
mode="F"
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-effect42"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect41"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect40"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect39"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,19.408629,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
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-effect38"
is_visible="true"
lpeversion="1"
nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
mode="F"
chamfer_steps="1"
flexible="false"
use_knot_distance="true"
apply_no_radius="true"
apply_with_radius="true"
only_selected="false"
hide_knots="false" /><linearGradient
id="linearGradient26"
inkscape:collect="always"><stop
style="stop-color:#00b9e7;stop-opacity:1;"
offset="0.13695651"
id="stop25" /><stop
style="stop-color:#146e8b;stop-opacity:1;"
offset="1"
id="stop26" /></linearGradient><linearGradient
id="linearGradient8"
inkscape:collect="always"><stop
style="stop-color:#094a29;stop-opacity:1;"
offset="0"
id="stop9" /><stop
style="stop-color:#137a4a;stop-opacity:1;"
offset="1"
id="stop10" /></linearGradient><linearGradient
id="linearGradient5"
inkscape:collect="always"><stop
style="stop-color:#094a29;stop-opacity:1;"
offset="0.54209745"
id="stop6" /><stop
style="stop-color:#137a4a;stop-opacity:1;"
offset="0.98260868"
id="stop8" /></linearGradient><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="-195.52928 : 112.88888 : 0"
inkscape:vp_y="0 : 999.99999 : 0"
inkscape:vp_z="140.9876 : 81.399227 : 0"
inkscape:persp3d-origin="164.61013 : 91.238891 : 1"
id="perspective22" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8"
id="linearGradient10"
x1="46.747211"
y1="201.23958"
x2="23.307659"
y2="64.527458"
gradientUnits="userSpaceOnUse" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5"
id="radialGradient17"
cx="149.52678"
cy="185.52985"
fx="149.52678"
fy="185.52985"
r="112.93989"
gradientTransform="matrix(-1.3751118,-0.28998256,0.19048676,-0.90329778,299.04025,358.86705)"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient26"
id="linearGradient25"
x1="106.92046"
y1="252.24748"
x2="134.95892"
y2="135.69524"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient23"
id="linearGradient24"
x1="192.82516"
y1="186.66386"
x2="60.806931"
y2="49.446285"
gradientUnits="userSpaceOnUse" /><linearGradient
id="linearGradient23"
inkscape:collect="always"><stop
style="stop-color:#d7eef4;stop-opacity:0;"
offset="0.13695651"
id="stop24" /><stop
style="stop-color:#d7eef4;stop-opacity:0.32810229;"
offset="1"
id="stop23" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath6"><g
inkscape:label="Clip"
id="use6"><path
fill-rule="evenodd"
clip-rule="evenodd"
d="m 924,354.627 c 0,-9.782 0.004,-19.565 -0.056,-29.348 -0.049,-8.241 -0.144,-16.48 -0.368,-24.717 -0.484,-17.953 -1.543,-36.06 -4.736,-53.813 -3.238,-18.008 -8.526,-34.769 -16.859,-51.132 -8.192,-16.083 -18.893,-30.8 -31.661,-43.559 -12.765,-12.759 -27.486,-23.453 -43.574,-31.64 -16.38,-8.335 -33.159,-13.621 -51.188,-16.858 -17.755,-3.188 -35.867,-4.245 -53.82,-4.73 -8.243,-0.223 -16.485,-0.317 -24.73,-0.368 -9.788,-0.06 -19.576,-0.055 -29.364,-0.055 L 553.997,98 h -85 l -111.636,0.407 c -9.807,0 -19.614,-0.005 -29.421,0.055 -8.262,0.051 -16.52,0.145 -24.779,0.368 -17.994,0.485 -36.147,1.543 -53.944,4.735 -18.053,3.236 -34.857,8.52 -51.259,16.849 -16.123,8.188 -30.875,18.883 -43.667,31.644 -12.79,12.758 -23.511,27.472 -31.718,43.552 -8.356,16.371 -13.654,33.142 -16.9,51.16 -3.196,17.746 -4.255,35.847 -4.742,53.792 -0.222,8.238 -0.318,16.477 -0.368,24.717 -0.06,9.784 -0.563,21.937 -0.563,31.72 l 0.003,110.09 -0.003,85.909 0.508,112.429 c 0,9.796 -0.004,19.592 0.055,29.388 0.05,8.252 0.146,16.502 0.369,24.751 0.486,17.976 1.547,36.109 4.746,53.886 3.245,18.032 8.542,34.817 16.891,51.201 8.208,16.106 18.931,30.842 31.722,43.619 12.791,12.777 27.539,23.485 43.659,31.684 16.412,8.346 33.224,13.639 51.288,16.88 17.789,3.193 35.936,4.252 53.923,4.737 8.259,0.223 16.518,0.318 24.78,0.368 9.807,0.06 19.613,0.056 29.42,0.056 L 470.006,922 h 85.211 l 112.427,-0.004 c 9.788,0 19.576,0.005 29.364,-0.055 8.245,-0.05 16.487,-0.145 24.73,-0.368 17.96,-0.486 36.078,-1.546 53.841,-4.741 18.018,-3.241 34.789,-8.532 51.16,-16.873 16.092,-8.198 30.815,-18.908 43.581,-31.687 12.766,-12.775 23.466,-27.509 31.658,-43.612 8.338,-16.392 13.626,-33.185 16.866,-51.229 3.19,-17.77 4.248,-35.896 4.733,-53.865 0.223,-8.25 0.318,-16.5 0.367,-24.751 0.061,-9.796 0.056,-19.592 0.056,-29.388 0,0 -0.006,-110.444 -0.006,-112.429 v -85.999 c 0,-1.466 0.006,-112.372 0.006,-112.372 z"
fill="url(#paint0_linear_102_69)"
id="path7"
style="display:inline;fill:none;stroke:none"
inkscape:label="path5" /></g></clipPath></defs><g
id="g6"
clip-path="url(#clipPath6)"><g
id="g1"
transform="matrix(2.4374441,0,0,2.4374441,186.50999,169.40895)"
style="display:inline"><g
id="g47"
clip-path="none"
transform="matrix(1.5115439,0,0,1.5115439,-71.226371,-57.575784)"
inkscape:label="fjord"><path
style="display:inline;fill:#c0e3ef;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 247.2924,2.9663147 247.29239,200.0293 135.46668,264.59188 23.640946,200.02933 23.640967,70.904073 23.640914,2.9663147"
id="path4"
inkscape:label="sky-hexagon"
inkscape:path-effect="#path-effect47"
inkscape:original-d="M 247.2924,2.9663147 247.29239,200.0293 135.46668,264.59188 23.640946,200.02933 23.640967,70.904073 23.640914,2.9663147"
sodipodi:nodetypes="cccccc" /><path
style="display:inline;fill:url(#radialGradient17);stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 247.29238,71.772095 C 135.46666,6.3414576 23.640967,70.904073 23.640967,70.904073 l 1e-6,2e-6 -5.4e-5,193.687805 H 250.81769"
id="path3"
sodipodi:nodetypes="ccccc"
inkscape:label="back-face"
inkscape:transform-center-x="49.556022"
inkscape:transform-center-y="19.416688" /><path
style="display:inline;opacity:1;fill:url(#linearGradient25);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 135.46668,264.59188 c 0,0 51.66278,-39.92584 69.27008,-94.69866 8.91543,-27.73414 -40.45821,-68.00362 -83.33229,-63.01401 -72.551007,8.44336 -97.763524,-3.91716 -97.763524,-3.91716 v 97.06728 l -3.2e-5,64.56255 z"
id="path1"
sodipodi:nodetypes="csscccc"
inkscape:label="water" /><path
id="path8932"
style="display:inline;mix-blend-mode:normal;fill:#ffffff;stroke-width:0.0372549"
d="m 135.06162,62.147052 c -4.6759,0.06031 -7.35816,0.636259 -12.46186,2.675667 -8.86535,3.54254 -16.93953,11.913519 -21.57184,22.364441 -3.448219,7.779493 -5.293585,17.06716 -5.247075,26.40968 l 0.0092,1.85899 v 0 c 0.724021,8.28197 1.91971,16.14125 4.20176,23.19296 0.02102,-0.0137 -6.97e-4,-5.3e-4 0,0 0.01341,0.0135 0.217385,0.5779 0.453465,1.25408 3.18255,9.11482 8.66476,18.87046 14.84055,26.51125 6.88791,-3.54475 13.09495,-7.52358 17.97381,-12.4752 -3.66305,-4.33708 -7.36248,-10.12155 -9.8542,-15.49446 -1.33466,-2.87802 -3.27604,-7.96364 -3.41984,-8.95826 -6.9e-4,-0.009 -0.006,0.009 0,0 -2.16072,-7.45308 -2.71573,-15.18022 -2.07669,-22.05322 l 0.009,-0.0489 c -0.009,-0.1008 0.16527,-0.98641 0.32214,-1.92172 1.46061,-8.709769 5.01557,-15.308133 10.35724,-19.224331 1.09571,-0.803307 3.40564,-1.807845 4.97359,-2.162798 0.39696,-0.08989 1.2404,-0.134758 2.08438,-0.134824 0.84396,-5.2e-5 1.68863,0.04468 2.08826,0.134536 1.63785,0.368056 3.85369,1.332995 5.01991,2.185954 4.91633,3.59574 8.43158,9.765032 9.98782,17.399483 8.13291,1.56961 15.9818,4.38034 22.78109,7.8164 -0.085,-2.4202 -0.30899,-5.28866 -0.60881,-7.43184 -1.62233,-11.596017 -5.62047,-21.183105 -11.86196,-28.442326 -4.65327,-5.412075 -9.50033,-8.962923 -15.1663,-11.11095 -5.02548,-1.905213 -7.78668,-2.409656 -12.83425,-2.344539 z m -0.35993,43.639918 c -4.6419,0.045 -9.00869,0.40608 -13.29722,1.09224 -0.30751,7.73921 0.0949,15.10062 1.99264,21.78623 3.96329,-0.70282 7.9872,-1.06222 12.0069,-1.07709 4.02601,-0.0149 8.04808,0.31527 12.00036,0.99097 1.97168,0.3371 3.96436,0.7665 3.93717,0.84844 -5.2e-4,0.002 -0.0184,0.0627 -0.0205,0.0695 7.4808,1.87301 14.38572,5.21637 19.97921,9.19107 l -0.006,0.0483 c 0.0438,-0.10252 0.0723,-0.13491 0.10368,-0.10777 0.0336,0.0293 0.34658,0.27638 0.6949,0.54908 7.03394,5.50766 11.23119,11.88339 12.24625,18.6022 0.28723,1.90122 -0.0508,4.98034 -0.71301,6.49166 -1.05035,2.39736 -2.33588,3.90564 -4.7158,5.53394 -1.9399,1.32724 -5.06721,2.3016 -8.47538,2.64032 -3.53593,0.35142 -7.70219,-0.1378 -11.92167,-1.39959 -0.36402,-0.10882 -0.78069,-0.24201 -1.21489,-0.38665 -5.42873,6.25364 -11.80378,11.64092 -18.20693,15.81665 2.65182,1.42151 5.77765,2.86067 8.48755,3.87154 6.63575,2.47528 12.35628,3.71086 18.45997,3.98706 9.94747,0.4501 20.44984,-2.55765 26.78624,-7.67121 3.31418,-2.67463 4.47639,-3.7756 6.06224,-5.74331 1.10974,-1.37695 1.62413,-2.17008 3.42017,-5.27171 2.00044,-3.45474 3.30298,-7.89109 3.81836,-13.0053 0.44996,-4.46494 -0.0296,-8.85692 -1.51659,-13.89263 -0.25719,-0.87083 -0.47634,-1.61699 -0.48704,-1.65797 -0.24034,-0.91977 -1.54701,-4.10194 -2.37096,-5.77447 -3.91584,-7.94874 -10.72442,-15.60027 -19.14505,-21.51484 -2.03091,-1.42645 -4.74375,-3.10298 -9.68319,-5.54011 -4.93941,-2.43712 -12.33254,-5.28719 -15.96311,-6.02375 -3.63056,-0.73658 -3.90367,-0.79486 -4.22128,-0.8638 -3.4564,-0.75039 -9.28615,-1.40692 -13.69125,-1.54184 -0.78838,-0.0242 -1.56786,-0.0398 -2.3392,-0.0472 -0.67493,-0.006 -1.34377,-0.006 -2.0069,0 z m -42.35733,11.65349 c -7.068147,4.32792 -13.69569,10.26389 -18.181987,16.35238 -6.817393,9.25205 -10.115532,20.35221 -8.8555,29.80401 0.827949,6.21068 2.119154,9.77478 5.403573,14.91478 2.987119,4.67472 8.355144,9.26751 13.878965,11.87475 4.830793,2.28011 11.249824,3.77535 16.998589,3.95974 10.67998,0.34253 22.87575,-3.07274 33.0825,-9.26443 0.52251,-0.31697 0.96153,-0.58267 0.97582,-0.59066 0.002,-7.1e-4 0.0424,0.0245 0.0514,0.0276 6.85612,-4.72908 13.0507,-9.69798 18.04359,-15.18887 l -0.1125,-0.0502 0.27292,-0.30794 c 6.44865,-7.27984 12.62371,-17.6044 16.20241,-26.93295 -6.54186,-4.15178 -13.1122,-7.50244 -19.84676,-9.22463 -2.79259,7.84558 -8.02579,16.62566 -13.69129,22.81048 -0.30031,0.32785 -0.62916,0.67676 -0.73083,0.77538 l -2.91327,2.97584 c -2.72827,2.79679 -8.98552,7.07796 -15.2399,9.90652 0.0137,0.0179 0,-0.003 0,0 0,0.0262 -0.7791,0.34291 -1.82546,0.74151 -3.52004,1.34093 -7.44177,2.23735 -10.74805,2.4571 -3.94914,0.26248 -7.634957,-0.30459 -10.889124,-1.67577 -1.361607,-0.57374 -2.789607,-1.57771 -4.212155,-2.96076 -0.803254,-0.78095 -1.785178,-2.31484 -2.368,-3.69958 -0.471064,-1.11919 -0.893186,-4.09616 -0.767061,-5.41071 0.601301,-6.26734 4.073245,-12.29725 10.160966,-17.69199 -2.726947,-7.80836 -4.240475,-15.99779 -4.688789,-23.60162 z"
sodipodi:nodetypes="csscccccscccsccccssssscccssscscssscccscssssscccssssssccccccssscsssssssccccccsccccssssssccsss"
inkscape:label="trefoil" /><path
style="display:inline;mix-blend-mode:hard-light;fill:url(#linearGradient24);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 23.640947,200.02929 2.2e-5,-129.125214 -5.5e-5,-67.9377613 H 247.2924 L 250.81769,264.59188 H 23.640914 l 3.3e-5,-64.56255"
id="path23"
inkscape:label="fog"
sodipodi:nodetypes="ccccccc" /><path
style="fill:url(#linearGradient10);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 23.640946,200.02929 c 0,0 33.771353,-15.00232 43.543672,-52.9216 0,0 -8.31063,-42.97371 -43.54365,-76.203615 z"
id="path2"
sodipodi:nodetypes="cccc"
inkscape:label="left-face" /></g><g
inkscape:label="Clip"
id="use47"
transform="matrix(1.5115439,0,0,1.5115439,-71.226371,-71.524821)"><path
style="fill:none;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 28.277789,32.281309 140.10348,-32.281309 251.9292,32.281299 251.92921,161.40653 140.1035,225.96911 28.277767,161.40656 Z"
id="path6"
transform="translate(-4.636822,38.622765)"
inkscape:label="clip" /></g></g></g></svg>

Before

Width:  |  Height:  |  Size: 28 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 5.8 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 138 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 138 KiB

View File

@ -1,27 +1,27 @@
fjordlauncher(6) shatteredprism(6)
# NAME # NAME
fjordlauncher - a launcher and instance manager for Minecraft. shatteredprism - a launcher and instance manager for Minecraft.
# SYNOPSIS # SYNOPSIS
*fjordlauncher* [OPTIONS...] *shatteredprism* [OPTIONS...]
# DESCRIPTION # DESCRIPTION
Fjord Launcher is a custom launcher for Minecraft that allows you to easily manage Shattered Prism is a custom launcher for Minecraft that allows you to easily manage
multiple installations of Minecraft at once. It also allows you to easily multiple installations of Minecraft at once. It also allows you to easily
install and remove mods by simply dragging and dropping. install and remove mods by simply dragging and dropping.
Here are the current features of Fjord Launcher. Here are the current features of Shattered Prism.
# OPTIONS # OPTIONS
*-d, --dir*=DIRECTORY *-d, --dir*=DIRECTORY
Use DIRECTORY as the Fjord Launcher root. Use DIRECTORY as the Shattered Prism root.
*-l, --launch*=INSTANCE_ID *-l, --launch*=INSTANCE_ID
Launch the instance specified by INSTANCE_ID. Launch the instance specified by INSTANCE_ID.
@ -30,7 +30,7 @@ Here are the current features of Fjord Launcher.
Show the configuration window of the instance specified by INSTANCE_ID. Show the configuration window of the instance specified by INSTANCE_ID.
*--alive* *--alive*
Write a small 'live.check' file after Fjord Launcher starts. Write a small 'live.check' file after Shattered Prism starts.
*-h, --help* *-h, --help*
Display help text and exit. Display help text and exit.
@ -69,11 +69,11 @@ variables, besides other common Qt variables:
# BUGS # BUGS
https://github.com/unmojang/FjordLauncher/issues https://github.com/lunaislazier/ShatteredPrism/issues
# RESOURCES # RESOURCES
GitHub: https://github.com/unmojang/FjordLauncher GitHub: https://github.com/lunaislazier/ShatteredPrism
# AUTHORS # AUTHORS
@ -86,3 +86,5 @@ PollyMC Contributors
Prism Launcher Contributors Prism Launcher Contributors
Fjord Launcher Contributors Fjord Launcher Contributors
Shattered Prism Contributors

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

View File

@ -5,7 +5,7 @@
<ws2:longPathAware>true</ws2:longPathAware> <ws2:longPathAware>true</ws2:longPathAware>
</windowsSettings> </windowsSettings>
</application> </application>
<assemblyIdentity name="FjordLauncher.Application.1" type="win32" version="@Launcher_VERSION_NAME4@" /> <assemblyIdentity name="ShatteredPrism.Application.1" type="win32" version="@Launcher_VERSION_NAME4@" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security> <security>
<requestedPrivileges> <requestedPrivileges>

View File

@ -3,8 +3,8 @@
#endif #endif
#include <windows.h> #include <windows.h>
IDI_ICON1 ICON DISCARDABLE "fjordlauncher.ico" IDI_ICON1 ICON DISCARDABLE "shatteredprism.ico"
1 RT_MANIFEST "fjordlauncher.manifest" 1 RT_MANIFEST "shatteredprism.manifest"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @Launcher_VERSION_NAME4_COMMA@ FILEVERSION @Launcher_VERSION_NAME4_COMMA@
@ -15,10 +15,10 @@ BEGIN
BEGIN BEGIN
BLOCK "000004b0" BLOCK "000004b0"
BEGIN BEGIN
VALUE "CompanyName", "MultiMC & Prism Launcher & Fjord Launcher Contributors" VALUE "CompanyName", "MultiMC & Prism Launcher & Fjord Launcher & Shattered Prism Contributors"
VALUE "FileDescription", "Fjord Launcher" VALUE "FileDescription", "Shattered Prism"
VALUE "FileVersion", "@Launcher_VERSION_NAME4@" VALUE "FileVersion", "@Launcher_VERSION_NAME4@"
VALUE "ProductName", "Fjord Launcher" VALUE "ProductName", "Shattered Prism"
VALUE "ProductVersion", "@Launcher_VERSION_NAME4@" VALUE "ProductVersion", "@Launcher_VERSION_NAME4@"
END END
END END