Merge branch 'master' into mwk/sub_buffers

Author: M-W-K

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -9,8 +9,6 @@
 
 public class GregtechDataCodes {
 
-    public static final int UPDATE_PRIVATE = assignId();
-    public static final int LOCK_FILL = assignId();
     private static int nextId = 0;
 
     public static int assignId() {
@@ -97,6 +95,7 @@ public static int assignId() {
     public static final int MAINTENANCE_MULTIPLIER = assignId();
     public static final int UPDATE_UPWARDS_FACING = assignId();
     public static final int UPDATE_FLIP = assignId();
+    public static final int LOCK_FILL = assignId();
 
     // Item Bus Item Stack Auto Collapsing
     public static final int TOGGLE_COLLAPSE_ITEMS = assignId();
@@ -157,6 +156,9 @@ public static int assignId() {
     // Detector Covers
     public static final int UPDATE_INVERTED = assignId();
 
+    // Ender Covers
+    public static final int UPDATE_PRIVATE = assignId();
+
     // HPCA / Research Station
     public static final int DAMAGE_STATE = assignId();
     public static final int LOCK_OBJECT_HOLDER = assignId();