Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

Commit

Permalink
Import Winter Seasonal 2018
Browse files Browse the repository at this point in the history
  • Loading branch information
marcdif committed Dec 1, 2018
1 parent 6fcfee9 commit 4fdfae4
Show file tree
Hide file tree
Showing 1,883 changed files with 52,850 additions and 22,960 deletions.
17 changes: 0 additions & 17 deletions assets/minecraft/blockstates/acacia_fence.json

This file was deleted.

16 changes: 0 additions & 16 deletions assets/minecraft/blockstates/activator_rail.json

This file was deleted.

17 changes: 0 additions & 17 deletions assets/minecraft/blockstates/birch_fence.json

This file was deleted.

5 changes: 5 additions & 0 deletions assets/minecraft/blockstates/brick_block.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "brick" }
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/blockstates/brick_double_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "brick" },
"all": { "model": "brick" }
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/blockstates/brick_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"half=bottom": { "model": "half_slab_brick" },
"half=top": { "model": "upper_slab_brick" }
}
}
12 changes: 12 additions & 0 deletions assets/minecraft/blockstates/coarse_dirt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"variants": {
"normal": [
{ "model": "coarse_dirt" },
{ "model": "dirt/coarse_dirt1" },
{ "model": "dirt/coarse_dirt2" },
{ "model": "dirt/coarse_dirt3" },
{ "model": "dirt/coarse_dirt4" },
{ "model": "dirt/coarse_dirt5" }
]
}
}
36 changes: 36 additions & 0 deletions assets/minecraft/blockstates/cobblestone_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"variants": {
"east=false,north=false,south=false,up=false,west=false": { "model": "cobblestone_wall_post" },
"east=false,north=true,south=false,up=false,west=false": { "model": "cobblestone_wall_n" },
"east=true,north=false,south=false,up=false,west=false": { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=false": { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=false,west=true": { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=false,west=false": { "model": "cobblestone_wall_ne" },
"east=true,north=false,south=true,up=false,west=false": { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=true": { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=false,west=true": { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=false,west=false": { "model": "cobblestone_wall_ns" },
"east=true,north=false,south=false,up=false,west=true": { "model": "cobblestone_wall_ns", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=false,west=false": { "model": "cobblestone_wall_nse" },
"east=true,north=false,south=true,up=false,west=true": { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=false,west=true": { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=false,west=true": { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=false,west=true": { "model": "cobblestone_wall_nsew" },
"east=false,north=false,south=false,up=true,west=false": { "model": "cobblestone_wall_post" },
"east=false,north=true,south=false,up=true,west=false": { "model": "cobblestone_wall_n" },
"east=true,north=false,south=false,up=true,west=false": { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=false": { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=true,west=true": { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=true,west=false": { "model": "cobblestone_wall_ne" },
"east=true,north=false,south=true,up=true,west=false": { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=true": { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=true,west=true": { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=true,west=false": { "model": "cobblestone_wall_ns_above" },
"east=true,north=false,south=false,up=true,west=true": { "model": "cobblestone_wall_ns_above", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=true,west=false": { "model": "cobblestone_wall_nse" },
"east=true,north=false,south=true,up=true,west=true": { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=true,west=true": { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=true,west=true": { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=true,west=true": { "model": "cobblestone_wall_nsew" }
}
}
17 changes: 0 additions & 17 deletions assets/minecraft/blockstates/dark_oak_fence.json

This file was deleted.

16 changes: 0 additions & 16 deletions assets/minecraft/blockstates/detector_rail.json

This file was deleted.

17 changes: 0 additions & 17 deletions assets/minecraft/blockstates/fence.json

This file was deleted.

20 changes: 0 additions & 20 deletions assets/minecraft/blockstates/fence_gate.json

This file was deleted.

16 changes: 0 additions & 16 deletions assets/minecraft/blockstates/golden_rail.json

This file was deleted.

37 changes: 11 additions & 26 deletions assets/minecraft/blockstates/grass.json
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,32 +1,17 @@
{
"variants": {
"snowy=false": [
{ "model": "grass_normal", "weight": 100 },
{ "model": "grass_1_1", "weight": 100 },
{ "model": "grass_1_2", "weight": 100 },
{ "model": "grass_1_3", "weight": 100 },
{ "model": "grass_2_1", "weight": 100 },
{ "model": "grass_2_2", "weight": 100 },
{ "model": "grass_2_3", "weight": 100 },
{ "model": "grass_3_1", "weight": 100 },
{ "model": "grass_3_2", "weight": 100 },
{ "model": "grass_3_3", "weight": 100 },
{ "model": "grass_4_1", "weight": 100 },
{ "model": "grass_4_2", "weight": 100 },
{ "model": "grass_4_3", "weight": 100 },
{ "model": "grass_5_1", "weight": 100 },
{ "model": "grass_5_2", "weight": 100 },
{ "model": "grass_5_3", "weight": 100 },
{ "model": "grass_6_1", "weight": 100 },
{ "model": "grass_6_2", "weight": 100 },
{ "model": "grass_6_3", "weight": 100 },
{ "model": "grass_7_1", "weight": 100 },
{ "model": "grass_7_2", "weight": 100 },
{ "model": "grass_7_3", "weight": 100 },
{ "model": "grass_8_1", "weight": 100 },
{ "model": "grass_8_2", "weight": 100 },
{ "model": "grass_8_3", "weight": 100 }

{ "model": "grass_normal" },
{ "model": "grass/grass_normal1" },
{ "model": "grass/grass_normal2" },
{ "model": "grass/grass_normal3" },
{ "model": "grass/grass_normal4" },
{ "model": "grass/grass_normal5" },
{ "model": "grass/grass_normal6" },
{ "model": "grass/grass_normal7" },
{ "model": "grass/grass_normal8" },
{ "model": "grass/grass_normal9" },
{ "model": "grass/grass_normal10" }
],
"snowy=true": { "model": "grass_snowed" }
}
Expand Down
6 changes: 6 additions & 0 deletions assets/minecraft/blockstates/item_frame.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "item_frame" },
"map": { "model": "item_frame_map" }
}
}
36 changes: 0 additions & 36 deletions assets/minecraft/blockstates/jungle_door.json

This file was deleted.

17 changes: 0 additions & 17 deletions assets/minecraft/blockstates/jungle_fence.json

This file was deleted.

17 changes: 0 additions & 17 deletions assets/minecraft/blockstates/nether_brick_fence.json

This file was deleted.

14 changes: 0 additions & 14 deletions assets/minecraft/blockstates/rail.json

This file was deleted.

7 changes: 0 additions & 7 deletions assets/minecraft/blockstates/red_sand.json

This file was deleted.

6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/red_sandstone_double_slab.json

This file was deleted.

Loading

0 comments on commit 4fdfae4

Please sign in to comment.