Skip to content

Commit 66c810c

Browse files
Merge remote-tracking branch 'origin/master' into dev
2 parents 0a20ead + 3422d90 commit 66c810c

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
uses: actions/checkout@v4
1010
- name: Validate Gradle Wrapper
1111
uses: gradle/wrapper-validation-action@v1
12-
- name: Set up JDK 8
12+
- name: Set up JDK 17
1313
uses: actions/setup-java@v4
1414
with:
1515
distribution: 'temurin'
16-
java-version: 8
16+
java-version: 17
1717
check-latest: true
1818
- name: Cache Dependencies
19-
uses: actions/cache@v3
19+
uses: actions/cache@v4
2020
with:
2121
path: |
2222
~/.gradle/caches

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
uses: actions/checkout@v4
1515
- name: Validate Gradle Wrapper
1616
uses: gradle/wrapper-validation-action@v1
17-
- name: Set up JDK 8
17+
- name: Set up JDK 17
1818
uses: actions/setup-java@v4
1919
with:
2020
distribution: 'temurin'
21-
java-version: 8
21+
java-version: 17
2222
check-latest: true
2323
- name: Publish
2424
env:

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/model/MetaIndex1_7_6_10To1_8.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public enum MetaIndex1_7_6_10To1_8 {
7878
SPIDER_CLIMBING(EntityTypes1_10.EntityType.SPIDER, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
7979
CREEPER_STATE(EntityTypes1_10.EntityType.CREEPER, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
8080
CREEPER_POWERED(EntityTypes1_10.EntityType.CREEPER, 17, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
81+
CREEPER_IGNITED(EntityTypes1_10.EntityType.CREEPER, 18, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
8182
GHAST_STATE(EntityTypes1_10.EntityType.GHAST, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
8283
GHAST_IS_POWERED(EntityTypes1_10.EntityType.GHAST, 17, MetaType1_7_6_10.NonExistent, MetaType1_8.Byte),
8384
SLIME_SIZE(EntityTypes1_10.EntityType.SLIME, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ guava_version=17.0
1515
mcVersions=1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8
1616
mcVersionRange=1.8-1.20.2
1717
waterfallVersion=1.20
18-
velocityVersion=3.2
18+
velocityVersion=3.3

0 commit comments

Comments
 (0)