flowing my creek so hard rn you wouldn't believe

changelog

@@ -8,6 +8,7 @@
   * Explosive 7.62mm
   * Explosive .50 BMG
   * Explosive 10 gauge buckshot (unlike 12 gauge which has explosive slugs)
+* Lincoln's repeater, a b-side to the lever action rifle
 
 ## Changed
 * Fat mines now use the standardized mini nuke code
@@ -25,6 +26,8 @@
 * `enableGuns` config option now applies to SEDNA system guns, simply canceling all gun-related keybinds
 * Cinnabar dust, if registered by another mod, can now be acidized into cinnabar using hydrogen peroxide
 * Copper wires, like AA and gold, can now be welded into dense wires
+* Removed the crafting recipe for the small geothermal generator and ZPE generators
+* Removed the gemothermal, ZPE and ambient radiation generators from the creative menu
 
 ## Fixed
 * Fixed animation errors on the MAS-36
@@ -34,4 +37,6 @@
 * Removed the coke to heavy oil recipe for allowing infinite oil loops
   * Coke to syngas and coalgas recipes should be fine though, so they stay
 * Potentially fixed another issue regarding NPCs firing belt-fed guns
-* Chunk-loading drones may or may not be fixed
+* Chunk-loading drones may or may not be fixed
+* Fixed disperser canisters not actually despawning on impact, endlessly spawning mist clouds
+* Fixed issues where the new packet system didn't play nice with machines that are being sent packets by other machines, like watz segments and radar screens

src/main/java/api/hbm/fluidmk2/FluidNetMK2.java

@@ -36,6 +36,7 @@ public class FluidNetMK2 extends NodeNet<IFluidReceiverMK2, IFluidProviderMK2, F
 
 		setupFluidProviders();
 		setupFluidReceivers();
+		transferFluid();
 		
 		cleanUp();
 	}
@@ -45,6 +46,7 @@ public class FluidNetMK2 extends NodeNet<IFluidReceiverMK2, IFluidProviderMK2, F
 	public List<Pair<IFluidProviderMK2, Long>>[] providers = new ArrayList[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
 	public long[][] fluidDemand = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1][ConnectionPriority.values().length];
 	public List<Pair<IFluidReceiverMK2, Long>>[][] receivers = new ArrayList[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1][ConnectionPriority.values().length];
+	public long[] transfered = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
 	
 	public void setupFluidProviders() {
 		Iterator<Entry<IFluidProviderMK2, Long>> iterator = providerEntries.entrySet().iterator();
@@ -79,10 +81,63 @@ public class FluidNetMK2 extends NodeNet<IFluidReceiverMK2, IFluidProviderMK2, F
 		}
 	}
 	
+	public void transferFluid() {
+
+		long[] received = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
+		long[] notAccountedFor = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
+		
+		for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) { // if the pressure range were ever to increase, we might have to rethink this
+			
+			for(int i = ConnectionPriority.values().length - 1; i >= 0; i--) {
+				
+				long toTransfer = Math.min(fluidDemand[p][i], fluidAvailable[p]);
+				if(toTransfer <= 0) continue;
+
+				long priorityDemand = fluidDemand[p][i];
+				
+				for(Pair<IFluidReceiverMK2, Long> entry : receivers[p][i]) {
+					double weight = (double) entry.getValue() / (double) (priorityDemand);
+					long toSend = (long) Math.max(toTransfer * weight, 0D);
+					toSend -= entry.getKey().transferFluid(type, p, toSend);
+					received[p] += toSend;
+					fluidTracker += toSend;
+				}
+			}
+			
+			notAccountedFor[p] = received[p];
+		}
+		
+		for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) {
+
+			for(Pair<IFluidProviderMK2, Long> entry : providers[p]) {
+				double weight = (double) entry.getValue() / (double) fluidAvailable[p];
+				long toUse = (long) Math.max(received[p] * weight, 0D);
+				entry.getKey().useUpFluid(type, p, toUse);
+				notAccountedFor[p] -= toUse;
+			}
+		}
+		
+		for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) {
+			
+			int iterationsLeft = 100;
+			while(iterationsLeft > 0 && notAccountedFor[p] > 0 && providers[p].size() > 0) {
+				iterationsLeft--;
+				
+				Pair<IFluidProviderMK2, Long> selected = providers[p].get(rand.nextInt(providers[p].size()));
+				IFluidProviderMK2 scapegoat = selected.getKey();
+				
+				long toUse = Math.min(notAccountedFor[p], scapegoat.getFluidAvailable(type, p));
+				scapegoat.useUpFluid(type, p, toUse);
+				notAccountedFor[p] -= toUse;
+			}
+		}
+	}
+	
 	public void cleanUp() {
 		for(int i = 0; i < IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1; i++) {
 			fluidAvailable[i] = 0;
 			providers[i].clear();
+			transfered[i] = 0;
 			
 			for(int j = 0; j < ConnectionPriority.values().length; j++) {
 				fluidDemand[i][j] = 0;

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -47,8 +47,7 @@ import java.util.ArrayList;
 
 public class ModBlocks {
 
-	public static void mainRegistry()
-	{
+	public static void mainRegistry() {
 		initializeBlock();
 		registerBlock();
 	}
@@ -1877,8 +1876,8 @@ public class ModBlocks {
 		field_disturber = new MachineFieldDisturber().setBlockName("field_disturber").setHardness(5.0F).setResistance(200.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":field_disturber");
 
 		machine_rtg_grey = new MachineRTG(Material.iron).setBlockName("machine_rtg_grey").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rtg");
-		machine_amgen = new MachineAmgen(Material.iron).setBlockName("machine_amgen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
-		machine_geo = new MachineAmgen(Material.iron).setBlockName("machine_geo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
+		machine_amgen = new MachineAmgen(Material.iron).setBlockName("machine_amgen").setHardness(5.0F).setResistance(10.0F);
+		machine_geo = new MachineAmgen(Material.iron).setBlockName("machine_geo").setHardness(5.0F).setResistance(10.0F);
 		machine_minirtg = new MachineMiniRTG(Material.iron).setBlockName("machine_minirtg").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rtg_cell");
 		machine_powerrtg = new MachineMiniRTG(Material.iron).setBlockName("machine_powerrtg").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rtg_polonium");
 		machine_radiolysis = new MachineRadiolysis(Material.iron).setBlockName("machine_radiolysis").setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel_machine");
@@ -1917,7 +1916,6 @@ public class ModBlocks {
 
 		conveyor = new BlockConveyor().setBlockName("conveyor").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor");
 		conveyor_express = new BlockConveyorExpress().setBlockName("conveyor_express").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor_express");
-		//conveyor_classic = new BlockConveyorClassic().setBlockName("conveyor_classic").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor");
 		conveyor_double = new BlockConveyorDouble().setBlockName("conveyor_double").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor_double");
 		conveyor_triple = new BlockConveyorTriple().setBlockName("conveyor_triple").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor_triple");
 		conveyor_chute = new BlockConveyorChute().setBlockName("conveyor_chute").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor");
@@ -2268,8 +2266,8 @@ public class ModBlocks {
 
 		machine_siren = new MachineSiren(Material.iron).setBlockName("machine_siren").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_siren");
 
-		machine_spp_bottom = new SPPBottom(Material.iron).setBlockName("machine_spp_bottom").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
-		machine_spp_top = new SPPTop(Material.iron).setBlockName("machine_spp_top").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
+		machine_spp_bottom = new SPPBottom(Material.iron).setBlockName("machine_spp_bottom").setHardness(5.0F).setResistance(10.0F);
+		machine_spp_top = new SPPTop(Material.iron).setBlockName("machine_spp_top").setHardness(5.0F).setResistance(10.0F);
 
 		radiobox = new Radiobox(Material.iron).setBlockName("radiobox").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":radiobox");
 		radiorec = new RadioRec(Material.iron).setBlockName("radiorec").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":radiorec");

src/main/java/com/hbm/blocks/machine/MachineAmgen.java

@@ -1,6 +1,5 @@
 package com.hbm.blocks.machine;
 
-import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineAmgen;
 
@@ -30,21 +29,6 @@ public class MachineAmgen extends BlockContainer {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister iconRegister) {
-
-		if(this == ModBlocks.machine_amgen) {
-			this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_amgen_top");
-			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_amgen_side");
-		}
-		if(this == ModBlocks.machine_geo) {
-			this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_geo_top");
-			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_geo_side");
-		}
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":block_deprecated");
 	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int metadata) {
-		return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon);
-	}
-
 }

src/main/java/com/hbm/blocks/machine/SPPBottom.java

@@ -9,14 +9,9 @@ import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 public class SPPBottom extends BlockContainer {
-	
-	@SideOnly(Side.CLIENT)
-	private IIcon iconTop;
-	private IIcon iconBottom;
 
 	public SPPBottom(Material p_i45386_1_) {
 		super(p_i45386_1_);
@@ -30,15 +25,7 @@ public class SPPBottom extends BlockContainer {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister iconRegister) {
-		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + (":machine_spp_b_top"));
-		this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + (":machine_spp_blank"));
-		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_spp_b_side");
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int metadata) {
-		return side == 1 ? this.iconTop : (side == 0 ? this.iconBottom : this.blockIcon);
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":block_deprecated");
 	}
 
 }

src/main/java/com/hbm/blocks/machine/SPPTop.java

@@ -7,13 +7,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
 
 public class SPPTop extends Block {
-	
-	@SideOnly(Side.CLIENT)
-	private IIcon iconTop;
-	private IIcon iconBottom;
 
 	public SPPTop(Material p_i45394_1_) {
 		super(p_i45394_1_);
@@ -22,15 +17,6 @@ public class SPPTop extends Block {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister iconRegister) {
-		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + (":machine_spp_blank"));
-		this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + (":machine_spp_t_bottom"));
-		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_spp_t_side");
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":block_deprecated");
 	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int metadata) {
-		return side == 1 ? this.iconTop : (side == 0 ? this.iconBottom : this.blockIcon);
-	}
-
 }

src/main/java/com/hbm/entity/grenade/EntityDisperserCanister.java

@@ -10,16 +10,16 @@ import net.minecraft.world.World;
 
 public class EntityDisperserCanister extends EntityGrenadeBase {
 	
-	public EntityDisperserCanister(World p_i1773_1_) {
-		super(p_i1773_1_);
+	public EntityDisperserCanister(World world) {
+		super(world);
 	}
 
-	public EntityDisperserCanister(World p_i1774_1_, EntityLivingBase p_i1774_2_) {
-		super(p_i1774_1_, p_i1774_2_);
+	public EntityDisperserCanister(World world, EntityLivingBase living) {
+		super(world, living);
 	}
 
-	public EntityDisperserCanister(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) {
-		super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
+	public EntityDisperserCanister(World world, double x, double y, double z) {
+		super(world, x, y, z);
 	}
 
 	public EntityDisperserCanister setFluid(int id) {
@@ -55,6 +55,7 @@ public class EntityDisperserCanister extends EntityGrenadeBase {
 			mist.setArea(10, 5);
 			mist.setDuration(80);
 			worldObj.spawnEntityInWorld(mist);
+			this.setDead();
 		}
 	}
 

src/main/java/com/hbm/items/ModItems.java

@@ -1456,6 +1456,7 @@ public class ModItems {
 	public static Item gun_light_revolver_atlas;
 	public static Item gun_light_revolver_dani;
 	public static Item gun_henry;
+	public static Item gun_henry_lincoln;
 	public static Item gun_greasegun;
 	public static Item gun_maresleg;
 	public static Item gun_maresleg_akimbo;
@@ -6445,6 +6446,7 @@ public class ModItems {
 		GameRegistry.registerItem(gun_light_revolver_atlas, gun_light_revolver_atlas.getUnlocalizedName());
 		GameRegistry.registerItem(gun_light_revolver_dani, gun_light_revolver_dani.getUnlocalizedName());
 		GameRegistry.registerItem(gun_henry, gun_henry.getUnlocalizedName());
+		GameRegistry.registerItem(gun_henry_lincoln, gun_henry_lincoln.getUnlocalizedName());
 		GameRegistry.registerItem(gun_greasegun, gun_greasegun.getUnlocalizedName());
 		GameRegistry.registerItem(gun_maresleg, gun_maresleg.getUnlocalizedName());
 		GameRegistry.registerItem(gun_maresleg_akimbo, gun_maresleg_akimbo.getUnlocalizedName());

src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java

@@ -42,7 +42,8 @@ public class GunFactoryClient {
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_light_revolver,				new ItemRenderAtlas(ResourceManager.bio_revolver_tex));
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_light_revolver_atlas,		new ItemRenderAtlas(ResourceManager.bio_revolver_atlas_tex));
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_light_revolver_dani,			new ItemRenderDANI());
-		MinecraftForgeClient.registerItemRenderer(ModItems.gun_henry,						new ItemRenderHenry());
+		MinecraftForgeClient.registerItemRenderer(ModItems.gun_henry,						new ItemRenderHenry(ResourceManager.henry_tex));
+		MinecraftForgeClient.registerItemRenderer(ModItems.gun_henry_lincoln,				new ItemRenderHenry(ResourceManager.henry_lincoln_tex));
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_greasegun,					new ItemRenderGreasegun());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_maresleg,					new ItemRenderMaresleg(ResourceManager.maresleg_tex));
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_maresleg_akimbo,				new ItemRenderMareslegAkimbo());
@@ -207,6 +208,7 @@ public class GunFactoryClient {
 		((ItemGunBaseNT) ModItems.gun_light_revolver)				.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_light_revolver_atlas)			.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_henry)						.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
+		((ItemGunBaseNT) ModItems.gun_henry_lincoln)				.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_greasegun)					.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_maresleg)						.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_maresleg_broken)				.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_AMMO);

src/main/java/com/hbm/items/weapon/sedna/factory/XFactory44.java

@@ -94,6 +94,16 @@ public class XFactory44 {
 				.setupStandardConfiguration()
 				.anim(LAMBDA_HENRY_ANIMS).orchestra(Orchestras.ORCHESTRA_HENRY)
 				).setUnlocalizedName("gun_henry");
+		ModItems.gun_henry_lincoln = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
+				.dura(300).draw(15).inspect(23).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
+				.rec(new Receiver(0)
+						.dmg(20F).delay(20).reload(25, 11, 14, 8).jam(45).sound("hbm:weapon.fire.rifle", 1.0F, 1.25F)
+						.mag(new MagazineSingleReload(0, 14).addConfigs(m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express))
+						.offset(0.75, -0.0625, -0.1875D)
+						.setupStandardFire().recoil(LAMBDA_RECOIL_HENRY))
+				.setupStandardConfiguration()
+				.anim(LAMBDA_HENRY_ANIMS).orchestra(Orchestras.ORCHESTRA_HENRY)
+				).setUnlocalizedName("gun_henry_lincoln");
 
 		ModItems.gun_heavy_revolver = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
 				.dura(600).draw(10).inspect(23).crosshair(Crosshair.L_CLASSIC).smoke(Lego.LAMBDA_STANDARD_SMOKE)

