Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-24 19:46:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mc/1.12

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2020-02-07 19:23:40 +01:00
commit c3ae587ff5
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BlueMapCore/src/main/resourceExtensions/assets/minecraft/blockstates/barrier.json Normal file
View File

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "block/barrier" }
}
}

1
BlueMapCore/src/main/resourceExtensions/assets/minecraft/models/block/barrier.json Normal file
View File

@ -0,0 +1 @@
{}

1
BlueMapCore/src/main/resources/blockIds.json
View File

@ -1125,6 +1125,7 @@
"164:6": "minecraft:dark_oak_stairs[facing=south,half=top]", "164:6": "minecraft:dark_oak_stairs[facing=south,half=top]",
"164:7": "minecraft:dark_oak_stairs[facing=north,half=top]", "164:7": "minecraft:dark_oak_stairs[facing=north,half=top]",
"165:0": "minecraft:slime[]", "165:0": "minecraft:slime[]",
"166:0": "minecraft:barrier",
"167:0": "minecraft:iron_trapdoor[facing=north,half=bottom,open=false]", "167:0": "minecraft:iron_trapdoor[facing=north,half=bottom,open=false]",
"167:1": "minecraft:iron_trapdoor[facing=south,half=bottom,open=false]", "167:1": "minecraft:iron_trapdoor[facing=south,half=bottom,open=false]",
"167:2": "minecraft:iron_trapdoor[facing=west,half=bottom,open=false]", "167:2": "minecraft:iron_trapdoor[facing=west,half=bottom,open=false]",