3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-03 14:50:30 +01:00

Merge pull request #836 from creeper123123321/dev2

18w22c
Dieser Commit ist enthalten in:
Myles 2018-05-31 20:18:47 +01:00 committet von GitHub
Commit 06056de6bb
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
10 geänderte Dateien mit 8414 neuen und 8342 gelöschten Zeilen

Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w21b</version> <version>1.4.0-18w22c</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w21b</version> <version>1.4.0-18w22c</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w21b</version> <version>1.4.0-18w22c</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

Datei anzeigen

@ -62,7 +62,7 @@ public class ProtocolVersion {
register(v1_12 = new ProtocolVersion(335, "1.12")); register(v1_12 = new ProtocolVersion(335, "1.12"));
register(v1_12_1 = new ProtocolVersion(338, "1.12.1")); register(v1_12_1 = new ProtocolVersion(338, "1.12.1"));
register(v1_12_2 = new ProtocolVersion(340, "1.12.2")); register(v1_12_2 = new ProtocolVersion(340, "1.12.2"));
register(v1_13 = new ProtocolVersion(379, "18w21b")); register(v1_13 = new ProtocolVersion(382, "18w22c"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN")); register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
} }

Datei anzeigen

@ -114,26 +114,26 @@
"281": "minecraft:spruce_log[axis=z]", "281": "minecraft:spruce_log[axis=z]",
"282": "minecraft:birch_log[axis=z]", "282": "minecraft:birch_log[axis=z]",
"283": "minecraft:jungle_log[axis=z]", "283": "minecraft:jungle_log[axis=z]",
"284": "minecraft:oak_bark", "284": "minecraft:oak_bark[axis=y]",
"285": "minecraft:spruce_bark", "285": "minecraft:spruce_bark[axis=y]",
"286": "minecraft:birch_bark", "286": "minecraft:birch_bark[axis=y]",
"287": "minecraft:jungle_bark", "287": "minecraft:jungle_bark[axis=y]",
"288": "minecraft:oak_leaves[check_decay=false,decayable=true]", "288": "minecraft:oak_leaves[distance=1,persistent=false]",
"289": "minecraft:spruce_leaves[check_decay=false,decayable=true]", "289": "minecraft:spruce_leaves[distance=1,persistent=false]",
"290": "minecraft:birch_leaves[check_decay=false,decayable=true]", "290": "minecraft:birch_leaves[distance=1,persistent=false]",
"291": "minecraft:jungle_leaves[check_decay=false,decayable=true]", "291": "minecraft:jungle_leaves[distance=1,persistent=false]",
"292": "minecraft:oak_leaves[check_decay=false,decayable=false]", "292": "minecraft:oak_leaves[distance=1,persistent=true]",
"293": "minecraft:spruce_leaves[check_decay=false,decayable=false]", "293": "minecraft:spruce_leaves[distance=1,persistent=true]",
"294": "minecraft:birch_leaves[check_decay=false,decayable=false]", "294": "minecraft:birch_leaves[distance=1,persistent=true]",
"295": "minecraft:jungle_leaves[check_decay=false,decayable=false]", "295": "minecraft:jungle_leaves[distance=1,persistent=true]",
"296": "minecraft:oak_leaves[check_decay=true,decayable=true]", "296": "minecraft:oak_leaves[distance=2,persistent=false]",
"297": "minecraft:spruce_leaves[check_decay=true,decayable=true]", "297": "minecraft:spruce_leaves[distance=2,persistent=false]",
"298": "minecraft:birch_leaves[check_decay=true,decayable=true]", "298": "minecraft:birch_leaves[distance=2,persistent=false]",
"299": "minecraft:jungle_leaves[check_decay=true,decayable=true]", "299": "minecraft:jungle_leaves[distance=2,persistent=false]",
"300": "minecraft:oak_leaves[check_decay=true,decayable=false]", "300": "minecraft:oak_leaves[distance=2,persistent=true]",
"301": "minecraft:spruce_leaves[check_decay=true,decayable=false]", "301": "minecraft:spruce_leaves[distance=2,persistent=true]",
"302": "minecraft:birch_leaves[check_decay=true,decayable=false]", "302": "minecraft:birch_leaves[distance=2,persistent=true]",
"303": "minecraft:jungle_leaves[check_decay=true,decayable=false]", "303": "minecraft:jungle_leaves[distance=2,persistent=true]",
"304": "minecraft:sponge", "304": "minecraft:sponge",
"305": "minecraft:wet_sponge", "305": "minecraft:wet_sponge",
"320": "minecraft:glass", "320": "minecraft:glass",
@ -1127,22 +1127,22 @@
"2573": "minecraft:green_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]", "2573": "minecraft:green_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"2574": "minecraft:red_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]", "2574": "minecraft:red_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"2575": "minecraft:black_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]", "2575": "minecraft:black_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"2576": "minecraft:acacia_leaves[check_decay=false,decayable=true]", "2576": "minecraft:acacia_leaves[distance=1,persistent=false]",
"2577": "minecraft:dark_oak_leaves[check_decay=false,decayable=true]", "2577": "minecraft:dark_oak_leaves[distance=1,persistent=false]",
"2580": "minecraft:acacia_leaves[check_decay=false,decayable=false]", "2580": "minecraft:acacia_leaves[distance=1,persistent=true]",
"2581": "minecraft:dark_oak_leaves[check_decay=false,decayable=false]", "2581": "minecraft:dark_oak_leaves[distance=1,persistent=true]",
"2584": "minecraft:acacia_leaves[check_decay=true,decayable=true]", "2584": "minecraft:acacia_leaves[distance=2,persistent=false]",
"2585": "minecraft:dark_oak_leaves[check_decay=true,decayable=true]", "2585": "minecraft:dark_oak_leaves[distance=2,persistent=false]",
"2588": "minecraft:acacia_leaves[check_decay=true,decayable=false]", "2588": "minecraft:acacia_leaves[distance=2,persistent=true]",
"2589": "minecraft:dark_oak_leaves[check_decay=true,decayable=false]", "2589": "minecraft:dark_oak_leaves[distance=2,persistent=true]",
"2592": "minecraft:acacia_log[axis=y]", "2592": "minecraft:acacia_log[axis=y]",
"2593": "minecraft:dark_oak_log[axis=y]", "2593": "minecraft:dark_oak_log[axis=y]",
"2596": "minecraft:acacia_log[axis=x]", "2596": "minecraft:acacia_log[axis=x]",
"2597": "minecraft:dark_oak_log[axis=x]", "2597": "minecraft:dark_oak_log[axis=x]",
"2600": "minecraft:acacia_log[axis=z]", "2600": "minecraft:acacia_log[axis=z]",
"2601": "minecraft:dark_oak_log[axis=z]", "2601": "minecraft:dark_oak_log[axis=z]",
"2604": "minecraft:acacia_bark", "2604": "minecraft:acacia_bark[axis=y]",
"2605": "minecraft:dark_oak_bark", "2605": "minecraft:dark_oak_bark[axis=y]",
"2608": "minecraft:acacia_stairs[facing=east,half=bottom,shape=straight,waterlogged=false]", "2608": "minecraft:acacia_stairs[facing=east,half=bottom,shape=straight,waterlogged=false]",
"2609": "minecraft:acacia_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]", "2609": "minecraft:acacia_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]",
"2610": "minecraft:acacia_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]", "2610": "minecraft:acacia_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]",

Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w21b</version> <version>1.4.0-18w22c</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>viaversion-jar</name> <name>viaversion-jar</name>

Datei anzeigen

@ -6,7 +6,7 @@
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<version>1.4.0-18w21b</version> <version>1.4.0-18w22c</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>viaversion-parent</name> <name>viaversion-parent</name>

Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w21b</version> <version>1.4.0-18w22c</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w21b</version> <version>1.4.0-18w22c</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>