src/main/java/com/hbm/main/CraftingManager.java

@@ -658,7 +658,6 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.absorber_green, 1), new Object[] { "ICI", "CPC", "ICI", 'I', ANY_PLASTIC.ingot(), 'C', ModItems.powder_desh_mix, 'P', ModBlocks.absorber_red });
 		addRecipeAuto(new ItemStack(ModBlocks.absorber_pink, 1), new Object[] { "ICI", "CPC", "ICI", 'I', BIGMT.ingot(), 'C', ModItems.powder_nitan_mix, 'P', ModBlocks.absorber_green });
 		addRecipeAuto(new ItemStack(ModBlocks.decon, 1), new Object[] { "BGB", "SAS", "BSB", 'B', BE.ingot(), 'G', Blocks.iron_bars, 'S', STEEL.ingot(), 'A', ModBlocks.absorber });
-		addRecipeAuto(new ItemStack(ModBlocks.machine_geo, 1), new Object[] { "ITI", "PCP", "ITI", 'I', DURA.ingot(), 'T', ModItems.thermo_element, 'P', CU.plateCast(), 'C', ModBlocks.red_wire_coated });
 		addRecipeAuto(new ItemStack(ModBlocks.machine_minirtg, 1), new Object[] { "LLL", "PPP", "TRT", 'L', PB.plate(), 'P', PU238.billet(), 'T', ModItems.thermo_element, 'R', ModItems.rtg_unit });
 		addRecipeAuto(new ItemStack(ModBlocks.machine_powerrtg, 1), new Object[] { "SRS", "PTP", "SRS", 'S', STAR.ingot(), 'R', ModItems.rtg_unit, 'P', PO210.billet(), 'T', TS.dust() });
 
