Skip to content

Commit 43c4872

Browse files
test1
1 parent 8c7dc69 commit 43c4872

File tree

2 files changed

+4
-54
lines changed

2 files changed

+4
-54
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -654,53 +654,3 @@ jobs:
654654
with:
655655
bundle: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-Flatpak.flatpak
656656
manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml
657-
658-
nix:
659-
name: Nix (${{ matrix.system }})
660-
661-
strategy:
662-
fail-fast: false
663-
matrix:
664-
include:
665-
- os: ubuntu-22.04
666-
system: x86_64-linux
667-
668-
- os: macos-13
669-
system: x86_64-darwin
670-
671-
- os: macos-14
672-
system: aarch64-darwin
673-
674-
runs-on: ${{ matrix.os }}
675-
676-
steps:
677-
- name: Checkout repository
678-
uses: actions/checkout@v4
679-
680-
- name: Install Nix
681-
uses: cachix/install-nix-action@v30
682-
683-
# For PRs
684-
- name: Setup Nix Magic Cache
685-
uses: DeterminateSystems/magic-nix-cache-action@v8
686-
687-
# For in-tree builds
688-
- name: Setup Cachix
689-
uses: cachix/cachix-action@v15
690-
with:
691-
name: prismlauncher
692-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
693-
694-
- name: Run flake checks
695-
run: |
696-
nix flake check --print-build-logs --show-trace
697-
698-
- name: Build debug package
699-
if: ${{ inputs.build_type == 'Debug' }}
700-
run: |
701-
nix build --print-build-logs .#prismlauncher-debug
702-
703-
- name: Build release package
704-
if: ${{ inputs.build_type != 'Debug' }}
705-
run: |
706-
nix build --print-build-logs .#prismlauncher

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ endif()
173173
##################################### Set Application options #####################################
174174

175175
######## Set URLs ########
176-
set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.")
176+
set(Launcher_NEWS_RSS_URL "https://toshta.su/feed.xml" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.")
177177
set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'")
178178
set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help")
179179
set(Launcher_LOGIN_CALLBACK_URL "https://prismlauncher.org/successful-login" CACHE STRING "URL that gets opened when the user successfully logins.")
180180
set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE STRING "URL for FML Libraries.")
181181

182182
######## Set version numbers ########
183-
set(Launcher_VERSION_MAJOR 10)
184-
set(Launcher_VERSION_MINOR 0)
183+
set(Launcher_VERSION_MAJOR 9)
184+
set(Launcher_VERSION_MINOR 1)
185185

186186
set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}")
187187
set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.0.0")
@@ -256,7 +256,7 @@ endif()
256256

257257
# By using this key in your builds you accept the terms of use laid down in
258258
# https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use
259-
set(Launcher_MSA_CLIENT_ID "039ef54b-ae1b-40bb-933e-492ffa92bee7" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application")
259+
set(Launcher_MSA_CLIENT_ID "c36a9fb6-4f2a-41ff-90bd-ae7cc92031eb" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application")
260260

261261
# By using this key in your builds you accept the terms and conditions laid down in
262262
# https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions

0 commit comments

Comments
 (0)