From fed20a97faca7867baec2af674b3626fc5ac3538 Mon Sep 17 00:00:00 2001 From: FireBall1725 Date: Sun, 28 Sep 2014 14:53:36 -0400 Subject: [PATCH 1/4] added fix for main branch being built with the pull requests --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 2a9f6fdb2..cdd5211c0 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,11 @@ archivesBaseName = config.archivesBaseName // If TeamCity is running this build, lets set the version info if (hasProperty("teamcity")) { version = teamcity["build.number"] + + // Fix for main branch being built + if (teamcity.build.branch.is_default) { + version = version.replaceAll("/", "-") + } } // Add Coremod Manifest From 31434c13824347ad96627de3bdf7f1ff79ea88a2 Mon Sep 17 00:00:00 2001 From: FireBall1725 Date: Sun, 28 Sep 2014 14:55:55 -0400 Subject: [PATCH 2/4] fixed bug in call to teamcity --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cdd5211c0..eead570ca 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ if (hasProperty("teamcity")) { version = teamcity["build.number"] // Fix for main branch being built - if (teamcity.build.branch.is_default) { + if (teamcity["teamcity.build.branch.is_default"]) { version = version.replaceAll("/", "-") } } From 383de1f8944b555e0e3d395ca2ff37e9c2213204 Mon Sep 17 00:00:00 2001 From: FireBall1725 Date: Sun, 28 Sep 2014 14:58:20 -0400 Subject: [PATCH 3/4] removed if statement that wasn't needed --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index eead570ca..c984bfd7a 100644 --- a/build.gradle +++ b/build.gradle @@ -41,9 +41,7 @@ if (hasProperty("teamcity")) { version = teamcity["build.number"] // Fix for main branch being built - if (teamcity["teamcity.build.branch.is_default"]) { - version = version.replaceAll("/", "-") - } + version = version.replaceAll("/", "-") } // Add Coremod Manifest From 0f6d49fbef9ed9809b5ee790f3c7e87e103bbdc1 Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 28 Sep 2014 21:18:33 +0200 Subject: [PATCH 4/4] Removed missed ones --- .../client/gui/implementations/GuiFormationPlane.java | 6 ------ .../appeng/client/gui/implementations/GuiStorageBus.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java index 623251104..8e8ee5e24 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java +++ b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java @@ -26,12 +26,6 @@ public class GuiFormationPlane extends GuiUpgradeable this.ySize = 251; } - @Override - public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) - { - super.drawBG( offsetX, offsetY, mouseX, mouseY ); - } - @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java index a20af4179..848f4df04 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java @@ -38,12 +38,6 @@ public class GuiStorageBus extends GuiUpgradeable this.ySize = 251; } - @Override - public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) - { - super.drawBG( offsetX, offsetY, mouseX, mouseY ); - } - @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {