diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle
index 4c3e7cf95..63b135edd 100644
--- a/gradle/scripts/dependencies.gradle
+++ b/gradle/scripts/dependencies.gradle
@@ -81,11 +81,11 @@ configurations {
 dependencies {
     // deobfCompile "gregtechce:gregtech:1.12.2:1.15.1.735"
     // installable runtime dependencies
-    deobfCompile "curse.maven:gregtechceu-557242:3949406"
+    deobfCompile "curse.maven:gregtechceu-557242:4429261"
 
     compileOnly "curse.maven:chisel-235279:2915375"
 
-    deobfCompile "baubles:Baubles:1.12:1.5.2"
+    deobfCompile "curse.maven:baubles-227083:2518667"
     //mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
     mods "curse.maven:hwyla-253449:2568751"
     mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
@@ -107,7 +107,7 @@ dependencies {
     compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
     compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
     compileOnly "curse.maven:inventory-tweaks-223094:2482482"
-    compileOnly "curse.maven:inventory-bogo-sorter-632327:4329854"
+    compileOnly "curse.maven:inventory-bogo-sorter-632327:4399738"
     compileOnly "team.chisel.ctm:CTM:${ctm_version}"
     compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api"
     deobfCompile "net.sengir.forestry:forestry_${minecraft_version}:$forestry_version"
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/chest.json b/src/main/resources/assets/appliedenergistics2/blockstates/chest.json
index 486e88a65..7371dc1d4 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/chest.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/chest.json
@@ -1,60 +1,60 @@
 {
-    "forge_marker": 1,
-    "defaults": {
-        "model": "appliedenergistics2:chest/base"
-    },
-    "variants": {
-        "slot_state": {
-            "empty": {
-                "submodel": {
-                    "lights": {
-                        "model": "appliedenergistics2:chest/lights_off"
-                    },
-                    "state": {
-                        "model": "appliedenergistics2:chest/cell_state_empty"
-                    }
-                }
-            },
-            "offline": {
-                "submodel": {
-                    "lights": {
-                        "model": "appliedenergistics2:chest/lights_off"
-                    },
-                    "state": {
-                        "model": "appliedenergistics2:chest/cell_state_offline"
-                    }
-                }
-            },
-            "online": {
-                "submodel": {
-                    "lights": {
-                        "model": "appliedenergistics2:chest/lights_on"
-                    },
-                    "state": {
-                        "model": "appliedenergistics2:chest/cell_state_online"
-                    }
-                }
-            },
-            "types_full": {
-                "submodel": {
-                    "lights": {
-                        "model": "appliedenergistics2:chest/lights_on"
-                    },
-                    "state": {
-                        "model": "appliedenergistics2:chest/cell_state_types_full"
-                    }
-                }
-            },
-            "full": {
-                "submodel": {
-                    "lights": {
-                        "model": "appliedenergistics2:chest/lights_on"
-                    },
-                    "state": {
-                        "model": "appliedenergistics2:chest/cell_state_full"
-                    }
-                }
-            }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "appliedenergistics2:chest/base"
+  },
+  "variants": {
+    "slot_state": {
+      "empty": {
+        "submodel": {
+          "lights": {
+            "model": "appliedenergistics2:chest/lights_off"
+          },
+          "state": {
+            "model": "appliedenergistics2:chest/cell_state_empty"
+          }
         }
+      },
+      "offline": {
+        "submodel": {
+          "lights": {
+            "model": "appliedenergistics2:chest/lights_off"
+          },
+          "state": {
+            "model": "appliedenergistics2:chest/cell_state_offline"
+          }
+        }
+      },
+      "online": {
+        "submodel": {
+          "lights": {
+            "model": "appliedenergistics2:chest/lights_on"
+          },
+          "state": {
+            "model": "appliedenergistics2:chest/cell_state_online"
+          }
+        }
+      },
+      "types_full": {
+        "submodel": {
+          "lights": {
+            "model": "appliedenergistics2:chest/lights_on"
+          },
+          "state": {
+            "model": "appliedenergistics2:chest/cell_state_types_full"
+          }
+        }
+      },
+      "full": {
+        "submodel": {
+          "lights": {
+            "model": "appliedenergistics2:chest/lights_on"
+          },
+          "state": {
+            "model": "appliedenergistics2:chest/cell_state_full"
+          }
+        }
+      }
     }
+  }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
index da0c0e861..4c6b419a8 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
@@ -1,5 +1,4 @@
 {
-  "credit": "Made with Blockbench",
   "textures": {
     "4": "appliedenergistics2:blocks/drive_inside",
     "up": "appliedenergistics2:blocks/chest/top",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
index 66257d71a..da0ea5980 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
@@ -1,24 +1,23 @@
 {
-	"credit": "Made with Blockbench",
-	"textures": {
-		"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-		"state": "appliedenergistics2:blocks/chest/cell_state_full"
-	},
-	"elements": [
-		{
-			"from": [5, 4, 0],
-			"to": [11, 6, 1],
-			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"},
-				"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"}
-			}
-		},
-		{
-			"from": [0, 0, 0],
-			"to": [16, 16, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#state"}
-			}
-		}
-	]
-}
\ No newline at end of file
+  "textures": {
+    "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+    "state": "appliedenergistics2:blocks/chest/cell_state_full"
+  },
+  "elements": [
+    {
+      "from": [5, 4, 0],
+      "to": [11, 6, 1],
+      "faces": {
+        "north": { "uv": [5, 10, 11, 12], "texture": "#backdrop" },
+        "up": { "uv": [5, 9, 11, 10], "texture": "#backdrop" }
+      }
+    },
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": { "uv": [0, 0, 16, 16], "texture": "#state" }
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
index b202f4bd1..6d3c1d922 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
@@ -1,16 +1,15 @@
 {
-	"credit": "Made with Blockbench",
-	"textures": {
-		"state": "appliedenergistics2:blocks/chest/cell_state_offline"
-	},
-	"elements": [
-		{
-			"from": [5, 4, 0],
-			"to": [11, 6, 1],
-			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#state"},
-				"up": {"uv": [5, 9, 11, 10], "texture": "#state"}
-			}
-		}
-	]
-}
\ No newline at end of file
+  "textures": {
+    "state": "appliedenergistics2:blocks/chest/cell_state_offline"
+  },
+  "elements": [
+    {
+      "from": [5, 4, 0],
+      "to": [11, 6, 1],
+      "faces": {
+        "north": { "uv": [5, 10, 11, 12], "texture": "#state" },
+        "up": { "uv": [5, 9, 11, 10], "texture": "#state" }
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
index fbddf4859..8699a47bc 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
@@ -1,24 +1,23 @@
 {
-	"credit": "Made with Blockbench",
-	"textures": {
-		"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-		"state": "appliedenergistics2:blocks/chest/cell_state_online"
-	},
-	"elements": [
-		{
-			"from": [5, 4, 0],
-			"to": [11, 6, 1],
-			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"},
-				"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"}
-			}
-		},
-		{
-			"from": [0, 0, 0],
-			"to": [16, 16, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#state"}
-			}
-		}
-	]
-}
\ No newline at end of file
+  "textures": {
+    "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+    "state": "appliedenergistics2:blocks/chest/cell_state_online"
+  },
+  "elements": [
+    {
+      "from": [5, 4, 0],
+      "to": [11, 6, 1],
+      "faces": {
+        "north": { "uv": [5, 10, 11, 12], "texture": "#backdrop" },
+        "up": { "uv": [5, 9, 11, 10], "texture": "#backdrop" }
+      }
+    },
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": { "uv": [0, 0, 16, 16], "texture": "#state" }
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
index a7e9dcc40..08a80727c 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
@@ -1,24 +1,23 @@
 {
-	"credit": "Made with Blockbench",
-	"textures": {
-		"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-		"state": "appliedenergistics2:blocks/chest/cell_state_types_full"
-	},
-	"elements": [
-		{
-			"from": [5, 4, 0],
-			"to": [11, 6, 1],
-			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"},
-				"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"}
-			}
-		},
-		{
-			"from": [0, 0, 0],
-			"to": [16, 16, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#state"}
-			}
-		}
-	]
-}
\ No newline at end of file
+  "textures": {
+    "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+    "state": "appliedenergistics2:blocks/chest/cell_state_types_full"
+  },
+  "elements": [
+    {
+      "from": [5, 4, 0],
+      "to": [11, 6, 1],
+      "faces": {
+        "north": { "uv": [5, 10, 11, 12], "texture": "#backdrop" },
+        "up": { "uv": [5, 9, 11, 10], "texture": "#backdrop" }
+      }
+    },
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": { "uv": [0, 0, 16, 16], "texture": "#state" }
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json
index 56b6c873d..f10b7ca65 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json
@@ -1,25 +1,17 @@
 {
-    "textures": {
-        "lights": "appliedenergistics2:blocks/chest/lights_off"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "up": {
-                    "texture": "#lights",
-                    "tintindex": 3
-                }
-            }
+  "textures": {
+    "lights": "appliedenergistics2:blocks/chest/lights_off"
+  },
+  "elements": [
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "up": {
+          "texture": "#lights",
+          "tintindex": 3
         }
-    ]
-}
\ No newline at end of file
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
index 507543afc..1ac0bcf40 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
@@ -1,79 +1,54 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "lights_bright": "appliedenergistics2:blocks/chest/lights_on_bright",
-        "lights_medium": "appliedenergistics2:blocks/chest/lights_on_medium",
-        "lights_dark": "appliedenergistics2:blocks/chest/lights_on_dark"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "up": {
-                    "texture": "#lights_bright",
-                    "tintindex": 3,
-                    "unlit": true,
-                    "uvlightmap": {
-                        "block": 15,
-                        "sky": 15
-                    }
-                }
-            }
-        },
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "up": {
-                    "texture": "#lights_medium",
-                    "tintindex": 2,
-                    "unlit": true,
-                    "uvlightmap": {
-                        "block": 15,
-                        "sky": 15
-                    }
-                }
-            }
-        },
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "up": {
-                    "texture": "#lights_dark",
-                    "tintindex": 1,
-                    "unlit": true,
-                    "uvlightmap": {
-                        "block": 15,
-                        "sky": 15
-                    }
-                }
-            }
+  "textures": {
+    "lights_bright": "appliedenergistics2:blocks/chest/lights_on_bright",
+    "lights_medium": "appliedenergistics2:blocks/chest/lights_on_medium",
+    "lights_dark": "appliedenergistics2:blocks/chest/lights_on_dark"
+  },
+  "elements": [
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "up": {
+          "texture": "#lights_bright",
+          "tintindex": 3,
+          "unlit": true,
+          "uvlightmap": {
+            "block": 15,
+            "sky": 15
+          }
         }
-    ]
-}
\ No newline at end of file
+      }
+    },
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "up": {
+          "texture": "#lights_medium",
+          "tintindex": 2,
+          "unlit": true,
+          "uvlightmap": {
+            "block": 15,
+            "sky": 15
+          }
+        }
+      }
+    },
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "up": {
+          "texture": "#lights_dark",
+          "tintindex": 1,
+          "unlit": true,
+          "uvlightmap": {
+            "block": 15,
+            "sky": 15
+          }
+        }
+      }
+    }
+  ]
+}