Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9

src/main/java/techreborn/client/gui/GuiDieselGenerator.java

@@ -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;
 

src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java

@@ -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;