fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew
2014-09-28 14:33:43 -07:00
parent da63aca95c f63aa6d17e
commit fd18393a8b
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+3
View File
@@ -39,6 +39,9 @@ archivesBaseName = config.archivesBaseName
// If TeamCity is running this build, lets set the version info // If TeamCity is running this build, lets set the version info
if (hasProperty("teamcity")) { if (hasProperty("teamcity")) {
version = teamcity["build.number"] version = teamcity["build.number"]
// Fix for main branch being built
version = version.replaceAll("/", "-")
} }
// Add Coremod Manifest // Add Coremod Manifest
src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java
-6
View File
@@ -26,12 +26,6 @@ public class GuiFormationPlane extends GuiUpgradeable
this.ySize = 251; this.ySize = 251;
} }
@Override
public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY)
{
super.drawBG( offsetX, offsetY, mouseX, mouseY );
}
@Override @Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{ {
src/main/java/appeng/client/gui/implementations/GuiStorageBus.java
-6
View File
@@ -38,12 +38,6 @@ public class GuiStorageBus extends GuiUpgradeable
this.ySize = 251; this.ySize = 251;
} }
@Override
public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY)
{
super.drawBG( offsetX, offsetY, mouseX, mouseY );
}
@Override @Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{ {