Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering

# Conflicts: # src/main/java/appeng/decorative/solid/BlockQuartzGlass.java # src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json # Changed naming convention.
2016-08-19 12:49:25 +02:00
parent 3d2ba425ec 153b38b74c
commit b31e5f5356
57 changed files with 2566 additions and 168 deletions
@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "normal": {
+            "model": "appliedenergistics2:builtin/connected_glass"
+        }
+    }
+}
@@ -0,0 +1,48 @@
+{
+    "variants": {
+        "facing=down,odd=false": {
+            "model": "appliedenergistics2:quartz_torch_standing",
+            "x": 180
+        },
+        "facing=down,odd=true": {
+            "model": "appliedenergistics2:quartz_torch_standing_odd",
+            "x": 180
+        },
+        "facing=east,odd=false": {
+            "model": "appliedenergistics2:quartz_torch_wall",
+            "y": 90
+        },
+        "facing=east,odd=true": {
+            "model": "appliedenergistics2:quartz_torch_wall_odd",
+            "y": 90
+        },
+        "facing=north,odd=false": {
+            "model": "appliedenergistics2:quartz_torch_wall"
+        },
+        "facing=north,odd=true": {
+            "model": "appliedenergistics2:quartz_torch_wall_odd"
+        },
+        "facing=south,odd=false": {
+            "model": "appliedenergistics2:quartz_torch_wall",
+            "y": 180
+        },
+        "facing=south,odd=true": {
+            "model": "appliedenergistics2:quartz_torch_wall_odd",
+            "y": 180
+        },
+        "facing=up,odd=false": {
+            "model": "appliedenergistics2:quartz_torch_standing"
+        },
+        "facing=up,odd=true": {
+            "model": "appliedenergistics2:quartz_torch_standing_odd"
+        },
+        "facing=west,odd=false": {
+            "model": "appliedenergistics2:quartz_torch_wall",
+            "y": 270
+        },
+        "facing=west,odd=true": {
+            "model": "appliedenergistics2:quartz_torch_wall_odd",
+            "y": 270
+        }
+    }
+}