@@ -1056,10 +1055,6 @@ public class CraftingManager {
 		}
 
 		if(!GeneralConfig.enable528) {
-			addRecipeAuto(new ItemStack(ModBlocks.machine_spp_bottom), new Object[] { "MDM", "LCL", "LWL", 'M', MAGTUNG.ingot(), 'D', ModItems.plate_desh, 'L', PB.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'W', ModItems.coil_magnetized_tungsten });
-			addRecipeAuto(new ItemStack(ModBlocks.machine_spp_top), new Object[] { "LWL", "LCL", "MDM", 'M', MAGTUNG.ingot(), 'D', ModItems.plate_desh, 'L', PB.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'W', ModItems.coil_magnetized_tungsten });
-			addShapelessAuto(new ItemStack(ModBlocks.machine_spp_bottom), new Object[] { ModBlocks.machine_spp_top });
-			addShapelessAuto(new ItemStack(ModBlocks.machine_spp_top), new Object[] { ModBlocks.machine_spp_bottom });
 			addRecipeAuto(new ItemStack(ModBlocks.struct_launcher_core, 1), new Object[] { "SCS", "SIS", "BEB", 'S', ModBlocks.steel_scaffold, 'I', Blocks.iron_bars, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'B', ModBlocks.struct_launcher, 'E', ModBlocks.machine_battery });
 			addRecipeAuto(new ItemStack(ModBlocks.struct_launcher_core_large, 1), new Object[] { "SIS", "ICI", "BEB", 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'I', Blocks.iron_bars, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'B', ModBlocks.struct_launcher, 'E', ModBlocks.machine_battery });
 			addRecipeAuto(new ItemStack(ModBlocks.struct_soyuz_core, 1), new Object[] { "CUC", "TST", "TBT", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'U', ModItems.upgrade_power_3, 'T', ModBlocks.barrel_steel, 'S', ModBlocks.steel_scaffold, 'B', ModBlocks.machine_lithium_battery });

src/main/java/com/hbm/main/ResourceManager.java

@@ -821,40 +821,16 @@ public class ResourceManager {
 	public static final IModelCustom shimmer_sledge = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_sledge.obj"));
 	public static final IModelCustom shimmer_axe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_axe.obj"));
 	public static final IModelCustom stopsign = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/stopsign.obj"));
-	public static final IModelCustom gavel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/gavel.obj"));
-	public static final IModelCustom crucible = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/crucible.obj"));
-	public static final IModelCustom chainsaw = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/chainsaw.obj"), false);
-	public static final IModelCustom boltgun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/boltgun.obj"));
-
-	public static final IModelCustom hk69 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/hk69.obj"));
-	public static final IModelCustom deagle = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/deagle.obj"));
-	public static final IModelCustom shotty = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/supershotty.obj"));
-	public static final IModelCustom ks23 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/ks23.obj"));
-	public static final IModelCustom flechette = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/flechette.obj"));
-	public static final IModelCustom sauergun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/sauergun.obj"));
-	public static final IModelCustom vortex = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/vortex.obj"));
-	public static final IModelCustom thompson = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/thompson.obj"));
-	public static final IModelCustom bolter = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bolter.obj"));
-	public static final IModelCustom ff_python = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/python.obj"));
-	public static final IModelCustom ff_maresleg = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/maresleg.obj"));
+	public static final IModelCustom gavel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/gavel.obj")).asVBO();
+	public static final IModelCustom crucible = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/crucible.obj")).asVBO();
+	public static final IModelCustom chainsaw = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/chainsaw.obj"), false).asVBO();
+	public static final IModelCustom boltgun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/boltgun.obj")).asVBO();
+	public static final IModelCustom bolter = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bolter.obj")).asVBO();
+	public static final IModelCustom detonator_laser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/detonator_laser.obj")).asVBO();
+	public static final IModelCustom fireext = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/fireext.obj")).asVBO();
 	public static final IModelCustom ff_nightmare = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/nightmare.obj"));
-	public static final IModelCustom fireext = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/fireext.obj"));
-	public static final IModelCustom ar15 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/ar15.obj"));
-	public static final IModelCustom mg42 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/mg42.obj"));
-	public static final IModelCustom rem700 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/rem700.obj"));
-	public static final IModelCustom rem700poly = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/rem700poly.obj"));
-	public static final IModelCustom rem700sat = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/rem700sat.obj"));
-	public static final IModelCustom cursed_revolver = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/cursed.obj"));
-	public static final IModelCustom detonator_laser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/detonator_laser.obj"));
-	public static final IModelCustom remington = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/remington.obj"));
-	public static final IModelCustom nightmare_dark = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/nightmare_dark.obj"));
-	public static final IModelCustom glass_cannon = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/glass_cannon.obj"));
-	public static final IModelCustom novac = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/novac.obj"));
-	public static final IModelCustom lunatic_sniper = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/lunatic_sniper.obj")).asVBO();
-	public static final IModelCustom benelli = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/benelli_new.obj")).asVBO();
 	public static final IModelCustom coilgun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/coilgun.obj")).asVBO();
 	public static final IModelCustom cryocannon = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/cryo_cannon.obj")).asVBO();
-	public static final IModelCustom uac_pistol = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/UAC pistol.obj")).asVBO();
 
 	public static final IModelCustom pepperbox = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/pepperbox.obj")).asVBO();
 	public static final IModelCustom bio_revolver = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bio_revolver.obj")).asVBO();
@@ -891,13 +867,7 @@ public class ResourceManager {
 	public static final IModelCustom aberrator = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/aberrator.obj")).asVBO();
 	public static final IModelCustom mas36 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/mas36.obj")).asVBO();
 
-	public static final HashMap<String, BusAnimation> python_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/python.json"));
-	public static final HashMap<String, BusAnimation> cursed_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/cursed.json"));
-	public static final HashMap<String, BusAnimation> novac_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/novac.json"));
-	public static final HashMap<String, BusAnimation> ks23_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/ks23.json"));
 	public static final HashMap<String, BusAnimation> spas_12_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/spas12.json"));
-	public static final HashMap<String, BusAnimation> supershotty_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/supershotty.json"));
-	public static final HashMap<String, BusAnimation> benelli_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/benelli.json"));
 	public static final HashMap<String, BusAnimation> congolake_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/congolake.json"));
 	public static final HashMap<String, BusAnimation> am180_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/am180.json"));
 	public static final HashMap<String, BusAnimation> flamethrower_anim = AnimationLoader.load(new ResourceLocation(RefStrings.MODID, "models/weapons/animations/flamethrower.json"));
@@ -948,51 +918,19 @@ public class ResourceManager {
 	public static final ResourceLocation chainsaw_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/chainsaw.png");
 	public static final ResourceLocation boltgun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/boltgun.png");
 
-	public static final ResourceLocation hk69_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/hk69.png");
-	public static final ResourceLocation deagle_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/deagle.png");
-	public static final ResourceLocation ks23_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ks23.png");
-	public static final ResourceLocation shotty_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/shotty.png");
-	public static final ResourceLocation flechette_body = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_body.png");
-	public static final ResourceLocation flechette_barrel = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_barrel.png");
-	public static final ResourceLocation flechette_gren_tube = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_gren_tube.png");
-	public static final ResourceLocation flechette_grenades = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_grenades.png");
-	public static final ResourceLocation flechette_pivot = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_pivot.png");
-	public static final ResourceLocation flechette_top = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_top.png");
-	public static final ResourceLocation flechette_chamber = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_chamber.png");
-	public static final ResourceLocation flechette_base = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_base.png");
-	public static final ResourceLocation flechette_drum = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_drum.png");
-	public static final ResourceLocation flechette_trigger = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_trigger.png");
-	public static final ResourceLocation flechette_stock = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/flechette_stock.png");
-	public static final ResourceLocation sauergun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/sauergun.png");
-	public static final ResourceLocation vortex_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/vortex.png");
-	public static final ResourceLocation thompson_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/thompson.png");
 	public static final ResourceLocation bolter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bolter.png");
 	public static final ResourceLocation bolter_digamma_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bolter_digamma.png");
 	public static final ResourceLocation fireext_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/fireext_normal.png");
 	public static final ResourceLocation fireext_foam_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/fireext_foam.png");
 	public static final ResourceLocation fireext_sand_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/fireext_sand.png");
-	public static final ResourceLocation ar15_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/carbine.png");
 	public static final ResourceLocation stinger_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/stinger.png");
 	public static final ResourceLocation sky_stinger_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/sky_stinger.png");
-	public static final ResourceLocation mg42_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/mg42.png");
-	public static final ResourceLocation rem700_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/rem700.png");
-	public static final ResourceLocation rem700poly_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/rem700poly.png");
-	public static final ResourceLocation rem700sat_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/rem700sat.png");
 	public static final ResourceLocation detonator_laser_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/detonator_laser.png");
-	public static final ResourceLocation remington_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/remington.png");
 	public static final ResourceLocation spas_12_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/spas-12.png");
-	public static final ResourceLocation glass_cannon_panel_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/glass_cannon_panel.png");
 	public static final ResourceLocation chemthrower_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/chemthrower.png");
-	public static final ResourceLocation novac_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/novac.png");
-	public static final ResourceLocation blackjack_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/blackjack.png");
-	public static final ResourceLocation lent_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/lent_gun.png");
-	public static final ResourceLocation red_key_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/red_key.png");
 	public static final ResourceLocation m2_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/m2_browning.png");
-	public static final ResourceLocation lunatic_sniper_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/lunatic_sniper.png");
-	public static final ResourceLocation benelli_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/benelli_tex.png");
 	public static final ResourceLocation coilgun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/coilgun.png");
 	public static final ResourceLocation cryocannon_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/cryo_cannon.png");
-	public static final ResourceLocation uac_pistol_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/pistol_texture.png");
 	public static final ResourceLocation congolake_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/congolake.png");
 
 	public static final ResourceLocation debug_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/debug_gun.png");
@@ -1002,6 +940,7 @@ public class ResourceManager {
 	public static final ResourceLocation dani_celestial_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/dani_celestial.png");
 	public static final ResourceLocation dani_lunar_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/dani_lunar.png");
 	public static final ResourceLocation henry_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/henry.png");
+	public static final ResourceLocation henry_lincoln_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/henry_lincoln.png");
 	public static final ResourceLocation greasegun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/greasegun.png");
 	public static final ResourceLocation maresleg_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/maresleg.png");
 	public static final ResourceLocation maresleg_broken_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/maresleg_broken.png");
@@ -1044,19 +983,9 @@ public class ResourceManager {
 
 	public static final ResourceLocation lance_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/lance.png");
 
-	public static final ResourceLocation ff_gold = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gold.png");
 	public static final ResourceLocation ff_gun_bright = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_bright.png");
 	public static final ResourceLocation ff_gun_dark = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_dark.png");
 	public static final ResourceLocation ff_gun_normal = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_normal.png");
-	public static final ResourceLocation ff_iron = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/iron.png");
-	public static final ResourceLocation ff_lead = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/lead.png");
-	public static final ResourceLocation ff_saturnite = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/saturnite.png");
-	public static final ResourceLocation ff_schrabidium = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/schrabidium.png");
-	public static final ResourceLocation ff_wood = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood.png");
-	public static final ResourceLocation ff_wood_red = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood_red.png");
-	public static final ResourceLocation ff_cursed = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/cursed.png");
-	public static final ResourceLocation ff_nightmare_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/nightmare.png");
-	public static final ResourceLocation ff_nightmare_orig_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/nightmare_orig.png");
 
 	public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png");
 	public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png");

src/main/java/com/hbm/render/item/ItemRenderLibrary.java

@@ -991,8 +991,6 @@ public class ItemRenderLibrary {
 				ResourceManager.rbmk_crane_console.renderPart("JoyStick");
 				ResourceManager.rbmk_crane_console.renderPart("Meter1");
 				ResourceManager.rbmk_crane_console.renderPart("Meter2");
-				bindTexture(ResourceManager.ks23_tex); ResourceManager.rbmk_crane_console.renderPart("Shotgun");
-				bindTexture(ResourceManager.mini_nuke_tex); ResourceManager.rbmk_crane_console.renderPart("MiniNuke");
 				GL11.glShadeModel(GL11.GL_FLAT);
 			}});
 		

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderHenry.java

@@ -8,8 +8,15 @@ import com.hbm.render.anim.HbmAnimations;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 public class ItemRenderHenry extends ItemRenderWeaponBase {
+	
+	public ResourceLocation texture;
+	
+	public ItemRenderHenry(ResourceLocation texture) {
+		this.texture = texture;
+	}
 
 	@Override
 	protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.5F; }
@@ -38,7 +45,7 @@ public class ItemRenderHenry extends ItemRenderWeaponBase {
 	public void renderFirstPerson(ItemStack stack) {
 		
 		ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem();
-		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.henry_tex);
+		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
 		double scale = 0.375D;
 		GL11.glScaled(scale, scale, scale);
 
@@ -150,7 +157,7 @@ public class ItemRenderHenry extends ItemRenderWeaponBase {
 		GL11.glEnable(GL11.GL_LIGHTING);
 		
 		GL11.glShadeModel(GL11.GL_SMOOTH);
-		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.henry_tex);
+		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
 		ResourceManager.henry.renderAll();
 		GL11.glShadeModel(GL11.GL_FLAT);
 	}

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

@@ -61,10 +61,10 @@ public class RenderCraneConsole extends TileEntitySpecialRenderer {
 		ResourceManager.rbmk_crane_console.renderPart("Meter2");
 		GL11.glPopMatrix();
 		
-		bindTexture(ResourceManager.ks23_tex);
+		/*bindTexture(ResourceManager.ks23_tex);
 		ResourceManager.rbmk_crane_console.renderPart("Shotgun");
 		bindTexture(ResourceManager.mini_nuke_tex);
-		ResourceManager.rbmk_crane_console.renderPart("MiniNuke");
+		ResourceManager.rbmk_crane_console.renderPart("MiniNuke");*/
 		
 		GL11.glDisable(GL11.GL_TEXTURE_2D);
 		GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);

src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java

@@ -212,7 +212,7 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I
 						screen.refZ = zCoord;
 						screen.range = this.getRange();
 						screen.linked = true;
-						networkPackNT(25);
+						screen.networkPackNT(25);
 					}
 				}
 			}

src/main/java/com/hbm/tileentity/machine/TileEntityWatz.java

@@ -121,7 +121,7 @@ public class TileEntityWatz extends TileEntityMachineBase implements IFluidStand
 			/* send sync packets (order doesn't matter) */
 			for(TileEntityWatz segment : segments) {
 				segment.isOn = turnedOn;
-				this.networkPackNT(25);
+				segment.networkPackNT(25);
 				segment.heat *= 0.99; //cool 1% per tick
 			}
 			

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

@@ -2260,6 +2260,7 @@ item.gun_heavy_revolver.name=Schwerer Revolver
 item.gun_heavy_revolver_lilmac.name=Little Macintosh
 item.gun_heavy_revolver_protege.name=Protège
 item.gun_henry.name=Repetiergewehr
+item.gun_henry_lincoln.name=Lincolns Repetiergewehr
 item.gun_hk69.name=Granatenpistole
 item.gun_hp.name=HPP Lazerjet
 item.gun_hp_ammo.name=Tintenpatrone

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

@@ -3070,6 +3070,7 @@ item.gun_heavy_revolver.name=Heavy Revolver
 item.gun_heavy_revolver_lilmac.name=Little Macintosh
 item.gun_heavy_revolver_protege.name=Protège
 item.gun_henry.name=Lever Action Rifle
+item.gun_henry_lincoln.name=Lincoln's Repeater
 item.gun_hk69.name=Grenade Pistol
 item.gun_hp.name=HPP Lazerjet
 item.gun_hp_ammo.name=Ink Cartridge

src/main/resources/assets/hbm/models/weapons/animations/cursed.json

@@ -1 +0,0 @@
-{"anim": {"Fire": {"Body": {"location": {"z": [[-0.0, 0.0], [-0.0, 16.666666666666668], [0.1901400089263916, 50.0], [-0.0, 183.33333333333331]], "y": [[0.0, 0.0], [0.0, 16.666666666666668], [0.040800124406814575, 50.0], [0.0, 183.33333333333331]]}, "rotation_euler": {"x": [[0.0, 33.333333333333336], [38.989947046815615, 66.66666666666666], [0.0, 250.0]]}}, "Slide": {"location": {"z": [[-0.0, 0.0], [0.12989415228366852, 16.666666666666668], [0.12989415228366852, 50.0], [0.09892651438713074, 83.33333333333333], [-0.0, 83.33333333333334]]}}}, "Reload": {"Body": {"location": {"x": [[0.0, 0.0], [0.0, 100.0], [0.017018239945173264, 116.66666666666669], [-0.09787648171186447, 83.33333333333331], [-0.12292511016130447, 266.66666666666663], [-0.10135655850172043, 133.33333333333337], [-0.1491556018590927, 150.0], [-0.13177432119846344, 400.0], [0.0, 283.33333333333326]], "z": [[-0.0, 0.0], [0.08164123445749283, 100.0], [-0.08178003877401352, 116.66666666666669], [-0.09053938835859299, 83.33333333333331], [-0.05708351731300354, 233.33333333333337], [-0.03883926570415497, 166.66666666666663], [0.0013935839524492621, 150.0], [0.006992057431489229, 400.0], [-0.0, 283.33333333333326]], "y": [[0.0, 0.0], [0.18025973439216614, 100.0], [0.44325628876686096, 116.66666666666669], [0.21647267043590546, 83.33333333333331], [0.27539756894111633, 200.0], [0.10282676666975021, 200.0], [0.16902926564216614, 150.0], [-0.034092918038368225, 400.0], [0.0, 283.33333333333326]]}, "rotation_euler": {"x": [[0.0, 0.0], [14.347078728989414, 66.66666666666667], [22.703222659589517, 99.99999999999999], [15.15270124913971, 83.33333333333334], [1.8531396048511795, 100.0], [-18.417429219568255, 266.66666666666674], [-18.417429219568255, 99.99999999999989], [59.33201599901403, 200.0], [72.57186642203102, 216.66666666666663], [62.294070966562636, 116.66666666666674], [54.952785571147, 83.33333333333326], [0.0, 200.0]], "z": [[0.0, 0.0], [-10.592385430902713, 66.66666666666667], [-15.994342771878069, 99.99999999999999], [-11.103182835529408, 83.33333333333334], [-9.371659871492183, 100.0], [-9.698956560103671, 266.66666666666674], [-9.698956560103671, 149.9999999999999], [-50.8729052591287, 150.0], [-75.4402931564371, 216.66666666666663], [-52.8528848919616, 116.66666666666674], [-36.719021845907676, 83.33333333333326], [-0.0, 200.0]], "y": [[0.0, 0.0], [-3.154393948349805, 66.66666666666667], [-4.726022183917031, 99.99999999999999], [-3.3394954899517355, 83.33333333333334], [-2.877424441420499, 100.0], [-5.679812424619238, 266.66666666666674], [-5.679812424619238, 183.33333333333326], [-0.6765985391814631, 116.66666666666663], [21.457408107810238, 216.66666666666663], [34.27835619884117, 116.66666666666674], [43.4361748002513, 83.33333333333326], [0.0, 200.0]]}}, "Magazine": {"location": {"z": [[-0.0, 0.0], [-0.0, 300.0], [0.14596298336982727, 183.33333333333331], [0.41417545080184937, 249.99999999999994], [0.11441206932067871, 200.0000000000001], [-0.0, 133.33333333333337]], "y": [[0.0, 0.0], [0.0, 300.0], [-0.6360859274864197, 183.33333333333331], [-0.6360859274864197, 249.99999999999994], [-0.4159921109676361, 200.0000000000001], [0.0, 133.33333333333337]]}}, "Slide": {"location": {"z": [[-0.0, 0.0], [0.13051199913024902, 16.666666666666668], [0.13051199913024902, 1133.3333333333333], [0.0854932963848114, 66.66666666666652], [-0.0, 50.0]]}}}}, "offset": {}}

src/main/resources/assets/hbm/models/weapons/animations/novac.json

@@ -1 +0,0 @@
-{"anim": {"Fire": {"Body": {"rotation_euler": {"x": [[0.0, 0.0], [29.145301697941925, 66.66666666666667], [0.0, 566.6666666666666]]}, "location": {"z": [[-0.0, 0.0], [0.7235583066940308, 33.333333333333336], [-0.0, 599.9999999999999]], "y": [[0.0, 0.0], [0.7866886854171753, 33.333333333333336], [0.0, 599.9999999999999]]}}, "Hammer": {"rotation_euler": {"x": [[0.0, 0.0], [-42.84400081430579, 16.666666666666668], [-42.84400081430579, 250.00000000000003], [0.0, 200.0]]}, "location": {"x": [[0.0, 0.0]], "z": [[1.1140995025634766, 0.0]], "y": [[0.48292604088783264, 0.0]]}}}, "Reload": {"Body": {"location": {"x": [[0.0, 0.0], [0.04879806935787201, 166.66666666666666], [-0.1566363126039505, 133.33333333333334], [0.0, 166.66666666666669]], "z": [[-0.0, 0.0], [-0.7191624641418457, 166.66666666666666], [-1.058491826057434, 133.33333333333334], [-0.0, 166.66666666666669]], "y": [[0.0, 0.0], [0.7507638931274414, 166.66666666666666], [0.9907249212265015, 133.33333333333334], [0.0, 166.66666666666669]]}, "rotation_euler": {"x": [[0.0, 0.0], [-19.391663497116777, 166.66666666666666], [45.102665825653546, 133.33333333333334], [0.0, 166.66666666666669]], "z": [[-0.0, 0.0], [0.5174686318159474, 166.66666666666666], [3.009666081818643, 133.33333333333334], [-0.0, 166.66666666666669]], "y": [[-0.0, 0.0], [1.4431158784559095, 166.66666666666666], [-0.8437833740125396, 133.33333333333334], [0.0, 166.66666666666669]]}}}}, "offset": {"Cylinder": [3.725290298461914e-09, 0.5323800444602966, 0.4562000334262848], "Hammer": [0.0, 0.48292604088783264, 1.1140995025634766], "Trigger": [0.0, 0.12013805657625198, 0.7557680010795593]}}

src/main/resources/assets/hbm/models/weapons/hk69.obj

@@ -1,438 +0,0 @@
-# Blender v2.76 (sub 0) OBJ File: 'hk69.blend'
-# www.blender.org
-o Cube_Cube.001
-v -0.100000 0.100000 0.500000
-v -0.100000 0.200000 0.500000
-v -0.100000 0.000000 -0.500000
-v -0.100000 0.200000 -0.500000
-v 0.100000 0.100000 0.500000
-v 0.100000 0.200000 0.500000
-v 0.100000 0.000000 -0.500000
-v 0.100000 0.200000 -0.500000
-v -0.100000 0.000000 0.200000
-v 0.100000 0.000000 0.200000
-v 0.125000 0.000000 -0.500000
-v -0.125000 0.000000 -0.500000
-v 0.000000 0.450000 -0.500000
-v 0.000000 0.450000 1.000000
-v 0.129904 0.375000 -0.500000
-v 0.129904 0.375000 1.000000
-v 0.129904 0.225000 -0.500000
-v 0.129904 0.225000 1.000000
-v -0.000000 0.150000 -0.500000
-v -0.000000 0.150000 1.000000
-v -0.129904 0.225000 -0.500000
-v -0.129904 0.225000 1.000000
-v -0.129904 0.375000 -0.500000
-v -0.129904 0.375000 1.000000
-v 0.125000 0.150000 -0.500000
-v -0.125000 0.150000 -0.500000
-v 0.125000 0.450000 -0.500000
-v -0.125000 0.450000 -0.500000
-v -0.150000 0.250000 -0.500000
-v 0.150000 0.250000 -0.500000
-v -0.150000 0.400000 -0.500000
-v 0.150000 0.400000 -0.500000
-v 0.125000 0.000000 -0.650000
-v -0.125000 0.000000 -0.650000
-v 0.125000 0.150000 -0.650000
-v -0.125000 0.150000 -0.650000
-v 0.125000 0.450000 -0.650000
-v -0.125000 0.450000 -0.650000
-v -0.150000 0.250000 -0.650000
-v 0.150000 0.250000 -0.650000
-v -0.150000 0.400000 -0.650000
-v 0.150000 0.400000 -0.650000
-v -0.100000 0.000000 -0.650000
-v 0.100000 0.000000 -0.650000
-v -0.100000 0.400000 -0.650000
-v 0.100000 0.400000 -0.650000
-v -0.100000 0.350000 -0.710000
-v 0.100000 0.350000 -0.710000
-v -0.100000 0.200000 -0.710000
-v 0.100000 0.200000 -0.710000
-v -0.100000 0.400000 -1.000000
-v 0.100000 0.400000 -1.000000
-v -0.100000 -0.100000 -1.000000
-v 0.100000 -0.100000 -1.000000
-v -0.100000 0.300000 -1.100000
-v 0.100000 0.300000 -1.100000
-v -0.100000 0.000000 -1.100000
-v 0.100000 0.000000 -1.100000
-v 0.000000 0.200000 -1.000000
-v 0.000000 0.200000 -0.650000
-v 0.050000 0.150000 -1.000000
-v 0.050000 0.150000 -0.650000
-v -0.000000 0.100000 -1.000000
-v -0.000000 0.100000 -0.650000
-v -0.050000 0.150000 -1.000000
-v -0.050000 0.150000 -0.650000
-v -0.050000 0.400000 -0.785000
-v 0.050000 0.400000 -0.785000
-v -0.050000 0.350000 -0.785000
-v 0.050000 0.350000 -0.785000
-v -0.050000 0.325000 -0.710000
-v 0.050000 0.325000 -0.710000
-v -0.050000 0.275000 -0.710000
-v 0.050000 0.275000 -0.710000
-v -0.050000 0.000000 -0.575000
-v 0.050000 0.000000 -0.575000
-v -0.050000 0.000000 -0.425000
-v 0.050000 0.000000 -0.425000
-v -0.050000 -0.350000 -0.675000
-v 0.050000 -0.350000 -0.675000
-v -0.050000 -0.350000 -0.525000
-v 0.050000 -0.350000 -0.525000
-v -0.050000 0.400000 0.965000
-v 0.050000 0.400000 0.965000
-v -0.050000 0.400000 0.865000
-v 0.050000 0.400000 0.865000
-v 0.050000 0.550000 0.965000
-v -0.050000 0.550000 0.965000
-v 0.050000 0.550000 0.865000
-v -0.050000 0.550000 0.865000
-v -0.000000 0.500000 -0.585000
-v -0.000000 0.500000 -0.535000
-v 0.025000 0.450000 -0.585000
-v 0.025000 0.450000 -0.535000
-v -0.025000 0.450000 -0.585000
-v -0.025000 0.450000 -0.535000
-vt 0.760870 0.130435
-vt 0.456522 0.217391
-vt 0.326087 0.130435
-vt 0.108696 0.891304
-vt 0.239130 0.891304
-vt 0.239130 0.956522
-vt 0.326087 0.391304
-vt 0.456522 0.304348
-vt 0.760870 0.391304
-vt 0.760870 0.043478
-vt 0.217391 0.847826
-vt 0.130435 0.847826
-vt 0.130435 0.782609
-vt 0.007716 0.472674
-vt 0.007716 0.419018
-vt 0.100650 0.419018
-vt 0.217391 0.978261
-vt 0.130435 0.978261
-vt 0.108696 0.956522
-vt 0.369565 0.891304
-vt 0.260870 0.847826
-vt 0.347826 0.782609
-vt 0.347826 0.847826
-vt 0.826087 0.413043
-vt 0.826087 0.239130
-vt 0.847826 0.326087
-vt 0.934783 0.326087
-vt 0.956522 0.239130
-vt 0.956522 0.413043
-vt 0.000063 0.000063
-vt 0.086957 0.000000
-vt 0.086957 0.217391
-vt 0.130435 0.043478
-vt 0.130435 0.173913
-vt 0.260870 0.217391
-vt 0.217391 0.173913
-vt 0.217391 0.043478
-vt 0.869565 0.478261
-vt 0.869565 0.456522
-vt 0.913043 0.456522
-vt 0.869565 0.413043
-vt 0.913043 0.413043
-vt 0.913043 0.521739
-vt 0.869565 0.521739
-vt 0.826087 0.478261
-vt 0.826087 0.456522
-vt 0.956522 0.456522
-vt 0.956522 0.478261
-vt 0.869565 0.086957
-vt 0.804348 0.086957
-vt 0.804348 0.043478
-vt 0.760870 0.086957
-vt 0.804348 0.239130
-vt 0.869565 0.239130
-vt 0.913043 0.086957
-vt 0.978261 0.086957
-vt 0.978261 0.239130
-vt 0.913043 0.239130
-vt 0.065217 0.608696
-vt 0.108696 0.608696
-vt 0.108696 0.652174
-vt 0.065217 0.652174
-vt 0.108696 0.717391
-vt 0.065217 0.543478
-vt 0.000000 0.500000
-vt 0.021739 0.500000
-vt 0.021739 0.521739
-vt 0.021739 0.543478
-vt 0.000000 0.543478
-vt 0.043478 0.521739
-vt 0.347826 0.978261
-vt 0.260870 0.978261
-vt 0.369565 0.956522
-vt 0.326087 0.173913
-vt 0.760870 0.217391
-vt 0.760870 0.304348
-vt 0.326087 0.347826
-vt 0.326087 0.043478
-vt 0.217391 0.782609
-vt 0.100650 0.472674
-vt 0.054183 0.499502
-vt 0.054183 0.392190
-vt 0.260870 0.782609
-vt 0.847826 0.391304
-vt 0.934783 0.391304
-vt 0.000000 0.217391
-vt 0.260870 -0.000000
-vt 0.913043 0.478261
-vt 0.869565 0.043478
-vt 0.760870 0.239130
-vt 0.065217 0.717391
-vt 0.108696 0.543478
-vt 0.000000 0.521739
-vt 0.239130 0.217391
-vt 0.326087 0.217391
-vt 0.326087 0.304348
-vt 0.108696 0.586957
-vt 0.108696 0.521739
-vt 0.760870 0.521739
-vt 0.108696 0.456522
-vt 0.760870 0.456522
-vt 0.108696 0.391304
-vt 0.108696 0.782609
-vt 0.760870 0.717391
-vt 0.760870 0.586957
-vt 0.760870 0.652174
-vt 0.760870 0.434783
-vt 0.826087 0.434783
-vt 0.826087 0.543478
-vt 0.760870 0.413043
-vt 0.826087 0.347826
-vt 0.826087 0.304348
-vt 0.760870 0.347826
-vt 0.826087 0.739130
-vt 0.826087 0.847826
-vt 0.760870 0.847826
-vt 0.760870 0.673913
-vt 0.826087 0.673913
-vt 0.760870 0.630435
-vt 0.826087 0.630435
-vt 0.760870 0.565217
-vt 0.826087 0.565217
-vt 0.847826 0.413043
-vt 0.847826 0.239130
-vt 0.130435 0.217391
-vt 0.130435 0.000000
-vt 0.152174 0.304348
-vt -0.000000 0.304348
-vt -0.000000 0.260870
-vt 0.152174 0.260870
-vt -0.000000 0.347826
-vt -0.000000 0.391304
-vt 0.152174 0.347826
-vt 0.239130 0.304348
-vt 0.760870 0.782609
-vt 0.760870 0.543478
-vt 0.760870 0.739130
-vt 0.934783 0.413043
-vt 0.934783 0.239130
-vt 0.217391 0.217391
-vt 0.217391 -0.000000
-vt 0.152174 0.217391
-vt 0.152174 0.391304
-vn -1.000000 -0.000000 0.000000
-vn 0.000000 0.000000 1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 1.000000 0.000000
-vn 0.000000 0.000000 -1.000000
-vn 0.000000 -0.707100 -0.707100
-vn 0.000000 0.707100 0.707100
-vn 0.000000 -1.000000 0.000000
-vn 0.000000 -0.274700 0.961500
-vn 0.000000 0.274700 -0.961500
-vn 0.894400 0.447200 0.000000
-vn -0.894400 0.447200 0.000000
-vn -0.577300 0.577300 0.577300
-vn -0.596200 -0.469400 0.651300
-vn 0.596200 -0.469400 0.651300
-vn -0.707100 -0.707100 0.000000
-vn 0.707100 -0.707100 0.000000
-vn 0.672700 -0.730300 0.118500
-vn -0.672700 -0.730300 0.118500
-vn 0.000000 0.792400 0.610000
-vn 0.686200 0.396200 0.610000
-vn 0.866000 0.500000 0.000000
-vn 0.686200 -0.396200 0.610000
-vn 0.866000 -0.500000 0.000000
-vn 0.000000 -0.792400 0.610000
-vn -0.686200 -0.396200 0.610000
-vn -0.866000 -0.500000 0.000000
-vn -0.686200 0.396200 0.610000
-vn -0.866000 0.500000 0.000000
-vn 0.418300 0.676800 0.605700
-vn 0.418300 0.676800 -0.605700
-vn -0.418300 0.676800 -0.605700
-vn 0.732100 0.172800 0.658900
-vn 0.732100 0.172800 -0.658900
-vn 0.727100 -0.089500 -0.680600
-vn 0.672300 -0.082700 -0.735600
-vn 0.727100 -0.089500 0.680600
-vn 0.577300 -0.577300 -0.577300
-vn 0.672300 -0.082700 0.735600
-vn -0.577300 -0.577300 -0.577300
-vn 0.577300 -0.577300 0.577300
-vn -0.672300 -0.082700 0.735600
-vn -0.672300 -0.082700 -0.735600
-vn -0.727100 -0.089500 0.680600
-vn -0.727100 -0.089500 -0.680600
-vn -0.732100 0.172800 0.658900
-vn -0.732100 0.172800 -0.658900
-vn 0.487100 0.670900 -0.559100
-vn 0.622900 0.331800 -0.708400
-vn -0.622900 0.331800 -0.708400
-vn 0.675800 -0.107000 -0.729200
-vn -0.675800 -0.107000 -0.729200
-vn 0.182400 -0.282500 -0.941700
-vn 0.546900 0.773400 0.320400
-vn 0.630200 0.297100 -0.717300
-vn -0.630200 0.297100 -0.717300
-vn -0.630200 -0.297100 -0.717300
-vn 0.630200 -0.297100 -0.717300
-vn 0.546900 -0.773400 0.320400
-vn 0.577300 0.577300 0.577300
-vn -0.418300 0.676800 0.605700
-vn -0.577300 -0.577300 0.577300
-vn -0.487100 0.670900 -0.559100
-vn -0.182400 -0.282500 -0.941700
-vn -0.546900 0.773400 0.320400
-vn -0.546900 -0.773400 0.320400
-s off
-f 4/1/1 9/2/1 2/3/1
-f 29/4/2 30/5/2 32/6/2
-f 6/7/3 10/8/3 8/9/3
-f 8/10/4 4/1/4 2/3/4
-f 25/11/2 26/12/2 12/13/2
-f 26/12/2 25/11/2 30/5/2
-f 24/14/2 22/15/2 18/16/2
-f 27/17/2 28/18/2 31/19/2
-f 39/20/5 40/5/5 35/21/5
-f 34/22/5 36/23/5 35/21/5
-f 46/24/3 44/25/3 50/26/3
-f 49/27/1 43/28/1 45/29/1
-f 53/30/2 54/31/2 52/32/2
-f 58/33/3 56/34/3 52/32/3
-f 51/35/1 55/36/1 57/37/1
-f 68/38/5 70/39/5 69/40/5
-f 70/39/6 74/41/6 73/42/6
-f 71/43/7 72/44/7 68/38/7
-f 72/45/3 74/46/3 70/39/3
-f 69/40/1 73/47/1 71/48/1
-f 80/49/8 82/50/8 81/51/8
-f 81/52/9 82/50/9 78/53/9
-f 76/54/10 80/49/10 79/55/10
-f 81/56/1 77/57/1 75/58/1
-f 76/54/3 78/53/3 82/50/3
-f 87/59/4 89/60/4 90/61/4
-f 88/62/1 90/61/1 85/63/1
-f 89/60/3 87/59/3 84/64/3
-f 94/65/11 93/66/11 91/67/11
-f 91/67/12 95/68/12 96/69/12
-f 93/70/5 95/67/5 91/66/5
-f 94/70/2 92/68/2 96/67/2
-f 38/71/5 37/72/5 42/6/5
-f 41/73/5 42/6/5 40/5/5
-f 1/74/1 2/3/1 9/2/1
-f 4/1/1 3/75/1 9/2/1
-f 31/19/2 29/4/2 32/6/2
-f 7/76/3 8/9/3 10/8/3
-f 6/7/3 5/77/3 10/8/3
-f 6/78/4 8/10/4 2/3/4
-f 11/79/2 25/11/2 12/13/2
-f 29/4/2 26/12/2 30/5/2
-f 18/16/2 16/80/2 14/81/2
-f 14/81/2 24/14/2 18/16/2
-f 22/15/2 20/82/2 18/16/2
-f 32/6/2 27/17/2 31/19/2
-f 36/23/5 39/20/5 35/21/5
-f 33/83/5 34/22/5 35/21/5
-f 48/84/3 46/24/3 50/26/3
-f 47/85/1 49/27/1 45/29/1
-f 51/86/2 53/30/2 52/32/2
-f 54/31/3 58/33/3 52/32/3
-f 53/87/1 51/35/1 57/37/1
-f 67/88/5 68/38/5 69/40/5
-f 69/40/6 70/39/6 73/42/6
-f 67/88/7 71/43/7 68/38/7
-f 68/38/3 72/45/3 70/39/3
-f 67/88/1 69/40/1 71/48/1
-f 79/89/8 80/49/8 81/51/8
-f 77/90/9 81/52/9 78/53/9
-f 75/58/10 76/54/10 79/55/10
-f 79/55/1 81/56/1 75/58/1
-f 80/49/3 76/54/3 82/50/3
-f 88/62/4 87/59/4 90/61/4
-f 83/91/1 88/62/1 85/63/1
-f 86/92/3 89/60/3 84/64/3
-f 92/93/11 94/65/11 91/67/11
-f 92/93/12 91/67/12 96/69/12
-f 41/73/5 38/71/5 42/6/5
-f 39/20/5 41/73/5 40/5/5
-s 1
-f 2/94/13 1/95/14 5/96/15
-f 3/75/16 7/76/17 10/8/18
-f 9/2/19 10/8/18 5/96/15
-f 14/97/20 16/98/21 15/99/22
-f 16/98/21 18/100/23 17/101/24
-f 17/101/24 18/100/23 20/102/25
-f 20/103/25 22/63/26 21/104/27
-f 24/61/28 14/97/20 13/105/4
-f 22/63/26 24/61/28 23/106/29
-f 27/107/30 37/108/31 38/109/32
-f 32/110/33 42/24/34 37/108/31
-f 40/111/35 42/24/34 32/110/33
-f 35/112/36 40/111/35 30/113/37
-f 33/25/38 35/112/36 25/76/39
-f 34/114/40 33/115/38 11/116/41
-f 26/117/42 36/118/43 34/114/40
-f 29/119/44 39/120/45 36/118/43
-f 31/121/46 41/122/47 39/120/45
-f 38/109/32 41/122/47 31/121/46
-f 46/123/48 48/84/49 47/85/50
-f 48/84/49 50/26/51 49/27/52
-f 49/27/52 50/26/51 44/124/53
-f 52/125/54 56/34/55 55/36/56
-f 57/37/57 58/33/58 54/126/59
-f 56/34/55 58/33/58 57/37/57
-f 59/127/4 60/128/4 62/129/3
-f 61/130/3 62/129/3 64/86/8
-f 66/131/1 60/128/4 59/127/4
-f 64/132/8 66/131/1 65/133/1
-f 6/134/60 2/94/13 5/96/15
-f 9/2/19 3/75/16 10/8/18
-f 1/95/14 9/2/19 5/96/15
-f 13/105/4 14/97/20 15/99/22
-f 15/99/22 16/98/21 17/101/24
-f 19/9/8 17/101/24 20/102/25
-f 19/135/8 20/103/25 21/104/27
-f 23/106/29 24/61/28 13/105/4
-f 21/104/27 22/63/26 23/106/29
-f 28/136/61 27/107/30 38/109/32
-f 27/107/30 32/110/33 37/108/31
-f 30/113/37 40/111/35 32/110/33
-f 25/76/39 35/112/36 30/113/37
-f 11/90/41 33/25/38 25/76/39
-f 12/137/62 34/114/40 11/116/41
-f 12/137/62 26/117/42 34/114/40
-f 26/117/42 29/119/44 36/118/43
-f 29/119/44 31/121/46 39/120/45
-f 28/136/61 38/109/32 31/121/46
-f 45/138/63 46/123/48 47/85/50
-f 47/85/50 48/84/49 49/27/52
-f 43/139/64 49/27/52 44/124/53
-f 51/140/65 52/125/54 55/36/56
-f 53/141/66 57/37/57 54/126/59
-f 55/36/56 56/34/55 57/37/57
-f 61/130/3 59/127/4 62/129/3
-f 63/142/8 61/130/3 64/86/8
-f 65/133/1 66/131/1 59/127/4
-f 63/143/8 64/132/8 65/133/1