Merge pull request #1 from lazerl0rd/master

Add missing textures and models from Chorus' Version

assets/minecraft/blockstates/cut_sandstone.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "": [
+			{ "model": "block/cut_sandstone" },
+			{ "model": "block/sandstone/cut/normal/1" },
+			{ "model": "block/sandstone/cut/normal/2" },
+			{ "model": "block/sandstone/cut/normal/3" }
+		]
+    }
+}

assets/minecraft/blockstates/cut_sandstone_slab.json

@@ -0,0 +1,22 @@
+{
+    "variants": {
+        "type=bottom": [
+			{ "model": "block/cut_sandstone_slab" },
+			{ "model": "block/cut_sandstone/cut/normal/slab/l1" },
+			{ "model": "block/cut_sandstone/cut/normal/slab/l2" },
+			{ "model": "block/cut_sandstone/cut/normal/slab/l3" }
+		],
+        "type=top": [
+			{ "model": "block/cut_sandstone_slab_top" },
+			{ "model": "block/cut_sandstone/cut/normal/slab/u1" },
+			{ "model": "block/cut_sandstone/cut/normal/slab/u2" },
+			{ "model": "block/cut_sandstone/cut/normal/slab/u3" }
+		],
+		"type=double": [
+			{ "model": "block/cut_sandstone" },
+			{ "model": "block/cut_sandstone/cut/normal/1" },
+			{ "model": "block/cut_sandstone/cut/normal/2" },
+			{ "model": "block/cut_sandstone/cut/normal/3" }
+		]
+    }
+}

assets/minecraft/blockstates/nether_gold_ore.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "": [
+            { "model": "block/nether_gold_ore" },
+            { "model": "block/ore/nether_gold/1"}
+		]
+    }
+}

assets/minecraft/blockstates/netherrack.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "": [
+            { "model": "block/netherrack" },
+            { "model": "block/netherrack", "y": 90 },
+            { "model": "block/netherrack", "y": 180 },
+            { "model": "block/netherrack", "y": 90 }
+        ]
+    }
+}

assets/minecraft/blockstates/polished_blackstone_bricks.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "": [
+			{ "model": "block/polished_blackstone_bricks", "weight": 30 },
+			{ "model": "block/polished_blackstone_bricks/1", "weight": 15 },
+            { "model": "block/polished_blackstone_bricks/2", "weight": 10 }
+
+		]
+    }
+}

assets/minecraft/models/block/acacia_fence_gate_open.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/template_fence_gate_open",
+    "textures": {
+        "texture": "block/acacia_fence_gate"
+    }
+}

