falling in love with a corporate illustration

changelog

@@ -23,4 +23,5 @@
 ## Fixed
 * Fixed gas centrifuge sound persisting when broken or when unloaded
 * Fixed all centrifuge sounds trying to play even when the player is far away, using up audio slots
-* Fixed guns that don't have durability always displaying a condition of 0%
+* Fixed guns that don't have durability always displaying a condition of 0%
+* Fixed GL state leak caused by skeletons

src/main/java/com/hbm/inventory/gui/GUIMachineTurbineGas.java

@@ -124,9 +124,9 @@ public class GUIMachineTurbineGas extends GuiInfoContainer {
 		}
 		
 		if(turbinegas.temp >= 20)
-			this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: " + (turbinegas.temp) + "°C"});
+			this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: " + (turbinegas.temp) + "°C"});
 		else
-			this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: 20°C"});
+			this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 133, guiTop + 23, 8, 72, mouseX, mouseY, new String[] {"Temperature: 20°C"});
 		
 		turbinegas.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 16, 16, 48);
 		turbinegas.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 70, 16, 32);

src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java

@@ -48,7 +48,7 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
 	@Override public int outputItemLimit() { return 1; }
 	@Override public int outputFluidLimit() { return 1; }
 
-	@Override public String getFileName() { return "hbmAsemblyMachine.json"; }
+	@Override public String getFileName() { return "hbmAssemblyMachine.json"; }
 	@Override public GenericRecipe instantiateRecipe(String name) { return new GenericRecipe(name); }
 
 	@Override

src/main/java/com/hbm/render/tileentity/RenderSkeletonHolder.java

