Skip to content

Commit f1552e9

Browse files
barteldvnbarteldvn
authored
Merge pull request #377 from MCME/development
Development
2 parents bc3c6dc + b5cded8 commit f1552e9

66 files changed

Lines changed: 86 additions & 1973 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎assets/minecraft/blockstates/bamboo.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,6 @@
6161
{ "model": "mcme:block/putrid_stump_2", "y": 90 },
6262
{ "model": "mcme:block/putrid_stump_2", "y": 180 },
6363
{ "model": "mcme:block/putrid_stump_2", "y": 270 }
64-
],
65-
"age=0,leaves=none,stage=1": [
66-
{ "model": "block/xmas/xmas_candycane" }
67-
],
68-
"age=0,leaves=small,stage=1": [
69-
{ "model": "block/xmas/xmas_candycane", "y":90 }
70-
],
71-
"age=0,leaves=large,stage=1": [
72-
{ "model": "block/xmas/xmas_candycane", "y":180 }
73-
],
74-
"age=1,leaves=none,stage=1": [
75-
{ "model": "block/xmas/xmas_candycane", "y":270 }
7664
]
7765
}
7866
}

‎assets/minecraft/blockstates/cave_vines.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@
103103
{ "model": "minecraft:block/brazier", "y": 90},
104104
{ "model": "minecraft:block/brazier", "y": 180},
105105
{ "model": "minecraft:block/brazier", "y": 270}
106-
],
107-
"berries=false,age=18": [
108-
{ "model": "minecraft:block/xmas/xmas_tree"},
109-
{ "model": "minecraft:block/xmas/xmas_tree", "y": 90},
110-
{ "model": "minecraft:block/xmas/xmas_tree", "y": 180},
111-
{ "model": "minecraft:block/xmas/xmas_tree", "y": 270}
112106
]
113107

114108
}

‎assets/minecraft/blockstates/oxidized_copper_trapdoor.json‎

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

‎assets/minecraft/blockstates/pale_oak_door.json‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,22 @@
7878
"facing\u003dwest,half\u003dupper,hinge\u003dleft,open\u003dfalse,powered\u003dfalse": {
7979
"model": "mcme:block/small_stone_bricks_flat_1x3arch",
8080
"y": 90
81-
}
81+
},
82+
"facing\u003dnorth,half\u003dupper,hinge\u003dleft,open\u003dtrue,powered\u003dfalse": [
83+
{ "model": "minecraft:block/dark_stone_rim", "y": 90 },
84+
{ "model": "minecraft:block/dark_stone_rim_2", "y": 90 }
85+
],
86+
"facing\u003deast,half\u003dupper,hinge\u003dleft,open\u003dtrue,powered\u003dfalse": [
87+
{ "model": "minecraft:block/dark_stone_rim", "y": 180 },
88+
{ "model": "minecraft:block/dark_stone_rim_2", "y": 180 }
89+
],
90+
"facing\u003dsouth,half\u003dupper,hinge\u003dleft,open\u003dtrue,powered\u003dfalse": [
91+
{ "model": "minecraft:block/dark_stone_rim", "y": 270 },
92+
{ "model": "minecraft:block/dark_stone_rim_2", "y": 270 }
93+
],
94+
"facing\u003dwest,half\u003dupper,hinge\u003dleft,open\u003dtrue,powered\u003dfalse": [
95+
{ "model": "minecraft:block/dark_stone_rim" },
96+
{ "model": "minecraft:block/dark_stone_rim_2" }
97+
]
8298
}
8399
}

‎assets/minecraft/blockstates/pumpkin.json‎

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

