Fix Merges
This commit is contained in:
commit
dfb7d0afd4
26 changed files with 176 additions and 90 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue