Merge branch '1.20.x' into pr/hud_air_graphic

.github/workflows/build-prs.yml

@@ -9,17 +9,21 @@ on:
       - reopened
 
 jobs:
-  jdk17:
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 1000
           fetch-tags: true
 
+      # GradleUtils will append the branch name to the version,
+      # but for that we need a properly checked out branch
+      - name: Create branch for commit
+        run:
+          git switch -C pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.ref }}
+
       - name: Setup JDK 17
         uses: actions/setup-java@v2
         with:

.teamcity/settings.kts

@@ -31,10 +31,6 @@ project {
 
     buildType(Build)
     buildType(BuildSecondaryBranches)
-    buildType(PullRequests)
-    buildType(PullRequestChecks)
-    buildType(PullRequestCompatibility)
-    buildType(PullRequestPatchModifications)
 
     params {
         text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)

build.gradle

@@ -23,6 +23,9 @@ changelog {
     disableAutomaticPublicationRegistration()
 }
 
+// Print version, generally useful to know - also appears on CI
+System.out.println("NeoForge version ${gradleutils.version.toString()}")
+
 allprojects {
     version gradleutils.version.toString()
     group 'net.neoforged'