From de4acb609899fd5d5f8388fdd28f892044afa696 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Mon, 3 Oct 2016 20:04:12 +0200
Subject: [PATCH] Fixes #2416: Removes an unused model and fixes breaking
 particles.

---
 .../models/block/drive.json                   | 700 ------------------
 .../models/block/drive_base.json              |   1 +
 2 files changed, 1 insertion(+), 700 deletions(-)
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/drive.json

diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive.json b/src/main/resources/assets/appliedenergistics2/models/block/drive.json
deleted file mode 100644
index 55054741..00000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive.json
+++ /dev/null
@@ -1,700 +0,0 @@
-{
-    "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
-    "elements": [
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        0.0,
-                        15.0,
-                        16.0
-                    ]
-                },
-                "east": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        1.0
-                    ]
-                },
-                "north": {
-                    "texture": "#0",
-                    "uv": [
-                        1.0,
-                        15.0,
-                        15.0,
-                        16.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        1.0,
-                        15.0,
-                        15.0,
-                        16.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        0.0,
-                        15.0,
-                        16.0
-                    ]
-                },
-                "west": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        1.0
-                    ]
-                }
-            },
-            "from": [
-                1.0,
-                0.0,
-                0.0
-            ],
-            "name": "Bottom",
-            "to": [
-                15.0,
-                1.0,
-                16.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        1.0,
-                        16.0
-                    ]
-                },
-                "east": {
-                    "texture": "#0",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                },
-                "north": {
-                    "texture": "#0",
-                    "uv": [
-                        15.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        1.0,
-                        16.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        1.0,
-                        16.0
-                    ]
-                },
-                "west": {
-                    "texture": "#0",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                }
-            },
-            "from": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "name": "Left",
-            "to": [
-                1.0,
-                16.0,
-                16.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        0.0,
-                        15.0,
-                        16.0
-                    ]
-                },
-                "east": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        1.0
-                    ]
-                },
-                "north": {
-                    "texture": "#0",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        1.0,
-                        0.0,
-                        15.0,
-                        1.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        0.0,
-                        15.0,
-                        16.0
-                    ]
-                },
-                "west": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        1.0
-                    ]
-                }
-            },
-            "from": [
-                1.0,
-                15.0,
-                0.0
-            ],
-            "name": "Top",
-            "to": [
-                15.0,
-                16.0,
-                16.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        15.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                },
-                "east": {
-                    "texture": "#0",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                },
-                "north": {
-                    "texture": "#2",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        1.0,
-                        16.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        15.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        15.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                },
-                "west": {
-                    "texture": "#0",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        16.0,
-                        16.0
-                    ]
-                }
-            },
-            "from": [
-                15.0,
-                0.0,
-                0.0
-            ],
-            "name": "Right",
-            "to": [
-                16.0,
-                16.0,
-                16.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "east": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "north": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        1.0,
-                        12.0,
-                        15.0,
-                        13.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "west": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                }
-            },
-            "from": [
-                1.0,
-                3.0,
-                1.0
-            ],
-            "name": "Rack",
-            "to": [
-                15.0,
-                4.0,
-                15.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "east": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "north": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        1.0,
-                        9.0,
-                        15.0,
-                        10.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "west": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                }
-            },
-            "from": [
-                1.0,
-                6.0,
-                1.0
-            ],
-            "name": "Rack 2",
-            "to": [
-                15.0,
-                7.0,
-                15.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "east": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "north": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        1.0,
-                        6.0,
-                        15.0,
-                        7.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "west": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                }
-            },
-            "from": [
-                1.0,
-                9.0,
-                1.0
-            ],
-            "name": "Rack 3",
-            "to": [
-                15.0,
-                10.0,
-                15.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "east": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "north": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        1.0,
-                        3.0,
-                        15.0,
-                        4.0
-                    ]
-                },
-                "up": {
-                    "texture": "#2",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "west": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        1.0
-                    ]
-                }
-            },
-            "from": [
-                1.0,
-                12.0,
-                1.0
-            ],
-            "name": "Rack4",
-            "to": [
-                15.0,
-                13.0,
-                15.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        7.0
-                    ]
-                },
-                "east": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        7.0,
-                        14.0
-                    ]
-                },
-                "north": {
-                    "texture": "#0",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        15.0,
-                        15.0
-                    ]
-                },
-                "up": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        14.0,
-                        7.0
-                    ]
-                },
-                "west": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        7.0,
-                        14.0
-                    ]
-                }
-            },
-            "from": [
-                1.0,
-                1.0,
-                0.0
-            ],
-            "name": "Back",
-            "to": [
-                15.0,
-                15.0,
-                7.0
-            ]
-        },
-        {
-            "faces": {
-                "down": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        2.0,
-                        9.0
-                    ]
-                },
-                "east": {
-                    "texture": "#0",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        10.0,
-                        15.0
-                    ]
-                },
-                "north": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        2.0,
-                        14.0
-                    ]
-                },
-                "south": {
-                    "texture": "#1",
-                    "uv": [
-                        7.0,
-                        1.0,
-                        9.0,
-                        15.0
-                    ]
-                },
-                "up": {
-                    "texture": "#-1",
-                    "uv": [
-                        0.0,
-                        0.0,
-                        2.0,
-                        9.0
-                    ]
-                },
-                "west": {
-                    "texture": "#0",
-                    "uv": [
-                        1.0,
-                        1.0,
-                        10.0,
-                        15.0
-                    ]
-                }
-            },
-            "from": [
-                7.0,
-                1.0,
-                7.0
-            ],
-            "name": "Cube",
-            "to": [
-                9.0,
-                15.0,
-                16.0
-            ]
-        }
-    ],
-    "textures": {
-        "0": "blocks/drive_side",
-        "1": "blocks/drive_front",
-        "2": "blocks/drive_top"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
index 1ae44df4..ed0aa220 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
@@ -1,6 +1,7 @@
 {
     "parent": "block/block",
     "textures": {
+        "particle": "appliedenergistics2:blocks/drive_side",
         "side": "appliedenergistics2:blocks/drive_side",
         "bottom": "appliedenergistics2:blocks/drive_bottom",
         "top": "appliedenergistics2:blocks/drive_top",