Fix Merges

This commit is contained in:
Stuart Pomeroy 2016-03-27 20:14:13 +01:00
commit dfb7d0afd4
26 changed files with 176 additions and 90 deletions

View file

@ -13,7 +13,7 @@ public class GuiDieselGenerator extends GuiContainer
{
private static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/ThermalGenerator.png");
"textures/gui/diesel_generator.png");
TileDieselGenerator tile;

View file

@ -13,7 +13,7 @@ public class GuiSemifluidGenerator extends GuiContainer
// TODO: use semifluid generator texture
private static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/ThermalGenerator.png");
"textures/gui/semifluid_generator.png");
TileSemifluidGenerator tile;