assets/minecraft/models/block/activator_rail_on_raised_ne.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#activator_rail_on",
+		"activator_rail_on": "block/activator_rail_on"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#activator_rail_on"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, -0.75],
+			"to": [4, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#activator_rail_on"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#activator_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#activator_rail_on"},
+				"south": {"texture": "#activator_rail_on"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, -0.75],
+			"to": [14, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#activator_rail_on"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#activator_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#activator_rail_on"},
+				"south": {"texture": "#activator_rail_on"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/activator_rail_on_raised_sw.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#activator_rail_on",
+		"activator_rail_on": "block/activator_rail_on"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#activator_rail_on"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, 0],
+			"to": [4, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#activator_rail_on"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#activator_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#activator_rail_on"},
+				"south": {"texture": "#activator_rail_on"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, 0],
+			"to": [14, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#activator_rail_on"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#activator_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail_on"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#activator_rail_on"},
+				"south": {"texture": "#activator_rail_on"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/activator_rail_raised_ne.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#activator_rail",
+		"activator_rail": "block/activator_rail"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#activator_rail"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, -0.75],
+			"to": [4, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#activator_rail"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#activator_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#activator_rail"},
+				"south": {"texture": "#activator_rail"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, -0.75],
+			"to": [14, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#activator_rail"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#activator_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#activator_rail"},
+				"south": {"texture": "#activator_rail"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/activator_rail_raised_sw.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#activator_rail",
+		"activator_rail": "block/activator_rail"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#activator_rail"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, 0],
+			"to": [4, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#activator_rail"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#activator_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#activator_rail"},
+				"south": {"texture": "#activator_rail"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, 0],
+			"to": [14, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#activator_rail"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#activator_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#activator_rail"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#activator_rail"},
+				"south": {"texture": "#activator_rail"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/birch_fence_gate_open.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/template_fence_gate_open",
+    "textures": {
+        "texture": "block/birch_fence_gate"
+    }
+}

assets/minecraft/models/block/crimson_fence_post.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/fence_post",
+    "textures": {
+        "texture": "block/crimson_planks",
+		"side": "block/crimson_planks",
+		"top": "block/crimson_planks"
+    }
+}

assets/minecraft/models/block/crimson_fence_side.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/fence_side",
+    "textures": {
+        "texture": "block/crimson_planks",
+		"side": "block/crimson_planks",
+		"top": "block/crimson_planks"
+    }
+}

assets/minecraft/models/block/dark_oak_fence_gate_open.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/template_fence_gate_open",
+    "textures": {
+        "texture": "block/dark_oak_fence_gate"
+    }
+}

assets/minecraft/models/block/desktop.ini

@@ -0,0 +1,7 @@
+[LocalizedFileNames]
+fence_inventory.json=@fence_inventory,0
+fence_post.json=@fence_post,0
+fence_side.json=@fence_side,0
+nether_brick_fence_inventory.json=@nether_brick_fence_inventory,0
+nether_brick_fence_post.json=@nether_brick_fence_post,0
+nether_brick_fence_side.json=@nether_brick_fence_side,0

assets/minecraft/models/block/detector_rail_on_raised_ne.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#detector_rail_on",
+		"detector_rail_on": "block/detector_rail_on"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#detector_rail_on"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, -0.75],
+			"to": [4, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#detector_rail_on"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#detector_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#detector_rail_on"},
+				"south": {"texture": "#detector_rail_on"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, -0.75],
+			"to": [14, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#detector_rail_on"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#detector_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#detector_rail_on"},
+				"south": {"texture": "#detector_rail_on"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/detector_rail_on_raised_sw.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#detector_rail_on",
+		"detector_rail_on": "block/detector_rail_on"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#detector_rail_on"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, 0],
+			"to": [4, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#detector_rail_on"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#detector_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#detector_rail_on"},
+				"south": {"texture": "#detector_rail_on"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, 0],
+			"to": [14, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#detector_rail_on"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#detector_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail_on"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#detector_rail_on"},
+				"south": {"texture": "#detector_rail_on"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/detector_rail_raised_ne.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#detector_rail",
+		"detector_rail": "block/detector_rail"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#detector_rail"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, -0.75],
+			"to": [4, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#detector_rail"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#detector_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#detector_rail"},
+				"south": {"texture": "#detector_rail"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, -0.75],
+			"to": [14, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#detector_rail"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#detector_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#detector_rail"},
+				"south": {"texture": "#detector_rail"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/detector_rail_raised_sw.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#detector_rail",
+		"detector_rail": "block/detector_rail"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#detector_rail"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, 0],
+			"to": [4, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#detector_rail"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#detector_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#detector_rail"},
+				"south": {"texture": "#detector_rail"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, 0],
+			"to": [14, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#detector_rail"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#detector_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#detector_rail"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#detector_rail"},
+				"south": {"texture": "#detector_rail"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/jungle_fence_gate_open.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/template_fence_gate_open",
+    "textures": {
+        "texture": "block/jungle_fence_gate"
+    }
+}

assets/minecraft/models/block/ore/nether_gold/1.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "block/nether_gold_ore1"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/1.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "block/polished_blackstone_bricks1"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/2.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "block/polished_blackstone_bricks2"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/slab/l1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks1",
+        "top": "block/polished_blackstone_bricks1",
+        "side": "block/polished_blackstone_bricks1"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/slab/l2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks2",
+        "top": "block/polished_blackstone_bricks2",
+        "side": "block/polished_blackstone_bricks2"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/slab/u1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab_top",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks1",
+        "top": "block/polished_blackstone_bricks1",
+        "side": "block/polished_blackstone_bricks1"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/slab/u2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab_top",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks2",
+        "top": "block/polished_blackstone_bricks2",
+        "side": "block/polished_blackstone_bricks2"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/stairs/1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/stairs",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks1",
+        "top": "block/polished_blackstone_bricks1",
+        "side": "block/polished_blackstone_bricks1"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/stairs/2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/stairs",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks2",
+        "top": "block/polished_blackstone_bricks2",
+        "side": "block/polished_blackstone_bricks2"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/stairs/i1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/inner_stairs",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks1",
+        "top": "block/polished_blackstone_bricks1",
+        "side": "block/polished_blackstone_bricks1"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/stairs/i2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/inner_stairs",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks2",
+        "top": "block/polished_blackstone_bricks2",
+        "side": "block/polished_blackstone_bricks2"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/stairs/o1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/outer_stairs",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks1",
+        "top": "block/polished_blackstone_bricks1",
+        "side": "block/polished_blackstone_bricks1"
+    }
+}

assets/minecraft/models/block/polished_blackstone_bricks/stairs/o2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/outer_stairs",
+    "textures": {
+        "bottom": "block/polished_blackstone_bricks2",
+        "top": "block/polished_blackstone_bricks2",
+        "side": "block/polished_blackstone_bricks2"
+    }
+}

assets/minecraft/models/block/powered_rail_on_raised_ne.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#powered_rail_on",
+		"powered_rail_on": "block/powered_rail_on"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#powered_rail_on"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, -0.75],
+			"to": [4, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#powered_rail_on"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#powered_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#powered_rail_on"},
+				"south": {"texture": "#powered_rail_on"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, -0.75],
+			"to": [14, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#powered_rail_on"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#powered_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#powered_rail_on"},
+				"south": {"texture": "#powered_rail_on"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/powered_rail_on_raised_sw.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#powered_rail_on",
+		"powered_rail_on": "block/powered_rail_on"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#powered_rail_on"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, 0],
+			"to": [4, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#powered_rail_on"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#powered_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#powered_rail_on"},
+				"south": {"texture": "#powered_rail_on"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, 0],
+			"to": [14, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#powered_rail_on"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#powered_rail_on"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail_on"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#powered_rail_on"},
+				"south": {"texture": "#powered_rail_on"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/powered_rail_raised_ne.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#powered_rail",
+		"powered_rail": "block/powered_rail"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#powered_rail"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, -0.75],
+			"to": [4, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#powered_rail"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#powered_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#powered_rail"},
+				"south": {"texture": "#powered_rail"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, -0.75],
+			"to": [14, 8.25, 16],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": 45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#powered_rail"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#powered_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#powered_rail"},
+				"south": {"texture": "#powered_rail"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/powered_rail_raised_sw.json

@@ -0,0 +1,57 @@
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "#powered_rail",
+		"powered_rail": "block/powered_rail"
+	},
+	"elements": [
+		{	"from": [0, 8.25, 1],
+			"to": [16, 8.25, 14.5],
+			"rotation": {
+                "origin": [ 8, 8.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+            },
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16],"texture": "#powered_rail"}
+			}
+		}, 
+		{
+			"from": [2, 7.25, 0],
+			"to": [4, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [2, 0, 4, 16],"texture": "#powered_rail"},
+				"down": {"uv": [2, 0, 4, 16],"texture": "#powered_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"north": {"uv": [12, 15, 14, 16],"texture": "#powered_rail"},
+				"south": {"texture": "#powered_rail"}
+			}
+		}, 
+		{
+			"from": [12, 7.25, 0],
+			"to": [14, 8.25, 16.75],
+			"rotation": {
+                "origin": [ 8, 7.25, 8 ],
+                "axis": "x",
+                "angle": -45,
+                "rescale": true
+			},
+			"faces": {
+				"up": {"uv": [12, 0, 14, 16],"texture": "#powered_rail"},
+				"down": {"uv": [12, 0, 14, 16],"texture": "#powered_rail"},
+				"west": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"east": {"uv": [3, 15, 4, 16],"texture": "#powered_rail"},
+				"north": {"uv": [2, 15, 4, 16],"texture": "#powered_rail"},
+				"south": {"texture": "#powered_rail"}
+			}
+		}
+	]
+}

assets/minecraft/models/block/sandstone/cut/normal/1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/cube_bottom_top",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone1"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/cube_bottom_top",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone2"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/3.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/cube_bottom_top",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone3"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/slab/l1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone1"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/slab/l2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone2"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/slab/l3.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone3"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/slab/u1.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab_top",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone1"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/slab/u2.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab_top",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone2"
+    }
+}

assets/minecraft/models/block/sandstone/cut/normal/slab/u3.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab_top",
+    "textures": {
+        "bottom": "block/sandstone_bottom",
+        "top": "block/sandstone_top",
+        "side": "block/cut_sandstone3"
+    }
+}

assets/minecraft/models/block/spruce_fence_gate_open.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/template_fence_gate_open",
+    "textures": {
+        "texture": "block/spruce_fence_gate"
+    }
+}

assets/minecraft/models/block/template_fence_gate_open.json

@@ -0,0 +1,95 @@
+{
+    "textures": {
+        "particle": "#texture"
+    },
+    "elements": [
+        {   "__comment": "Left-hand post",
+            "from": [ 0, 5, 7 ],
+            "to": [ 2, 16, 9 ],
+            "faces": {
+                "down":  { "uv": [ 0, 7, 2,  9 ], "texture": "#texture" },
+                "up":    { "uv": [ 0, 7, 2,  9 ], "texture": "#texture" },
+                "north": { "uv": [ 0, 0, 2, 11 ], "texture": "#texture" },
+                "south": { "uv": [ 0, 0, 2, 11 ], "texture": "#texture" },
+                "west":  { "uv": [ 7, 0, 9, 11 ], "texture": "#texture", "cullface": "west" },
+                "east":  { "uv": [ 7, 0, 9, 11 ], "texture": "#texture" }
+            }
+        },
+        {   "__comment": "Right-hand post",
+            "from": [ 14, 5, 7 ],
+            "to": [ 16, 16, 9 ],
+            "faces": {
+                "down":  { "uv": [ 14, 7, 16,  9 ], "texture": "#texture" },
+                "up":    { "uv": [ 14, 7, 16,  9 ], "texture": "#texture" },
+                "north": { "uv": [ 14, 0, 16, 11 ], "texture": "#texture" },
+                "south": { "uv": [ 14, 0, 16, 11 ], "texture": "#texture" },
+                "west":  { "uv": [  7, 0,  9, 11 ], "texture": "#texture" },
+                "east":  { "uv": [  7, 0,  9, 11 ], "texture": "#texture", "cullface": "east" }
+            }
+        },
+        {   "__comment": "Inner vertical post of left-hand gate door",
+            "from": [ 0, 6, 13 ],
+            "to": [ 2, 15, 15 ],
+            "faces": {
+                "down":  { "uv": [  0, 13,  2, 15 ], "texture": "#texture" },
+                "up":    { "uv": [  0, 13,  2, 15 ], "texture": "#texture" },
+                "north": { "uv": [  0,  1,  2, 10 ], "texture": "#texture" },
+                "south": { "uv": [  0,  1,  2, 10 ], "texture": "#texture" },
+                "west":  { "uv": [ 13,  1, 15, 10 ], "texture": "#texture" },
+                "east":  { "uv": [ 13,  1, 15, 10 ], "texture": "#texture" }
+            }
+        },
+        {   "__comment": "Inner vertical post of right-hand gate door",
+            "from": [ 14, 6, 13 ],
+            "to": [ 16, 15, 15 ],
+            "faces": {
+                "down":  { "uv": [ 14, 13, 16, 15 ], "texture": "#texture" },
+                "up":    { "uv": [ 14, 13, 16, 15 ], "texture": "#texture" },
+                "north": { "uv": [ 14,  1, 16, 10 ], "texture": "#texture" },
+                "south": { "uv": [ 14,  1, 16, 10 ], "texture": "#texture" },
+                "west":  { "uv": [ 13,  1, 15, 10 ], "texture": "#texture" },
+                "east":  { "uv": [ 13,  1, 15, 10 ], "texture": "#texture" }
+            }
+        },
+        {   "__comment": "Lower horizontal bar of left-hand gate door",
+            "from": [ 0, 6, 9 ],
+            "to": [ 2, 9, 13 ],
+            "faces": {
+                "down":  { "uv": [  0, 9,  2, 13 ], "texture": "#texture" },
+                "up":    { "uv": [  0, 9,  2, 13 ], "texture": "#texture" },
+                "west":  { "uv": [ 13, 7, 15, 10 ], "texture": "#texture" },
+                "east":  { "uv": [ 13, 7, 15, 10 ], "texture": "#texture" }
+            }
+        },
+        {   "__comment": "Upper horizontal bar of left-hand gate door",
+            "from": [ 0, 12, 9 ],
+            "to": [ 2, 15, 13 ],
+            "faces": {
+                "down":  { "uv": [  0, 9,  2, 13 ], "texture": "#texture" },
+                "up":    { "uv": [  0, 9,  2, 13 ], "texture": "#texture" },
+                "west":  { "uv": [ 13, 1, 15,  4 ], "texture": "#texture" },
+                "east":  { "uv": [ 13, 1, 15,  4 ], "texture": "#texture" }
+            }
+        },
+        {   "__comment": "Lower horizontal bar of left-hand gate door",
+            "from": [ 14, 6, 9 ],
+            "to": [ 16, 9, 13 ],
+            "faces": {
+                "down":  { "uv": [ 14, 9, 16, 13 ], "texture": "#texture" },
+                "up":    { "uv": [ 14, 9, 16, 13 ], "texture": "#texture" },
+                "west":  { "uv": [ 13, 7, 15, 10 ], "texture": "#texture" },
+                "east":  { "uv": [ 13, 7, 15, 10 ], "texture": "#texture" }
+            }
+        },
+        {   "__comment": "Upper horizontal bar of left-hand gate door",
+            "from": [ 14, 12, 9 ],
+            "to": [ 16, 15, 13 ],
+            "faces": {
+                "down":  { "uv": [ 14, 9, 16, 13 ], "texture": "#texture" },
+                "up":    { "uv": [ 14, 9, 16, 13 ], "texture": "#texture" },
+                "west":  { "uv": [ 13, 1, 15,  4 ], "texture": "#texture" },
+                "east":  { "uv": [ 13, 1, 15,  4 ], "texture": "#texture" }
+            }
+        }
+    ]
+}

assets/minecraft/models/block/warped_fence_post.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/fence_post",
+    "textures": {
+        "texture": "block/warped_planks",
+		"side": "block/warped_planks",
+		"top": "block/warped_planks"
+    }
+}

assets/minecraft/models/block/warped_fence_side.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/fence_side",
+    "textures": {
+        "texture": "block/warped_planks",
+		"side": "block/warped_planks",
+		"top": "block/warped_planks"
+    }
+}

assets/minecraft/optifine/colormap/blocks/reeds.properties

@@ -0,0 +1 @@
+format=fixed

assets/minecraft/optifine/ctm/FixesCTM/block143.properties

@@ -0,0 +1,3 @@
+faces=all
+tiles=2
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block70.properties

@@ -0,0 +1,3 @@
+faces=all
+tiles=3
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block72.properties

@@ -0,0 +1,3 @@
+faces=all
+tiles=1
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block77.properties

@@ -0,0 +1,3 @@
+faces=all
+tiles=4
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block79.properties

@@ -0,0 +1,2 @@
+tiles=14
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block84.properties

@@ -0,0 +1,4 @@
+faces=top
+tiles=7
+metadata=0
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block84a.properties

@@ -0,0 +1,3 @@
+faces=top
+tiles=8
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block84b.properties

@@ -0,0 +1,3 @@
+faces=north south
+tiles=6
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block86.properties

@@ -0,0 +1,3 @@
+faces=bottom
+tiles=0
+method=fixed

assets/minecraft/optifine/ctm/FixesCTM/block91.properties

@@ -0,0 +1,3 @@
+faces=bottom
+tiles=0
+method=fixed