From edf24aea906aa8fb9bee5684724aa335855a7f2a Mon Sep 17 00:00:00 2001 From: Jamie Smith Date: Tue, 21 Jun 2016 08:13:22 -0700 Subject: [PATCH] Update version, fix jeweled GUI texture That was really annoying. Apparently, Git doesn't pick up case changes as a rename --- ...ient 1.8 Template.launch => AP Client 1.8.launch | 4 ++-- build.gradle | 6 +++--- .../additionalpipes/textures/Textures.java | 2 +- .../gui/{JeweledPipeGui.pdn => jeweledGui.pdn} | Bin .../gui/{JeweledPipeGui.png => jeweledGui.png} | Bin 5 files changed, 6 insertions(+), 6 deletions(-) rename AP Client 1.8 Template.launch => AP Client 1.8.launch (86%) rename src/main/resources/assets/additionalpipes/textures/gui/{JeweledPipeGui.pdn => jeweledGui.pdn} (100%) rename src/main/resources/assets/additionalpipes/textures/gui/{JeweledPipeGui.png => jeweledGui.png} (100%) diff --git a/AP Client 1.8 Template.launch b/AP Client 1.8.launch similarity index 86% rename from AP Client 1.8 Template.launch rename to AP Client 1.8.launch index 1d8061f..6bff954 100644 --- a/AP Client 1.8 Template.launch +++ b/AP Client 1.8.launch @@ -8,8 +8,8 @@ - + - + diff --git a/build.gradle b/build.gradle index 3783e2f..261e81e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' version = "5.0.0" -group= "com.buildcraft.additionalpipes" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group= "com.buildcraft.additionalpipes" archivesBaseName = "additionalpipes" minecraft { @@ -22,7 +22,7 @@ minecraft { mappings = "stable_20" } - +// http://maven.apache.org/guides/mini/guide-naming-conventions.html repositories { ivy { name "BuildCraft" @@ -31,7 +31,7 @@ repositories { } dependencies { - compile name: 'buildcraft', version: "7.2.5", classifier: "dev", ext: 'jar' + compile name: 'buildcraft', version: "7.2.7", classifier: "dev", ext: 'jar' } sourceSets { diff --git a/src/main/java/buildcraft/additionalpipes/textures/Textures.java b/src/main/java/buildcraft/additionalpipes/textures/Textures.java index 3466826..764d730 100644 --- a/src/main/java/buildcraft/additionalpipes/textures/Textures.java +++ b/src/main/java/buildcraft/additionalpipes/textures/Textures.java @@ -22,7 +22,7 @@ public static void registerIcons(TextureMap map) public static final ResourceLocation GUI_ADVANCEDWOOD = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/advancedWoodGui.png"); public static final ResourceLocation GUI_DISTRIBUTION = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/distributionGui.png"); public static final ResourceLocation GUI_PRIORITY = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/priorityGui.png"); - public static final ResourceLocation GUI_JEWELED = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/jeweledPipeGui.png"); + public static final ResourceLocation GUI_JEWELED = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/jeweledGui.png"); public static final ResourceLocation GUI_OUTLINE_JEWELED[] = new ResourceLocation[GuiJeweledPipe.NUM_TABS]; diff --git a/src/main/resources/assets/additionalpipes/textures/gui/JeweledPipeGui.pdn b/src/main/resources/assets/additionalpipes/textures/gui/jeweledGui.pdn similarity index 100% rename from src/main/resources/assets/additionalpipes/textures/gui/JeweledPipeGui.pdn rename to src/main/resources/assets/additionalpipes/textures/gui/jeweledGui.pdn diff --git a/src/main/resources/assets/additionalpipes/textures/gui/JeweledPipeGui.png b/src/main/resources/assets/additionalpipes/textures/gui/jeweledGui.png similarity index 100% rename from src/main/resources/assets/additionalpipes/textures/gui/JeweledPipeGui.png rename to src/main/resources/assets/additionalpipes/textures/gui/jeweledGui.png