Merge branch 'master' into challengepack-fix

Author: suanjiansalt

.cirrus.yml

@@ -48,19 +48,6 @@ task:
   Type_Check_script:
     - yarn typecheck
   matrix:
-    - only_if: $CIRRUS_TAG != ''
-      name: Types Publish
-      env:
-        NPM_AUTH_TOKEN: ENCRYPTED[7e0bc6b5e2d4f27aff6a60acf686376ca26abed3334738847a419e4bd8c245490caeddc81d8ce403745516e11604c094]
-      Install_System_Dependencies_script:
-        - apt update --yes
-        - apt install rsync --yes
-      Push_Types_script:
-        - rsync -a --include '*/' --include '*.d.ts' --exclude '*' build/ packaging/typedefs/
-        - yarn typedefs reversion
-        - yarn typedefs pack
-        - yarn config set npmAuthToken $NPM_AUTH_TOKEN
-        - yarn typedefs npm publish
     - only_if: $CIRRUS_TAG == ''
       name: Tests
       Lint_script:

.github/pull_request_template.md

@@ -11,10 +11,7 @@
 ## Checklist
 
 <!--
-Just a few reminders to make sure everything is perfect. You can place an "X" in the boxes to tick them off.
-If you have not completed one of the steps below, you can create the pull request as a draft, and then check off the items as you go.
+Once you create the PR, the checklist will be added below this comment automatically (based on what files you've changed).
+It's just a few reminders to make sure everything is perfect. You can place an "X" in the boxes to tick them off.
 When you have completed the checklist, press the "Ready for review" button.
 -->
-
-- [ ] I have run Prettier to reformat any changed files
-- [ ] I have verified my changes work

.github/workflows/codeql.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
 

.github/workflows/locale-mod.yml

@@ -12,14 +12,14 @@ jobs:
 
     steps:
       - name: Checkout Peacock
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           token: ${{ secrets.PEACOCKBOT_TOKEN }}
           path: "./Peacock"
 
       - name: Checkout Peacock Strings
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.PEACOCKBOT_TOKEN }}
           repository: thepeacockproject/peacock-strings

.github/workflows/locale.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout Peacock
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.PEACOCKBOT_TOKEN }}
           path: "./Peacock"

.github/workflows/patcher-publish.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
         with:
           ref: ${{ github.ref_name }}
           path: repository

.github/workflows/patcher.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v5
@@ -33,7 +33,7 @@ jobs:
           dotnet publish HitmanPatcher/HitmanPatcher.csproj -c Release -p DebugType=none -o Publish/Windows
 
       - name: Upload patcher-windows
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: patcher-windows
           path: patcher/Publish/Windows/ILRepack

components/2016/legacyContractHandler.ts

@@ -1,6 +1,6 @@
 /*
  *     The Peacock Project - a HITMAN server replacement.
- *     Copyright (C) 2021-2025 The Peacock Project Team
+ *     Copyright (C) 2021-2026 The Peacock Project Team
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Affero General Public License as published by

components/2016/legacyMenuData.ts

@@ -1,6 +1,6 @@
 /*
  *     The Peacock Project - a HITMAN server replacement.
- *     Copyright (C) 2021-2025 The Peacock Project Team
+ *     Copyright (C) 2021-2026 The Peacock Project Team
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Affero General Public License as published by

components/2016/legacyProfileRouter.ts

@@ -1,6 +1,6 @@
 /*
  *     The Peacock Project - a HITMAN server replacement.
- *     Copyright (C) 2021-2025 The Peacock Project Team
+ *     Copyright (C) 2021-2026 The Peacock Project Team
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Affero General Public License as published by