@@ -23,6 +23,10 @@ public class RenderSkeletonHolder extends TileEntitySpecialRenderer {
 		GL11.glPushMatrix();
 		GL11.glTranslated(x + 0.5, y, z + 0.5);
 
+		GL11.glEnable(GL11.GL_LIGHTING);
+		GL11.glEnable(GL11.GL_CULL_FACE);
+		RenderHelper.enableStandardItemLighting();
+
 		switch(te.getBlockMetadata()) {
 			case 2: GL11.glRotatef(180, 0F, 1F, 0F); break;
 			case 4: GL11.glRotatef(270, 0F, 1F, 0F); break;
@@ -30,10 +34,6 @@ public class RenderSkeletonHolder extends TileEntitySpecialRenderer {
 			case 5: GL11.glRotatef(90, 0F, 1F, 0F); break;
 		} //why the FUCK did this not commit properl;y
 
-		GL11.glEnable(GL11.GL_LIGHTING);
-		GL11.glEnable(GL11.GL_CULL_FACE);
-		RenderHelper.enableStandardItemLighting();
-
 		bindTexture(ResourceManager.skeleton_holder_tex);
 		ResourceManager.skeleton_holder.renderPart("Holder1");
 

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -371,6 +371,7 @@ container.leadBox=Sicherheitsbehälter
 container.machineAmmoPress=Munitionspresse
 container.machineArcWelder=Lichtbogenschweißer
 container.machineArcFurnaceLarge=Lichtbogenofen
+container.machineAssemblyMachine=Montagemaschine
 container.machineBoiler=Ölwärmer
 container.machineChemicalFactory=Chemiefabrik
 container.machineChemicalPlant=Chemiewerk
@@ -4347,8 +4348,9 @@ tile.machine_arc_welder.name=Lichtbogenschweißer
 tile.machine_armor_table.name=Rüstungsmodifikationstisch
 tile.machine_ashpit.name=Aschekasten
 tile.machine_ashpit.desc=Sammelt Asche von Feuerbüchsen und Heizöfen
-tile.machine_assembler.name=Fertigungsmaschine
+tile.machine_assembler.name=Fertigungsmaschine (Legacy)
 tile.machine_assemfac.name=Fertigungsfabrik
+tile.machine_assembly_machine.name=Montagemaschine
 tile.machine_autocrafter.name=Automatische Werkbank
 tile.machine_autosaw.name=Automatische Kreissäge
 tile.machine_autosaw.desc=Schneidet Pflanzen nieder, pflanzt Bäume nach$Akzeptiert:$-Holzöl$-Ethanol$-Fischöl$-Schweröl

src/main/resources/assets/hbm/lang/en_US.lang

@@ -773,6 +773,7 @@ container.leadBox=Containment Box
 container.machineAmmoPress=Ammo Press
 container.machineArcWelder=Arc Welder
 container.machineArcFurnaceLarge=Arc Furnace
+container.machineAssemblyMachine=Assembly Machine
 container.machineBoiler=Oil Heater
 container.machineChemicalFactory=Chemical Factory
 container.machineChemicalPlant=Chemical Plant
@@ -5480,8 +5481,9 @@ tile.machine_arc_welder.name=Arc Welder
 tile.machine_armor_table.name=Armor Modification Table
 tile.machine_ashpit.name=Ashpit
 tile.machine_ashpit.desc=Collects ashes from fireboxes and heating ovens
-tile.machine_assembler.name=Assembly Machine
+tile.machine_assembler.name=Assembly Machine (Legacy)
 tile.machine_assemfac.name=Assembly Factory
+tile.machine_assembly_machine.name=Assembly Machine
 tile.machine_autocrafter.name=Automatic Crafting Table
 tile.machine_autosaw.name=Automatic Buzz Saw
 tile.machine_autosaw.desc=Cuts down nearby plants, re-plants trees$Accepts:$-Wood oil$-Ethanol$-Fish oil$-Heavy oil

src/main/resources/assets/hbm/models/machines/assembly_machine.obj

@@ -578,12 +578,12 @@ vt 0.947368 0.518519
 vt 0.881579 0.574074
 vt 0.881579 0.518519
 vt 0.861842 0.574074
-vt 0.720395 0.629566
-vt 0.707282 0.611111
-vt 0.720395 0.592656
-vt 0.684807 0.624161
-vt 0.684807 0.598061
-vt 0.703351 0.598061
+vt 0.723684 0.629566
+vt 0.710572 0.611111
+vt 0.723684 0.592656
+vt 0.688096 0.624161
+vt 0.688096 0.598061
+vt 0.706641 0.598061
 vt 0.907895 0.481481
 vt 0.894737 0.462963
 vt 0.907895 0.462963
@@ -607,12 +607,12 @@ vt 0.947368 0.518519
 vt 0.881579 0.574074
 vt 0.881579 0.518519
 vt 0.861842 0.574074
-vt 0.720395 0.629566
-vt 0.707282 0.611111
-vt 0.720395 0.592656
-vt 0.684807 0.624161
-vt 0.684807 0.598061
-vt 0.703351 0.598061
+vt 0.723684 0.629566
+vt 0.710572 0.611111
+vt 0.723684 0.592656
+vt 0.688096 0.624161
+vt 0.688096 0.598061
+vt 0.706641 0.598061
 vt 0.907895 0.481481
 vt 0.894737 0.462963
 vt 0.907895 0.462963
@@ -649,29 +649,29 @@ vt 0.470395 0.148148
 vt 0.417763 0.148148
 vt 0.319079 0.148148
 vt 0.947368 0.574074
-vt 0.729667 0.598061
-vt 0.733508 0.611111
-vt 0.729667 0.624161
-vt 0.711123 0.624161
-vt 0.711123 0.598061
-vt 0.680966 0.611111
-vt 0.694079 0.592656
-vt 0.707192 0.611111
-vt 0.703351 0.624161
-vt 0.694079 0.629566
+vt 0.732957 0.598061
+vt 0.736797 0.611111
+vt 0.732957 0.624161
+vt 0.714412 0.624161
+vt 0.714412 0.598061
+vt 0.684256 0.611111
+vt 0.697369 0.592656
+vt 0.710482 0.611111
+vt 0.706641 0.624161
+vt 0.697369 0.629566
 vt 0.894737 0.481481
 vt 0.947368 0.462963
 vt 0.947368 0.574074
-vt 0.729667 0.598061
-vt 0.733508 0.611111
-vt 0.729667 0.624161
-vt 0.711123 0.624161
-vt 0.711123 0.598061
-vt 0.680966 0.611111
-vt 0.694079 0.592656
-vt 0.707192 0.611111
-vt 0.703351 0.624161
-vt 0.694079 0.629566
+vt 0.732957 0.598061
+vt 0.736797 0.611111
+vt 0.732957 0.624161
+vt 0.714412 0.624161
+vt 0.714412 0.598061
+vt 0.684256 0.611111
+vt 0.697369 0.592656
+vt 0.710482 0.611111
+vt 0.706641 0.624161
+vt 0.697369 0.629566
 vt 0.894737 0.481481
 vt 0.947368 0.462963
 vt 0.319079 0.296296