‎assets/minecraft/blockstates/repeater.json‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,24 @@
3939
{ "model": "block/repeater_delay3_s_3" }
4040
],
4141
"delay=3,facing=west,locked=false,powered=false": { "model": "block/repeater_delay3_w" },
42-
"delay=3,facing=north,locked=false,powered=false": { "model": "block/unused_cross_0" },
42+
"delay=3,facing=north,locked=false,powered=false": [
43+
{ "model": "block/orange_concrete_powder_slab" },
44+
{ "model": "block/orange_concrete_powder_slab", "y":90 },
45+
{ "model": "block/orange_concrete_powder_slab", "y":180 },
46+
{ "model": "block/orange_concrete_powder_slab", "y":270 },
47+
{ "model": "block/orange_concrete_powder_slab_2" },
48+
{ "model": "block/orange_concrete_powder_slab_2", "y":90 },
49+
{ "model": "block/orange_concrete_powder_slab_2", "y":180 },
50+
{ "model": "block/orange_concrete_powder_slab_2", "y":270 },
51+
{ "model": "block/orange_concrete_powder_slab_2" },
52+
{ "model": "block/orange_concrete_powder_slab_3", "y":90 },
53+
{ "model": "block/orange_concrete_powder_slab_3", "y":180 },
54+
{ "model": "block/orange_concrete_powder_slab_3", "y":270 },
55+
{ "model": "block/orange_concrete_powder_slab_3" },
56+
{ "model": "block/orange_concrete_powder_slab_4", "y":90 },
57+
{ "model": "block/orange_concrete_powder_slab_4", "y":180 },
58+
{ "model": "block/orange_concrete_powder_slab_4", "y":270 }
59+
],
4360
"delay=3,facing=east,locked=false,powered=false": { "model": "block/repeater_delay3_e" },
4461
"delay=4,facing=south,locked=false,powered=false": [
4562
{ "model": "block/double_slab_nether_brick_seamless_slab" },

‎assets/minecraft/blockstates/smooth_sandstone_slab.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
{ "model": "block/smooth_sandstone_slab", "y": 90 },
88
{ "model": "block/smooth_sandstone_slab", "y": 180 },
99
{ "model": "block/smooth_sandstone_slab", "y": 270},
10-
{ "model": "block/smooth_sandstone_slab_2" },
11-
{ "model": "block/smooth_sandstone_slab_2", "y": 90 },
12-
{ "model": "block/smooth_sandstone_slab_2", "y": 180 },
13-
{ "model": "block/smooth_sandstone_slab_2", "y": 270},
1410
{ "model": "block/smooth_sandstone_slab_3" },
1511
{ "model": "block/smooth_sandstone_slab_3", "y": 90 },
1612
{ "model": "block/smooth_sandstone_slab_3", "y": 180 },

‎assets/minecraft/items/carved_pumpkin.json‎

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

‎assets/minecraft/items/clay_ball.json‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7336,56 +7336,14 @@
73367336
"threshold": 1048,
73377337
"model": {
73387338
"type": "model",
7339-
"model": "block/xmas/xmas_tree"
7339+
"model": "block/orange_concrete_powder_slab"
73407340
}
73417341
},
73427342
{
73437343
"threshold": 1049,
73447344
"model": {
73457345
"type": "model",
7346-
"model": "block/xmas/xmas_bow"
7347-
}
7348-
},
7349-
{
7350-
"threshold": 1050,
7351-
"model": {
7352-
"type": "model",
7353-
"model": "block/xmas/xmas_candycane_cross_ground"
7354-
}
7355-
},
7356-
{
7357-
"threshold": 1051,
7358-
"model": {
7359-
"type": "model",
7360-
"model": "block/xmas/xmas_wreath"
7361-
}
7362-
},
7363-
{
7364-
"threshold": 1052,
7365-
"model": {
7366-
"type": "model",
7367-
"model": "block/xmas/xmas_candycane_cross"
7368-
}
7369-
},
7370-
{
7371-
"threshold": 1053,
7372-
"model": {
7373-
"type": "model",
7374-
"model": "block/xmas/xmas_sock_b"
7375-
}
7376-
},
7377-
{
7378-
"threshold": 1054,
7379-
"model": {
7380-
"type": "model",
7381-
"model": "block/xmas/xmas_candycane"
7382-
}
7383-
},
7384-
{
7385-
"threshold": 1055,
7386-
"model": {
7387-
"type": "model",
7388-
"model": "block/xmas/xmas_green_present"
7346+
"model": "block/dark_stone_rim"
73897347
}
73907348
},
73917349
{

‎assets/minecraft/models/block/dark_stone_rim.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "block/rim_parent",
3+
"textures": {
4+
"1": "block/dark_gray_architrave_top",
5+
"2": "block/dark_sponge"
6+
}
7+
}
8+

0 commit comments

Comments
 (0)