Skip to content

Commit 9eb1da7

Browse files
committed
Merge master into feat/v8-minimessage-migration
Absorbs three commits from master since v8 diverged: - fix: include Fabric 1.21.11 in release + Modrinth publish workflows (#1066) - revert: defer hybrid localisation to v8.0.0 (#1062) (#1067) - chore: prepare for next release (#1068) Conflict resolution policy: - All files touched by the original #1062 PR are restored to v8's tip, so the locale work, MessageRegistry, V2 migration, messages_de.yml fixtures, MessageLoadingTest rename, and Message-overload kick signatures are preserved exactly as on v8. - common/configs/MessagesConfig.java and the legacy messages.yml stay deleted (v8 replaced them with the new MessageRegistry/messages directory structure). - gradle.properties is already 8.0.0-SNAPSHOT on both branches. - The Fabric 1.21.11 entries added in #1066 to release.yml and publish.yml are the only net change introduced into v8 by this merge, ensuring the v8 release pipeline ships the new Fabric jar.
2 parents 4bd5213 + c767550 commit 9eb1da7

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

.github/workflows/publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
release-jars/BanManagerFabric-mc1.20.1.jar
7373
release-jars/BanManagerFabric-mc1.21.1.jar
7474
release-jars/BanManagerFabric-mc1.21.4.jar
75+
release-jars/BanManagerFabric-mc1.21.11.jar
7576
name: "BanManager v${{ needs.download-assets.outputs.version }}"
7677
version: ${{ needs.download-assets.outputs.version }}
7778
version-type: release
@@ -81,6 +82,7 @@ jobs:
8182
1.20.1
8283
1.21.1
8384
1.21.4
85+
1.21.11
8486
game-version-filter: releases
8587
dependencies: |
8688
fabric-api@* (required)

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Build all Fabric versions
4848
- name: Build all Fabric versions
49-
run: ./gradlew :fabric:1.20.1:remapJar :fabric:1.21.1:remapJar :fabric:1.21.4:remapJar --build-cache
49+
run: ./gradlew :fabric:1.20.1:remapJar :fabric:1.21.1:remapJar :fabric:1.21.4:remapJar :fabric:1.21.11:remapJar --build-cache
5050

5151
# Build both Sponge modules (legacy API 7 and modern API 11+)
5252
- name: Build Sponge modules
@@ -77,6 +77,7 @@ jobs:
7777
[Download Fabric 1.20.1](https://github.com/BanManagement/BanManager/releases/download/v${{ steps.version.outputs.VERSION }}/BanManagerFabric-mc1.20.1.jar)
7878
[Download Fabric 1.21.1](https://github.com/BanManagement/BanManager/releases/download/v${{ steps.version.outputs.VERSION }}/BanManagerFabric-mc1.21.1.jar)
7979
[Download Fabric 1.21.4](https://github.com/BanManagement/BanManager/releases/download/v${{ steps.version.outputs.VERSION }}/BanManagerFabric-mc1.21.4.jar)
80+
[Download Fabric 1.21.11](https://github.com/BanManagement/BanManager/releases/download/v${{ steps.version.outputs.VERSION }}/BanManagerFabric-mc1.21.11.jar)
8081
files: |
8182
bukkit/build/libs/BanManagerBukkit.jar
8283
bungee/build/libs/BanManagerBungeeCord.jar
@@ -86,3 +87,4 @@ jobs:
8687
fabric/versions/1.20.1/build/libs/BanManagerFabric-mc1.20.1.jar
8788
fabric/versions/1.21.1/build/libs/BanManagerFabric-mc1.21.1.jar
8889
fabric/versions/1.21.4/build/libs/BanManagerFabric-mc1.21.4.jar
90+
fabric/versions/1.21.11/build/libs/BanManagerFabric-mc1.21.11.jar

0 commit comments

Comments
 (0)