Merge pull request #1172 from Gerrygames/1.14

19w04a
This commit is contained in:
Myles 2019-01-24 15:59:09 +00:00 committed by GitHub
commit 2d0209b221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 90 additions and 85 deletions

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -67,7 +67,7 @@ public class ProtocolVersion {
register(v1_13 = new ProtocolVersion(393, "1.13"));
register(v1_13_1 = new ProtocolVersion(401, "1.13.1"));
register(v1_13_2 = new ProtocolVersion(404, "1.13.2"));
register(v1_14 = new ProtocolVersion(455, "1.14"));
register(v1_14 = new ProtocolVersion(456, "1.14"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

View File

@ -7293,8 +7293,8 @@
"7290": "minecraft:dark_oak_slab[type=bottom,waterlogged=false]",
"7291": "minecraft:dark_oak_slab[type=double,waterlogged=true]",
"7292": "minecraft:dark_oak_slab[type=double,waterlogged=false]",
"7293": "minecraft:smooth_stone_slab[type=top,waterlogged=true]",
"7294": "minecraft:smooth_stone_slab[type=top,waterlogged=false]",
"7293": "minecraft:stone_slab[type=top,waterlogged=true]",
"7294": "minecraft:stone_slab[type=top,waterlogged=false]",
"7295": "minecraft:stone_slab[type=bottom,waterlogged=true]",
"7296": "minecraft:stone_slab[type=bottom,waterlogged=false]",
"7297": "minecraft:stone_slab[type=double,waterlogged=true]",

View File

@ -10876,80 +10876,83 @@
"10873": "minecraft:lectern[facing=east,has_book=false,powered=true]",
"10874": "minecraft:lectern[facing=east,has_book=false,powered=false]",
"10875": "minecraft:smithing_table",
"10876": "minecraft:stonecutter",
"10877": "minecraft:bell[attachment=floor,facing=north]",
"10878": "minecraft:bell[attachment=floor,facing=south]",
"10879": "minecraft:bell[attachment=floor,facing=west]",
"10880": "minecraft:bell[attachment=floor,facing=east]",
"10881": "minecraft:bell[attachment=ceiling,facing=north]",
"10882": "minecraft:bell[attachment=ceiling,facing=south]",
"10883": "minecraft:bell[attachment=ceiling,facing=west]",
"10884": "minecraft:bell[attachment=ceiling,facing=east]",
"10885": "minecraft:bell[attachment=single_wall,facing=north]",
"10886": "minecraft:bell[attachment=single_wall,facing=south]",
"10887": "minecraft:bell[attachment=single_wall,facing=west]",
"10888": "minecraft:bell[attachment=single_wall,facing=east]",
"10889": "minecraft:bell[attachment=double_wall,facing=north]",
"10890": "minecraft:bell[attachment=double_wall,facing=south]",
"10891": "minecraft:bell[attachment=double_wall,facing=west]",
"10892": "minecraft:bell[attachment=double_wall,facing=east]",
"10893": "minecraft:lantern[hanging=true]",
"10894": "minecraft:lantern[hanging=false]",
"10895": "minecraft:campfire[facing=north,lit=true,signal_fire=true,waterlogged=true]",
"10896": "minecraft:campfire[facing=north,lit=true,signal_fire=true,waterlogged=false]",
"10897": "minecraft:campfire[facing=north,lit=true,signal_fire=false,waterlogged=true]",
"10898": "minecraft:campfire[facing=north,lit=true,signal_fire=false,waterlogged=false]",
"10899": "minecraft:campfire[facing=north,lit=false,signal_fire=true,waterlogged=true]",
"10900": "minecraft:campfire[facing=north,lit=false,signal_fire=true,waterlogged=false]",
"10901": "minecraft:campfire[facing=north,lit=false,signal_fire=false,waterlogged=true]",
"10902": "minecraft:campfire[facing=north,lit=false,signal_fire=false,waterlogged=false]",
"10903": "minecraft:campfire[facing=south,lit=true,signal_fire=true,waterlogged=true]",
"10904": "minecraft:campfire[facing=south,lit=true,signal_fire=true,waterlogged=false]",
"10905": "minecraft:campfire[facing=south,lit=true,signal_fire=false,waterlogged=true]",
"10906": "minecraft:campfire[facing=south,lit=true,signal_fire=false,waterlogged=false]",
"10907": "minecraft:campfire[facing=south,lit=false,signal_fire=true,waterlogged=true]",
"10908": "minecraft:campfire[facing=south,lit=false,signal_fire=true,waterlogged=false]",
"10909": "minecraft:campfire[facing=south,lit=false,signal_fire=false,waterlogged=true]",
"10910": "minecraft:campfire[facing=south,lit=false,signal_fire=false,waterlogged=false]",
"10911": "minecraft:campfire[facing=west,lit=true,signal_fire=true,waterlogged=true]",
"10912": "minecraft:campfire[facing=west,lit=true,signal_fire=true,waterlogged=false]",
"10913": "minecraft:campfire[facing=west,lit=true,signal_fire=false,waterlogged=true]",
"10914": "minecraft:campfire[facing=west,lit=true,signal_fire=false,waterlogged=false]",
"10915": "minecraft:campfire[facing=west,lit=false,signal_fire=true,waterlogged=true]",
"10916": "minecraft:campfire[facing=west,lit=false,signal_fire=true,waterlogged=false]",
"10917": "minecraft:campfire[facing=west,lit=false,signal_fire=false,waterlogged=true]",
"10918": "minecraft:campfire[facing=west,lit=false,signal_fire=false,waterlogged=false]",
"10919": "minecraft:campfire[facing=east,lit=true,signal_fire=true,waterlogged=true]",
"10920": "minecraft:campfire[facing=east,lit=true,signal_fire=true,waterlogged=false]",
"10921": "minecraft:campfire[facing=east,lit=true,signal_fire=false,waterlogged=true]",
"10922": "minecraft:campfire[facing=east,lit=true,signal_fire=false,waterlogged=false]",
"10923": "minecraft:campfire[facing=east,lit=false,signal_fire=true,waterlogged=true]",
"10924": "minecraft:campfire[facing=east,lit=false,signal_fire=true,waterlogged=false]",
"10925": "minecraft:campfire[facing=east,lit=false,signal_fire=false,waterlogged=true]",
"10926": "minecraft:campfire[facing=east,lit=false,signal_fire=false,waterlogged=false]",
"10927": "minecraft:sweet_berry_bush[age=0]",
"10928": "minecraft:sweet_berry_bush[age=1]",
"10929": "minecraft:sweet_berry_bush[age=2]",
"10930": "minecraft:sweet_berry_bush[age=3]",
"10931": "minecraft:structure_block[mode=save]",
"10932": "minecraft:structure_block[mode=load]",
"10933": "minecraft:structure_block[mode=corner]",
"10934": "minecraft:structure_block[mode=data]",
"10935": "minecraft:jigsaw[facing=north]",
"10936": "minecraft:jigsaw[facing=east]",
"10937": "minecraft:jigsaw[facing=south]",
"10938": "minecraft:jigsaw[facing=west]",
"10939": "minecraft:jigsaw[facing=up]",
"10940": "minecraft:jigsaw[facing=down]",
"10941": "minecraft:composter[level=0]",
"10942": "minecraft:composter[level=1]",
"10943": "minecraft:composter[level=2]",
"10944": "minecraft:composter[level=3]",
"10945": "minecraft:composter[level=4]",
"10946": "minecraft:composter[level=5]",
"10947": "minecraft:composter[level=6]",
"10948": "minecraft:composter[level=7]",
"10949": "minecraft:composter[level=8]"
"10876": "minecraft:stonecutter[facing=north]",
"10877": "minecraft:stonecutter[facing=south]",
"10878": "minecraft:stonecutter[facing=west]",
"10879": "minecraft:stonecutter[facing=east]",
"10880": "minecraft:bell[attachment=floor,facing=north]",
"10881": "minecraft:bell[attachment=floor,facing=south]",
"10882": "minecraft:bell[attachment=floor,facing=west]",
"10883": "minecraft:bell[attachment=floor,facing=east]",
"10884": "minecraft:bell[attachment=ceiling,facing=north]",
"10885": "minecraft:bell[attachment=ceiling,facing=south]",
"10886": "minecraft:bell[attachment=ceiling,facing=west]",
"10887": "minecraft:bell[attachment=ceiling,facing=east]",
"10888": "minecraft:bell[attachment=single_wall,facing=north]",
"10889": "minecraft:bell[attachment=single_wall,facing=south]",
"10890": "minecraft:bell[attachment=single_wall,facing=west]",
"10891": "minecraft:bell[attachment=single_wall,facing=east]",
"10892": "minecraft:bell[attachment=double_wall,facing=north]",
"10893": "minecraft:bell[attachment=double_wall,facing=south]",
"10894": "minecraft:bell[attachment=double_wall,facing=west]",
"10895": "minecraft:bell[attachment=double_wall,facing=east]",
"10896": "minecraft:lantern[hanging=true]",
"10897": "minecraft:lantern[hanging=false]",
"10898": "minecraft:campfire[facing=north,lit=true,signal_fire=true,waterlogged=true]",
"10899": "minecraft:campfire[facing=north,lit=true,signal_fire=true,waterlogged=false]",
"10900": "minecraft:campfire[facing=north,lit=true,signal_fire=false,waterlogged=true]",
"10901": "minecraft:campfire[facing=north,lit=true,signal_fire=false,waterlogged=false]",
"10902": "minecraft:campfire[facing=north,lit=false,signal_fire=true,waterlogged=true]",
"10903": "minecraft:campfire[facing=north,lit=false,signal_fire=true,waterlogged=false]",
"10904": "minecraft:campfire[facing=north,lit=false,signal_fire=false,waterlogged=true]",
"10905": "minecraft:campfire[facing=north,lit=false,signal_fire=false,waterlogged=false]",
"10906": "minecraft:campfire[facing=south,lit=true,signal_fire=true,waterlogged=true]",
"10907": "minecraft:campfire[facing=south,lit=true,signal_fire=true,waterlogged=false]",
"10908": "minecraft:campfire[facing=south,lit=true,signal_fire=false,waterlogged=true]",
"10909": "minecraft:campfire[facing=south,lit=true,signal_fire=false,waterlogged=false]",
"10910": "minecraft:campfire[facing=south,lit=false,signal_fire=true,waterlogged=true]",
"10911": "minecraft:campfire[facing=south,lit=false,signal_fire=true,waterlogged=false]",
"10912": "minecraft:campfire[facing=south,lit=false,signal_fire=false,waterlogged=true]",
"10913": "minecraft:campfire[facing=south,lit=false,signal_fire=false,waterlogged=false]",
"10914": "minecraft:campfire[facing=west,lit=true,signal_fire=true,waterlogged=true]",
"10915": "minecraft:campfire[facing=west,lit=true,signal_fire=true,waterlogged=false]",
"10916": "minecraft:campfire[facing=west,lit=true,signal_fire=false,waterlogged=true]",
"10917": "minecraft:campfire[facing=west,lit=true,signal_fire=false,waterlogged=false]",
"10918": "minecraft:campfire[facing=west,lit=false,signal_fire=true,waterlogged=true]",
"10919": "minecraft:campfire[facing=west,lit=false,signal_fire=true,waterlogged=false]",
"10920": "minecraft:campfire[facing=west,lit=false,signal_fire=false,waterlogged=true]",
"10921": "minecraft:campfire[facing=west,lit=false,signal_fire=false,waterlogged=false]",
"10922": "minecraft:campfire[facing=east,lit=true,signal_fire=true,waterlogged=true]",
"10923": "minecraft:campfire[facing=east,lit=true,signal_fire=true,waterlogged=false]",
"10924": "minecraft:campfire[facing=east,lit=true,signal_fire=false,waterlogged=true]",
"10925": "minecraft:campfire[facing=east,lit=true,signal_fire=false,waterlogged=false]",
"10926": "minecraft:campfire[facing=east,lit=false,signal_fire=true,waterlogged=true]",
"10927": "minecraft:campfire[facing=east,lit=false,signal_fire=true,waterlogged=false]",
"10928": "minecraft:campfire[facing=east,lit=false,signal_fire=false,waterlogged=true]",
"10929": "minecraft:campfire[facing=east,lit=false,signal_fire=false,waterlogged=false]",
"10930": "minecraft:sweet_berry_bush[age=0]",
"10931": "minecraft:sweet_berry_bush[age=1]",
"10932": "minecraft:sweet_berry_bush[age=2]",
"10933": "minecraft:sweet_berry_bush[age=3]",
"10934": "minecraft:structure_block[mode=save]",
"10935": "minecraft:structure_block[mode=load]",
"10936": "minecraft:structure_block[mode=corner]",
"10937": "minecraft:structure_block[mode=data]",
"10938": "minecraft:jigsaw[facing=north]",
"10939": "minecraft:jigsaw[facing=east]",
"10940": "minecraft:jigsaw[facing=south]",
"10941": "minecraft:jigsaw[facing=west]",
"10942": "minecraft:jigsaw[facing=up]",
"10943": "minecraft:jigsaw[facing=down]",
"10944": "minecraft:composter[level=0]",
"10945": "minecraft:composter[level=1]",
"10946": "minecraft:composter[level=2]",
"10947": "minecraft:composter[level=3]",
"10948": "minecraft:composter[level=4]",
"10949": "minecraft:composter[level=5]",
"10950": "minecraft:composter[level=6]",
"10951": "minecraft:composter[level=7]",
"10952": "minecraft:composter[level=8]"
},
"items": {
"0": "minecraft:air",
@ -12479,6 +12482,8 @@
"ui.loom.select_pattern",
"ui.loom.take_result",
"ui.cartography_table.take_result",
"ui.stonecutter.take_result",
"ui.stonecutter.select_recipe",
"ui.toast.challenge_complete",
"ui.toast.in",
"ui.toast.out",

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>viaversion-jar</name>

View File

@ -6,7 +6,7 @@
<groupId>us.myles</groupId>
<artifactId>viaversion-parent</artifactId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
<packaging>pom</packaging>
<name>viaversion-parent</name>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w03c</version>
<version>2.0.0-19w04a</version>
</parent>
<modelVersion>4.0.0</modelVersion>