Skip to content

Commit 77c217d

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts: # launcher/Application.cpp # launcher/ui/MainWindow.ui # launcher/ui/widgets/JavaSettingsWidget.ui
2 parents 410a14e + f67a670 commit 77c217d

147 files changed

Lines changed: 3434 additions & 2703 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ body:
2424
- macOS
2525
- Linux
2626
- Other
27-
- type: textarea
27+
- type: input
2828
attributes:
2929
label: Version of PineconeMC
3030
description: The version of PineconeMC used in the bug report.
3131
placeholder: PineconeMC 10.0.6
3232
validations:
3333
required: true
34-
- type: textarea
34+
- type: input
3535
attributes:
3636
label: Version of Qt
3737
description: The version of Qt used in the bug report. You can find it in Help -> About PineconeMC -> About Qt.

.github/actions/setup-dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ runs:
5555
# TODO(@getchoo): Get this working on MSYS2!
5656
- name: Setup ccache
5757
if: ${{ (runner.os != 'Windows' || inputs.msystem == '') && inputs.build-type == 'Debug' }}
58-
uses: hendrikmuhs/ccache-action@v1.2.22
58+
uses: hendrikmuhs/ccache-action@v1.2.23
5959
with:
6060
variant: sccache
6161
create-symlink: ${{ runner.os != 'Windows' }}

.github/actions/setup-dependencies/windows/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ runs:
9191
9292
- name: Retrieve ccache cache (MinGW)
9393
if: ${{ inputs.msystem != '' && inputs.build-type == 'Debug' }}
94-
uses: actions/cache@v5.0.4
94+
uses: actions/cache@v5.0.5
9595
with:
9696
path: '${{ github.workspace }}\.ccache'
9797
key: ${{ runner.os }}-mingw-w64-ccache-${{ github.run_id }}

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
ref: ${{ github.event.pull_request.head.sha }}
2626
- name: Create backport PRs
27-
uses: korthout/backport-action@v4.3.0
27+
uses: korthout/backport-action@v4.5
2828
with:
2929
# Config README: https://github.com/korthout/backport-action#backport-action
3030
pull_description: |-

.github/workflows/clang-tidy.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,14 @@ jobs:
2828
fetch-depth: 0 # Required for diffing later on
2929
submodules: "true"
3030

31-
- name: Setup sccache
32-
uses: hendrikmuhs/ccache-action@v1.2.22
33-
with:
34-
variant: sccache
35-
3631
- name: Install Nix
3732
uses: cachix/install-nix-action@v31
3833

39-
- name: Run build
34+
- name: Run source generators
4035
# TODO(@getchoo): Figure out how to make this work with PCH
4136
run: |
4237
nix develop --command bash -c '
43-
cmake -B build -D Launcher_USE_PCH=OFF -D CMAKE_CXX_COMPILER_LAUNCHER=sccache && cmake --build build
38+
cmake -B build -D Launcher_USE_PCH=OFF && cmake --build build --target autogen autorcc
4439
'
4540
4641
# TODO: Use SARIF after https://github.com/psastras/sarif-rs/issues/638 is fixed

.github/workflows/container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- arch: arm64
3434
os: ubuntu-24.04-arm
3535
- arch: amd64
36-
os: ubuntu-24.04-arm
36+
os: ubuntu-24.04
3737

3838
runs-on: ${{ matrix.os }}
3939

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- os: ubuntu-22.04-arm
8989
system: aarch64-linux
9090

91-
- os: macos-14
91+
- os: macos-26
9292
system: aarch64-darwin
9393

9494
runs-on: ${{ matrix.os }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
9595
- name: Create release
9696
id: create_release
97-
uses: softprops/action-gh-release@v2
97+
uses: softprops/action-gh-release@v3
9898
with:
9999
token: ${{ secrets.GITHUB_TOKEN }}
100100
tag_name: ${{ github.ref }}

.github/workflows/update-flake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v6
23-
- uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31
23+
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31
2424

2525
- uses: DeterminateSystems/update-flake-lock@v28
2626
with:

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ endif()
1313
##################################### Set CMake options #####################################
1414
set(CMAKE_AUTOMOC ON)
1515
set(CMAKE_AUTORCC ON)
16+
set(CMAKE_AUTOUIC ON)
17+
set(CMAKE_AUTOGEN_ORIGIN_DEPENDS OFF)
18+
set(CMAKE_GLOBAL_AUTOGEN_TARGET ON)
19+
set(CMAKE_GLOBAL_AUTORCC_TARGET ON)
1620
set(CMAKE_INCLUDE_CURRENT_DIR ON)
1721

1822
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
@@ -179,7 +183,7 @@ set(Launcher_LOGIN_CALLBACK_URL "https://pineconemc.ru/successful-login" CACHE S
179183
set(Launcher_LEGACY_FMLLIBS_BASE_URL "https://files.pineconemc.ru/fmllibs/" CACHE STRING "URL for legacy (<=1.5.2) FML Libraries.")
180184

181185
######## Set version numbers ########
182-
set(Launcher_VERSION_MAJOR 11)
186+
set(Launcher_VERSION_MAJOR 12)
183187
set(Launcher_VERSION_MINOR 0)
184188
set(Launcher_VERSION_PATCH 0)
185189

0 commit comments

Comments
 (0)