Merge remote-tracking branch 'upstream/rv2' into rv2

2014-09-28 14:33:43 -07:00
parent da63aca95c f63aa6d17e
commit fd18393a8b
3 changed files with 3 additions and 12 deletions
@@ -39,6 +39,9 @@ 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
+    version = version.replaceAll("/", "-")
 }

 // Add Coremod Manifest
@@ -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)
 	{
@@ -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)
 	{