Fix the merge

Author: M-W-K

src/main/java/gregtech/client/ClientProxy.java

@@ -53,7 +53,6 @@
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.client.GuiIngameForge;
 import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
@@ -118,12 +117,6 @@ public static void registerColors() {
         ToolItems.registerColors();
     }
 
-    @SubscribeEvent
-    public static void registerBakedModels(ModelBakeEvent event) {
-        AbstractPipeModel.invalidateCaches();
-        PipeModelRegistry.registerModels(event.getModelRegistry());
-    }
-
     @SubscribeEvent
     public static void textureStitchPre(@NotNull TextureStitchEvent.Pre event) {
         TextureMap map = event.getMap();
@@ -145,6 +138,9 @@ public static void registerBakedModels(ModelBakeEvent event) {
         GTLog.logger.info("Registering special item models");
         MetaItems.registerBakedModels(event);
         ToolItems.registerBakedModels(event);
+        GTLog.logger.info("Registering special block models");
+        AbstractPipeModel.invalidateCaches();
+        PipeModelRegistry.registerModels(event.getModelRegistry());
     }
 
     @SubscribeEvent

src/main/java/gregtech/common/items/MetaItems.java

@@ -9,7 +9,6 @@
 import gregtech.api.unification.material.MarkerMaterial;
 import gregtech.api.unification.material.registry.MaterialRegistry;
 import gregtech.api.unification.ore.OrePrefix;
-import gregtech.api.util.GTLog;
 import gregtech.client.renderer.handler.FacadeRenderer;
 import gregtech.common.items.armor.MetaArmor;
 
@@ -656,7 +655,6 @@ public static void registerColors() {
 
     @SideOnly(Side.CLIENT)
     public static void registerBakedModels(ModelBakeEvent event) {
-        GTLog.logger.info("Registering special item models");
         registerSpecialItemModel(event, COVER_FACADE, new FacadeRenderer());
     }