Skip to content

Commit 3661a42

Browse files
Merge branch '1.21.4' into 1.21.1
2 parents 7ef4b43 + 27460b9 commit 3661a42

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

.github/workflows/auto_snapshot_update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: echo ${{ inputs.distinct_id }}
3535

3636
- name: Checkout repository
37-
uses: actions/checkout@v5
37+
uses: actions/checkout@v6
3838

3939
- name: Set up Python 3.12
4040
uses: actions/setup-python@v6

.github/workflows/check_translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222

2323
- name: Checkout repository
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2525

2626
- name: Check translations
2727
uses: Wurst-Imperium/check-translations@v1

.github/workflows/dependency_graph.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323

2424
- name: Checkout repository
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626

2727
- name: Set up Java 21
2828
uses: actions/setup-java@v5

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: echo ${{ inputs.distinct_id }}
3636

3737
- name: Checkout repository
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939

4040
- name: Set up Java 21
4141
uses: actions/setup-java@v5

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: echo ${{ inputs.distinct_id }}
4343

4444
- name: Checkout repository
45-
uses: actions/checkout@v5
45+
uses: actions/checkout@v6
4646
with:
4747
# Include all tags in case the new tag already exists.
4848
fetch-tags: true

src/main/java/net/wurstclient/WurstTranslator.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,11 @@ private boolean isBuiltInWurstResourcePack(Resource resource)
232232
.flatMap(Resource::knownPackInfo).orElse(null);
233233
if(knownPack == null)
234234
return false;
235-
236-
return "fabric".equals(knownPack.namespace())
235+
236+
// Note: Namespace can be "fabric" or "vanilla" depending on
237+
// Fabric API version (changed in 0.139.3+1.21.11).
238+
return ("fabric".equals(knownPack.namespace())
239+
|| "vanilla".equals(knownPack.namespace()))
237240
&& "wurst".equals(knownPack.id());
238241
}
239242
}

0 commit comments

Comments
 (0)