Merge branch 'master' into ore-change

dependencies.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.07-pre:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.19-pre:dev')
     api("com.github.GTNewHorizons:bartworks:0.10.0:dev")
 
     implementation('curse.maven:cofh-core-69162:2388751')

src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java

@@ -37,14 +37,15 @@
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem {
 
     private final List<ItemStack> ALL_VARIANTS = new ArrayList<>();
 
     private final String iconLocation;
-    protected IIcon base;
+    protected final IIcon[] iconDamage = new IIcon[25];
 
     public GTPP_IntegratedCircuit_Item(String unlocalizedName, String iconLocation) {
         this.setHasSubtypes(true);
@@ -111,27 +112,14 @@ public boolean showDurabilityBar(ItemStack stack) {
 
     @Override
     public void registerIcons(final IIconRegister u) {
-        this.base = u.registerIcon(GTPlusPlus.ID + ":" + iconLocation);
-    }
-
-    @Override
-    public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-        return this.base;
-    }
-
-    @Override
-    public IIcon getIconFromDamage(int damage) {
-        return this.base;
-    }
-
-    @Override
-    public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
-        return this.base;
+        for (int i = 0; i < iconDamage.length; i++) {
+            this.iconDamage[i] = u.registerIcon(GTPlusPlus.ID + ":" + iconLocation + "/" + i);
+        }
     }
 
     @Override
-    public IIcon getIcon(ItemStack stack, int pass) {
-        return this.base;
+    public IIcon getIconFromDamage(int meta) {
+        return this.iconDamage[MathUtils.balance(meta, 0, 24)];
     }
 
     @Override