Skip to content

Commit e8d72b6

Browse files
authored
Merge pull request #373 from MCME/revert-371-dev/wyatt/stumpupdate
Revert "stumps sandstone stair fix and sack"
2 parents 2234185 + f675368 commit e8d72b6

22 files changed

Lines changed: 8 additions & 176 deletions
Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
{
22
"variants": {
3-
"": [
4-
{ "model": "block/sack" },
5-
{ "model": "block/sack", "y": 180 },
6-
{ "model": "block/sack", "y": 90 },
7-
{ "model": "block/sack", "y": 270 },
8-
{ "model": "block/sack_2" },
9-
{ "model": "block/sack_2", "y": 180 },
10-
{ "model": "block/sack_2", "y": 90 },
11-
{ "model": "block/sack_2", "y": 270 },
12-
{ "model": "block/sack_3" },
13-
{ "model": "block/sack_3", "y": 180 },
14-
{ "model": "block/sack_3", "y": 90 },
15-
{ "model": "block/sack_3", "y": 270 },
16-
{ "model": "block/sack_4" },
17-
{ "model": "block/sack_4", "y": 180 },
18-
{ "model": "block/sack_4", "y": 90 },
19-
{ "model": "block/sack_4", "y": 270 }
20-
]
3+
"": {
4+
"model": "block/replace", "y": 90
5+
}
216
}
227
}

assets/minecraft/blockstates/jungle_button.json

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,10 @@
3838
"y": 90,
3939
"x": 180
4040
},
41-
"face=floor,facing=east,powered=false": [
42-
{ "model": "minecraft:block/tree_stump_rings" },
43-
{ "model": "minecraft:block/tree_stump_rings", "y": 90 },
44-
{ "model": "minecraft:block/tree_stump_rings", "y": 180 },
45-
{ "model": "minecraft:block/tree_stump_rings", "y": 270 },
46-
{ "model": "minecraft:block/tree_stump_rings_2" },
47-
{ "model": "minecraft:block/tree_stump_rings_2", "y": 90 },
48-
{ "model": "minecraft:block/tree_stump_rings_2", "y": 180 },
49-
{ "model": "minecraft:block/tree_stump_rings_2", "y": 270 },
50-
{ "model": "minecraft:block/tree_stump_rings_3" },
51-
{ "model": "minecraft:block/tree_stump_rings_3", "y": 90 },
52-
{ "model": "minecraft:block/tree_stump_rings_3", "y": 180 },
53-
{ "model": "minecraft:block/tree_stump_rings_3", "y": 270 }
54-
],
41+
"face=floor,facing=east,powered=false": {
42+
"model": "minecraft:block/jungle_button",
43+
"y": 90
44+
},
5545
"face=floor,facing=east,powered=true": {
5646
"model": "minecraft:block/jungle_button_pressed",
5747
"y": 90

assets/minecraft/blockstates/sandstone_wall.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{ "model": "block/sandstone_bricks_side_stairs_5", "y": 180 }
2323
],
2424
"up=false,north=none,east=tall,south=tall,west=none": [
25-
{ "model": "block/sandstone_bricks_side_stairs", "y": 270 },
25+
{ "model": "block/sandstone_bricks_side_stairs" },
2626
{ "model": "block/sandstone_bricks_side_stairs_2", "y": 270 },
2727
{ "model": "block/sandstone_bricks_side_stairs_3", "y": 270 },
2828
{ "model": "block/sandstone_bricks_side_stairs_4", "y": 270 },

assets/minecraft/items/clay_ball.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7387,20 +7387,6 @@
73877387
"type": "model",
73887388
"model": "block/xmas/xmas_green_present"
73897389
}
7390-
},
7391-
{
7392-
"threshold": 1056,
7393-
"model": {
7394-
"type": "model",
7395-
"model": "block/tree_stump_rings"
7396-
}
7397-
},
7398-
{
7399-
"threshold": 1057,
7400-
"model": {
7401-
"type": "model",
7402-
"model": "block/sack"
7403-
}
74047390
}
74057391
]
74067392
}

assets/minecraft/models/block/sack.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

assets/minecraft/models/block/sack_2.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

assets/minecraft/models/block/sack_3.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

assets/minecraft/models/block/sack_4.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

assets/minecraft/models/block/tree_stump_rings.json

Lines changed: 0 additions & 55 deletions
This file was deleted.

assets/minecraft/models/block/tree_stump_rings_2.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)