Commit 9eb1da7
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 files changed
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
| 75 | + | |
75 | 76 | | |
76 | 77 | | |
77 | 78 | | |
| |||
81 | 82 | | |
82 | 83 | | |
83 | 84 | | |
| 85 | + | |
84 | 86 | | |
85 | 87 | | |
86 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| 80 | + | |
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
| |||
86 | 87 | | |
87 | 88 | | |
88 | 89 | | |
| 90 | + | |
0 commit comments