diff --git a/build.gradle b/build.gradle index 9ddd47335..7e2d8b839 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - maven { url = 'https://files.minecraftforge.net/maven' } + maven { url = 'https://maven.minecraftforge.net/' } maven { url = 'https://plugins.gradle.org/m2' } mavenCentral() } diff --git a/src/main/java/com/hbm/blocks/generic/BlockBobble.java b/src/main/java/com/hbm/blocks/generic/BlockBobble.java index 548f7c40a..6e4509dbd 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockBobble.java +++ b/src/main/java/com/hbm/blocks/generic/BlockBobble.java @@ -87,7 +87,7 @@ public class BlockBobble extends BlockContainer { @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < BobbleType.values().length; i++) + for(int i = 1; i < BobbleType.values().length; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/com/hbm/handler/BulletConfiguration.java b/src/main/java/com/hbm/handler/BulletConfiguration.java index 020f986e8..656119fa4 100644 --- a/src/main/java/com/hbm/handler/BulletConfiguration.java +++ b/src/main/java/com/hbm/handler/BulletConfiguration.java @@ -64,7 +64,8 @@ public class BulletConfiguration { //whether the bullet should stay alive after colliding with a block public boolean liveAfterImpact; - public boolean blackPowder = true; + //creates a "muzzle flash" and a ton of smoke with every projectile spawned + public boolean blackPowder = false; //bullet effects public List effects; diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index 6e70caf28..d22262d91 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -1483,7 +1483,7 @@ public class MachineRecipes { break; case DUCRETE: list.add(new ItemStack(Blocks.sand, 8)); - list.add(new ItemStack(ModItems.ingot_u238, 10)); + list.add(new ItemStack(ModItems.billet_u238, 2)); list.add(new ItemStack(Items.clay_ball, 4)); default: break; diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index c5c40e75d..db0f3e45b 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -345,6 +345,12 @@ public class Library { //not great either but certainly better public static long chargeItemsFromTE(ItemStack[] slots, int index, long power, long maxPower) { + + if(power < 0) + return 0; + + if(power > maxPower) + return maxPower; if(slots[index] != null && slots[index].getItem() instanceof IBatteryItem) { diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 91b2b8c76..3676cc342 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -349,7 +349,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.ducrete, 4), new Object[] { "DD", "DD", 'D', ModBlocks.ducrete_smooth }); addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete_smooth, 'C', Items.clay_ball, 'L', ModItems.plate_lead }); addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete, 'C', Items.clay_ball, 'L', ModItems.plate_lead }); - addRecipeAuto(new ItemStack(ModBlocks.reinforced_ducrete, 4), new Object[] {"DSD", "SUS", "DSD", 'D', ModBlocks.brick_ducrete, 'S', ModItems.plate_steel, 'U', ModItems.ingot_u238 }); + addRecipeAuto(new ItemStack(ModBlocks.reinforced_ducrete, 4), new Object[] {"DSD", "SUS", "DSD", 'D', ModBlocks.brick_ducrete, 'S', ModItems.plate_steel, 'U', U238.billet() }); addRecipeAuto(new ItemStack(ModBlocks.brick_obsidian, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian }); addRecipeAuto(new ItemStack(ModBlocks.meteor_polished, 4), new Object[] { "CC", "CC", 'C', ModBlocks.block_meteor_broken }); addRecipeAuto(new ItemStack(ModBlocks.meteor_pillar, 2), new Object[] { "C", "C", 'C', ModBlocks.meteor_polished }); diff --git a/src/main/java/com/hbm/render/tileentity/RenderBobble.java b/src/main/java/com/hbm/render/tileentity/RenderBobble.java index 5f08a9057..d43808a9f 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBobble.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBobble.java @@ -15,8 +15,6 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -45,6 +43,7 @@ public class RenderBobble extends TileEntitySpecialRenderer { public static final ResourceLocation bobble_uffr = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/uffr.png"); public static final ResourceLocation bobble_vaer = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/vaer.png"); public static final ResourceLocation bobble_nos = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/nos.png"); + public static final ResourceLocation bobble_drillgon = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/drillgon200.png"); public static final ResourceLocation bobble_cirno = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/cirno.png"); @Override @@ -94,12 +93,14 @@ public class RenderBobble extends TileEntitySpecialRenderer { case UFFR: bindTexture(bobble_uffr); break; case VAER: bindTexture(bobble_vaer); break; case NOS: bindTexture(bobble_nos); break; + case DRILLGON: bindTexture(bobble_drillgon); break; default: bindTexture(ResourceManager.universal); } switch(type) { - case PU238: renderPellet(type); break; - case UFFR: renderFumo(type); break; + case PU238: renderPellet(type); break; + case UFFR: renderFumo(type); break; + case DRILLGON: renderDrillgon(type); break; default: renderGuy(type); } @@ -354,6 +355,10 @@ public class RenderBobble extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } + + public void renderDrillgon(BobbleType type) { + bobble.renderPart("Drillgon"); + } private ModelUboinik shotgun = new ModelUboinik(); private ResourceLocation shot_tex = new ResourceLocation(RefStrings.MODID +":textures/models/ModelUboinik.png"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java index 6cdfc8bb6..3c35edc82 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java @@ -23,6 +23,8 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery { if(!worldObj.isRemote) { + this.transmitPower(); + power = Library.chargeTEFromItems(slots, 0, power, maxPower); power = Library.chargeItemsFromTE(slots, 1, power, maxPower); @@ -40,6 +42,12 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery { rotation -= 360; prevRotation -= 360; } + + for(int i = 1; i < this.log.length; i++) { + this.log[i - 1] = this.log[i]; + } + + this.log[19] = this.power; } } diff --git a/src/main/resources/assets/hbm/models/trinkets/bobble.obj b/src/main/resources/assets/hbm/models/trinkets/bobble.obj index 3ccc6bf0e..5a6183975 100644 --- a/src/main/resources/assets/hbm/models/trinkets/bobble.obj +++ b/src/main/resources/assets/hbm/models/trinkets/bobble.obj @@ -1,5 +1,695 @@ # Blender v2.79 (sub 0) OBJ File: 'bobble.blend' # www.blender.org +o Drillgon +v -0.250000 0.500000 0.437500 +v -0.250000 1.125000 0.437500 +v -0.250000 0.500000 -0.437500 +v -0.250000 1.125000 -0.437500 +v 0.250000 0.500000 0.437500 +v 0.250000 1.125000 0.437500 +v 0.250000 0.500000 -0.437500 +v 0.250000 1.125000 -0.437500 +v -0.250000 1.500000 0.312500 +v -0.250000 1.500000 -0.312500 +v 0.125000 1.500000 -0.312500 +v 0.125000 1.500000 0.312500 +v -0.250000 0.375000 -0.312500 +v -0.250000 0.375000 0.312500 +v 0.250000 0.375000 -0.312500 +v 0.250000 0.375000 0.312500 +v -0.088388 0.250000 0.213388 +v -0.088388 0.375000 0.213388 +v 0.088388 0.250000 0.036612 +v 0.088388 0.375000 0.036612 +v 0.265165 0.250000 0.566942 +v 0.265165 0.375000 0.566942 +v 0.441942 0.250000 0.390165 +v 0.441942 0.375000 0.390165 +v 0.088388 0.250000 -0.036612 +v 0.088388 0.375000 -0.036612 +v -0.088388 0.250000 -0.213388 +v -0.088388 0.375000 -0.213388 +v 0.441942 0.250000 -0.390165 +v 0.441942 0.375000 -0.390165 +v 0.265165 0.250000 -0.566942 +v 0.265165 0.375000 -0.566942 +v -0.250000 1.812500 0.312500 +v -0.250000 1.812500 -0.312500 +v 0.125000 1.812500 -0.312500 +v 0.125000 1.812500 0.312500 +v -0.125000 1.187500 0.562500 +v -0.125000 1.437500 0.562500 +v -0.125000 1.187500 0.312500 +v -0.125000 1.437500 0.312500 +v 0.125000 1.187500 0.562500 +v 0.125000 1.437500 0.562500 +v 0.125000 1.187500 0.312500 +v 0.125000 1.437500 0.312500 +v -0.125000 1.187500 -0.312500 +v -0.125000 1.437500 -0.312500 +v -0.125000 1.187500 -0.562500 +v -0.125000 1.437500 -0.562500 +v 0.125000 1.187500 -0.312500 +v 0.125000 1.437500 -0.312500 +v 0.125000 1.187500 -0.562500 +v 0.125000 1.437500 -0.562500 +v -0.062500 1.250000 0.562500 +v -0.062500 1.375000 0.562500 +v 0.062500 1.375000 0.562500 +v 0.062500 1.250000 0.562500 +v -0.125000 1.187500 0.750000 +v -0.125000 1.437500 0.750000 +v 0.125000 1.437500 0.750000 +v 0.125000 1.187500 0.750000 +v -0.062500 1.375000 -0.562500 +v -0.062500 1.250000 -0.562500 +v 0.062500 1.250000 -0.562500 +v 0.062500 1.375000 -0.562500 +v -0.125000 1.437500 -0.750000 +v -0.125000 1.187500 -0.750000 +v 0.125000 1.187500 -0.750000 +v 0.125000 1.437500 -0.750000 +v 0.125000 1.250000 0.062500 +v 0.125000 1.375000 0.062500 +v 0.125000 1.250000 -0.062500 +v 0.125000 1.375000 -0.062500 +v 0.250000 1.250000 0.062500 +v 0.250000 1.375000 0.062500 +v 0.250000 1.250000 -0.062500 +v 0.250000 1.375000 -0.062500 +v 0.062500 0.625000 0.437500 +v -0.062500 0.625000 -0.437500 +v 0.062500 0.625000 -0.437500 +v 0.062500 0.750000 -0.437500 +v -0.062500 0.750000 -0.437500 +v 0.062500 0.500000 -0.435000 +v 0.062500 0.687500 -0.500000 +v -0.062500 0.687500 -0.500000 +v 0.062500 0.625000 -0.435000 +v -0.062500 0.875000 -0.437500 +v 0.062500 0.875000 -0.437500 +v -0.062500 0.687500 -0.625000 +v 0.062500 0.687500 -0.625000 +v -0.062500 0.500000 -0.437500 +v 0.062500 0.500000 -0.437500 +v -0.062500 0.625000 0.437500 +v -0.062500 0.750000 0.437500 +v 0.062500 0.750000 0.437500 +v -0.062500 0.687500 0.500000 +v 0.062500 0.687500 0.500000 +v 0.062500 0.875000 0.437500 +v -0.062500 0.875000 0.437500 +v 0.062500 0.687500 0.625000 +v -0.062500 0.687500 0.625000 +v 0.062500 0.500000 0.437500 +v -0.062500 0.500000 0.437500 +vt 0.846154 0.540541 +vt 0.576923 0.270270 +vt 0.846154 0.270270 +vt 0.576923 0.540541 +vt 0.423077 0.270270 +vt 0.423077 0.540541 +vt 0.153846 0.270270 +vt 0.153846 0.540541 +vt 0.000000 0.270270 +vt 0.384615 0.216216 +vt 0.461538 0.702703 +vt 0.384615 0.702703 +vt 0.192308 0.837838 +vt 0.192308 0.702703 +vt 0.615385 0.702703 +vt 0.000000 0.540541 +vt 0.115385 0.702703 +vt 0.000000 0.702703 +vt 0.192308 0.000000 +vt 0.384615 0.000000 +vt 0.153846 0.216216 +vt 0.576923 0.216216 +vt 0.807692 0.216216 +vt 0.884615 0.270270 +vt 0.961538 0.324324 +vt 0.884615 0.324324 +vt 0.961538 0.270270 +vt 1.000000 0.054054 +vt 1.000000 0.270270 +vt 0.961538 0.054054 +vt 0.884615 0.000000 +vt 0.961538 0.000000 +vt 0.884615 0.054054 +vt 0.846154 0.270270 +vt 0.846154 0.054054 +vt 0.884615 0.270270 +vt 0.961538 0.324324 +vt 0.884615 0.324324 +vt 0.961538 0.270270 +vt 1.000000 0.054054 +vt 1.000000 0.270270 +vt 0.961538 0.054054 +vt 0.884615 0.000000 +vt 0.961538 0.000000 +vt 0.884615 0.054054 +vt 0.846154 0.270270 +vt 0.846154 0.054054 +vt 0.384615 1.000000 +vt 0.384615 0.837838 +vt 0.807692 0.702703 +vt 0.615385 0.837838 +vt 0.000000 0.837838 +vt 0.576923 0.702703 +vt 0.461538 0.837838 +vt 0.461538 0.108108 +vt 0.384615 -0.000000 +vt 0.461538 -0.000000 +vt 0.461538 -0.000000 +vt 0.480769 0.081081 +vt 0.461538 0.108108 +vt 0.384615 -0.000000 +vt 0.384615 0.108108 +vt 0.461538 -0.000000 +vt 0.480769 0.081081 +vt 0.461538 0.108108 +vt 0.384615 -0.000000 +vt 0.461538 0.108108 +vt 0.384615 0.108108 +vt 0.384615 -0.000000 +vt 0.384615 0.108108 +vt 0.384615 -0.000000 +vt 0.461538 0.108108 +vt 0.384615 0.108108 +vt 0.461538 -0.000000 +vt 0.480769 0.081081 +vt 0.461538 0.108108 +vt 0.384615 -0.000000 +vt 0.480769 0.027027 +vt 0.538462 0.108108 +vt 0.480769 0.081081 +vt 0.461538 0.108108 +vt 0.384615 -0.000000 +vt 0.461538 -0.000000 +vt 0.461538 0.108108 +vt 0.384615 0.000000 +vt 0.461538 -0.000000 +vt 0.461538 -0.000000 +vt 0.480769 0.081081 +vt 0.538462 0.108108 +vt 0.615385 -0.000000 +vt 0.615385 0.108108 +vt 0.480769 0.027027 +vt 0.480769 0.027027 +vt 0.538462 0.108108 +vt 0.480769 0.027027 +vt 0.538462 0.108108 +vt 0.480769 0.027027 +vt 0.538462 0.108108 +vt 0.480769 0.081081 +vt 0.480769 0.081081 +vt 0.461538 -0.000000 +vt 0.480769 0.081081 +vt 0.615385 -0.000000 +vt 0.615385 0.108108 +vt 0.480769 0.027027 +vt 0.538462 0.108108 +vt 0.480769 0.027027 +vt 0.538462 0.108108 +vt 0.480769 0.027027 +vt 0.538462 0.108108 +vt 0.192308 0.162162 +vt 0.153846 0.108108 +vt 0.192308 0.108108 +vt 0.153846 0.162162 +vt 0.115385 0.108108 +vt 0.115385 0.162162 +vt 0.076923 0.108108 +vt 0.115385 0.054054 +vt 0.153846 0.054054 +vt 0.153846 0.216216 +vt 0.961538 0.459459 +vt 0.923077 0.540541 +vt 0.923077 0.432432 +vt 1.000000 0.459459 +vt 0.961538 0.513514 +vt 1.000000 0.351351 +vt 0.961538 0.405405 +vt 0.961538 0.351351 +vt 0.884615 0.540541 +vt 0.884615 0.432432 +vt 0.923077 0.324324 +vt 0.846154 0.459459 +vt 0.846154 0.405405 +vt 0.884615 0.324324 +vt 0.961538 0.459459 +vt 0.923077 0.540541 +vt 0.923077 0.432432 +vt 1.000000 0.459459 +vt 0.961538 0.513514 +vt 1.000000 0.351351 +vt 0.961538 0.405405 +vt 0.961538 0.351351 +vt 0.884615 0.432432 +vt 0.923077 0.324324 +vt 0.884615 0.540541 +vt 0.846154 0.459459 +vt 0.846154 0.405405 +vt 0.884615 0.324324 +vt 0.192308 0.216216 +vt -0.000000 0.216216 +vt 0.423077 0.216216 +vt 0.615385 0.216216 +vt 0.192308 1.000000 +vt 0.807692 0.837838 +vt 0.115385 0.837838 +vt 0.576923 0.837838 +vt 0.384615 0.108108 +vt 0.384615 0.108108 +vt 0.538462 -0.000000 +vt 0.384615 0.108108 +vt 0.384615 0.108108 +vt 0.538462 -0.000000 +vt 0.538462 -0.000000 +vt 0.538462 -0.000000 +vt 0.538462 -0.000000 +vt 0.538462 -0.000000 +vt 0.538462 -0.000000 +vt 0.538462 -0.000000 +vt 0.076923 0.162162 +vt 0.115385 0.216216 +vt 1.000000 0.513514 +vt 1.000000 0.405405 +vt 0.846154 0.513514 +vt 0.846154 0.351351 +vt 1.000000 0.513514 +vt 1.000000 0.405405 +vt 0.846154 0.513514 +vt 0.846154 0.351351 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.3162 -0.9487 +vn 0.9487 0.3162 0.0000 +vn 0.0000 0.3162 0.9487 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 -0.7071 0.7071 +vn 0.0000 -0.7071 -0.7071 +vn -0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 0.7071 +vn -0.7071 0.0000 0.7071 +vn 0.0000 1.0000 -0.0000 +vn -0.9487 0.0000 -0.3162 +vn 0.0000 0.9487 -0.3162 +vn 0.9487 0.0000 -0.3162 +vn 0.0000 -0.9487 -0.3162 +vn 0.0000 0.9487 0.3162 +vn -0.9487 0.0000 0.3162 +vn 0.9487 0.0000 0.3162 +vn 0.0000 -0.9487 0.3162 +vn 0.0000 0.7071 0.7071 +vn 0.0000 0.7071 -0.7071 +s off +f 2/1/1 3/2/1 1/3/1 +f 4/4/2 7/5/2 3/2/2 +f 8/6/3 5/7/3 7/5/3 +f 6/8/4 1/9/4 5/7/4 +f 5/7/3 15/10/3 7/5/3 +f 4/4/5 11/11/5 8/6/5 +f 11/12/3 36/13/3 12/14/3 +f 8/6/6 12/14/6 6/8/6 +f 2/1/1 10/15/1 4/4/1 +f 2/16/7 12/17/7 9/18/7 +f 15/10/8 14/19/8 13/20/8 +f 1/9/9 16/21/9 5/7/9 +f 7/5/10 13/22/10 3/2/10 +f 3/2/1 14/23/1 1/3/1 +f 18/24/11 19/25/11 17/26/11 +f 20/27/12 23/28/12 19/29/12 +f 24/30/13 21/31/13 23/32/13 +f 22/33/14 17/34/14 21/35/14 +f 20/27/15 22/33/15 24/30/15 +f 26/36/14 27/37/14 25/38/14 +f 28/39/11 31/40/11 27/41/11 +f 32/42/12 29/43/12 31/44/12 +f 30/45/13 25/46/13 29/47/13 +f 28/39/15 30/45/15 32/42/15 +f 34/48/15 36/13/15 35/49/15 +f 9/50/1 34/51/1 10/15/1 +f 12/17/4 33/52/4 9/18/4 +f 10/53/2 35/54/2 11/11/2 +f 38/55/1 39/56/1 37/57/1 +f 42/58/4 56/59/4 41/60/4 +f 44/61/3 41/60/3 43/62/3 +f 38/63/4 55/64/4 42/65/4 +f 43/66/8 37/67/8 39/68/8 +f 40/69/15 42/65/15 44/70/15 +f 46/71/1 47/72/1 45/73/1 +f 51/74/2 64/75/2 52/76/2 +f 52/76/3 49/77/3 51/74/3 +f 53/78/16 58/79/16 54/80/16 +f 51/81/8 45/82/8 47/83/8 +f 48/84/15 50/85/15 52/86/15 +f 37/57/4 54/80/4 38/55/4 +f 41/87/4 53/88/4 37/67/4 +f 59/89/4 57/90/4 60/91/4 +f 54/92/17 59/89/17 55/64/17 +f 55/93/18 60/94/18 56/59/18 +f 56/95/19 57/96/19 53/88/19 +f 64/97/20 65/98/20 61/99/20 +f 47/83/2 63/100/2 51/81/2 +f 52/86/2 61/99/2 48/84/2 +f 48/101/2 62/102/2 47/72/2 +f 65/98/2 67/103/2 66/104/2 +f 61/105/21 66/106/21 62/102/21 +f 63/107/22 68/108/22 64/75/22 +f 62/109/23 67/110/23 63/100/23 +f 72/111/2 75/112/2 71/113/2 +f 76/114/3 73/115/3 75/112/3 +f 74/116/4 69/117/4 73/115/4 +f 75/112/8 69/118/8 71/119/8 +f 72/120/15 74/116/15 76/114/15 +f 84/121/1 86/122/1 88/123/1 +f 83/124/9 81/125/9 84/121/9 +f 79/126/24 84/127/24 78/128/24 +f 87/129/25 88/123/25 86/122/25 +f 89/130/10 90/131/10 88/123/10 +f 87/129/3 83/132/3 89/130/3 +f 90/131/1 84/127/1 88/123/1 +f 83/133/3 91/134/3 89/130/3 +f 96/135/3 97/136/3 99/137/3 +f 95/138/10 94/139/10 96/135/10 +f 92/140/25 96/141/25 77/142/25 +f 97/136/24 100/143/24 99/137/24 +f 100/143/9 101/144/9 99/137/9 +f 98/145/1 95/146/1 100/143/1 +f 101/144/3 96/141/3 99/137/3 +f 95/147/1 102/148/1 100/143/1 +f 2/1/1 4/4/1 3/2/1 +f 4/4/2 8/6/2 7/5/2 +f 8/6/3 6/8/3 5/7/3 +f 6/8/4 2/16/4 1/9/4 +f 5/7/3 16/149/3 15/10/3 +f 4/4/5 10/53/5 11/11/5 +f 11/12/3 35/49/3 36/13/3 +f 8/6/6 11/12/6 12/14/6 +f 2/1/1 9/50/1 10/15/1 +f 2/16/7 6/8/7 12/17/7 +f 15/10/8 16/149/8 14/19/8 +f 1/9/9 14/150/9 16/21/9 +f 7/5/10 15/151/10 13/22/10 +f 3/2/1 13/152/1 14/23/1 +f 18/24/11 20/27/11 19/25/11 +f 20/27/12 24/30/12 23/28/12 +f 24/30/13 22/33/13 21/31/13 +f 22/33/14 18/24/14 17/34/14 +f 20/27/15 18/24/15 22/33/15 +f 26/36/14 28/39/14 27/37/14 +f 28/39/11 32/42/11 31/40/11 +f 32/42/12 30/45/12 29/43/12 +f 30/45/13 26/36/13 25/46/13 +f 28/39/15 26/36/15 30/45/15 +f 34/48/15 33/153/15 36/13/15 +f 9/50/1 33/154/1 34/51/1 +f 12/17/4 36/155/4 33/52/4 +f 10/53/2 34/156/2 35/54/2 +f 38/55/1 40/157/1 39/56/1 +f 42/58/4 55/93/4 56/59/4 +f 44/61/3 42/58/3 41/60/3 +f 38/63/4 54/92/4 55/64/4 +f 43/66/8 41/87/8 37/67/8 +f 40/69/15 38/63/15 42/65/15 +f 46/71/1 48/101/1 47/72/1 +f 51/74/2 63/107/2 64/75/2 +f 52/76/3 50/158/3 49/77/3 +f 53/78/16 57/159/16 58/79/16 +f 51/81/8 49/160/8 45/82/8 +f 48/84/15 46/161/15 50/85/15 +f 37/57/4 53/78/4 54/80/4 +f 41/87/4 56/95/4 53/88/4 +f 59/89/4 58/162/4 57/90/4 +f 54/92/17 58/162/17 59/89/17 +f 55/93/18 59/163/18 60/94/18 +f 56/95/19 60/164/19 57/96/19 +f 64/97/20 68/165/20 65/98/20 +f 47/83/2 62/109/2 63/100/2 +f 52/86/2 64/97/2 61/99/2 +f 48/101/2 61/105/2 62/102/2 +f 65/98/2 68/165/2 67/103/2 +f 61/105/21 65/166/21 66/106/21 +f 63/107/22 67/167/22 68/108/22 +f 62/109/23 66/168/23 67/110/23 +f 72/111/2 76/114/2 75/112/2 +f 76/114/3 74/116/3 73/115/3 +f 74/116/4 70/169/4 69/117/4 +f 75/112/8 73/115/8 69/118/8 +f 72/120/15 70/170/15 74/116/15 +f 84/121/1 81/125/1 86/122/1 +f 83/124/9 80/171/9 81/125/9 +f 79/126/24 83/172/24 84/127/24 +f 87/129/25 89/130/25 88/123/25 +f 89/130/10 91/134/10 90/131/10 +f 87/129/3 80/173/3 83/132/3 +f 90/131/1 78/128/1 84/127/1 +f 83/133/3 79/174/3 91/134/3 +f 96/135/3 94/139/3 97/136/3 +f 95/138/10 93/175/10 94/139/10 +f 92/140/25 95/176/25 96/141/25 +f 97/136/24 98/145/24 100/143/24 +f 100/143/9 102/148/9 101/144/9 +f 98/145/1 93/177/1 95/146/1 +f 101/144/3 77/142/3 96/141/3 +f 95/147/1 92/178/1 102/148/1 +l 82 85 +o Cube +v 0.045753 0.237741 0.312500 +v 0.045753 0.737741 0.312500 +v 0.045753 0.237741 0.062500 +v 0.045753 0.737741 0.062500 +v 0.295753 0.237741 0.312500 +v 0.295753 0.737741 0.312500 +v 0.295753 0.237741 0.062500 +v 0.295753 0.737741 0.062500 +v -0.291506 0.316987 -0.062500 +v -0.041506 0.750000 -0.062500 +v -0.291506 0.316987 -0.312500 +v -0.041506 0.750000 -0.312500 +v -0.075000 0.191987 -0.062500 +v 0.175000 0.625000 -0.062500 +v -0.075000 0.191987 -0.312500 +v 0.175000 0.625000 -0.312500 +v 0.079247 0.612741 0.312500 +v -0.170753 1.045753 0.312500 +v 0.079247 0.612741 0.062500 +v -0.170753 1.045753 0.062500 +v 0.295753 0.737741 0.312500 +v 0.045753 1.170753 0.312500 +v 0.295753 0.737741 0.062500 +v 0.045753 1.170753 0.062500 +v -0.075000 0.625000 -0.062500 +v -0.075000 1.125000 -0.062500 +v -0.075000 0.625000 -0.312500 +v -0.075000 1.125000 -0.312500 +v 0.175000 0.625000 -0.062500 +v 0.175000 1.125000 -0.062500 +v 0.175000 0.625000 -0.312500 +v 0.175000 1.125000 -0.312500 +v -0.125000 1.000000 0.250000 +v 0.125000 1.000000 0.250000 +v -0.125000 1.000000 -0.250000 +v 0.125000 1.000000 -0.250000 +v -0.125000 1.250000 -0.250000 +v -0.125000 1.250000 0.250000 +v 0.125000 1.250000 0.250000 +v 0.125000 1.250000 -0.250000 +v -0.187500 1.250000 0.375000 +v 0.187500 1.250000 0.375000 +v -0.187500 1.250000 -0.375000 +v 0.187500 1.250000 -0.375000 +v -0.187500 1.750000 -0.375000 +v -0.187500 1.750000 0.375000 +v 0.187500 1.750000 0.375000 +v 0.187500 1.750000 -0.375000 +v 0.232576 1.266670 -0.066987 +v 0.041065 1.427367 -0.500000 +v 0.398429 1.127502 -0.191987 +v 0.206918 1.288199 -0.625000 +v 0.393273 1.458181 -0.066987 +v 0.201762 1.618878 -0.500000 +v 0.559126 1.319013 -0.191987 +v 0.367615 1.479710 -0.625000 +v 0.206918 1.288199 -0.375000 +v -0.176104 1.609593 -0.375000 +v 0.206918 1.288199 -0.625000 +v -0.176104 1.609593 -0.625000 +v 0.367615 1.479710 -0.375000 +v -0.015407 1.801104 -0.375000 +v 0.367615 1.479710 -0.625000 +v -0.015407 1.801104 -0.625000 +v 0.125000 1.871693 0.950891 +v 0.125000 1.438680 0.700891 +v 0.125000 1.996693 0.734384 +v 0.125000 1.563680 0.484384 +v -0.125000 1.871693 0.950891 +v -0.125000 1.438680 0.700891 +v -0.125000 1.996693 0.734384 +v -0.125000 1.563680 0.484384 +v 0.125000 1.438680 0.700891 +v 0.125000 1.525504 0.208487 +v 0.125000 1.684882 0.744303 +v 0.125000 1.771706 0.251899 +v -0.125000 1.438680 0.700891 +v -0.125000 1.525504 0.208487 +v -0.125000 1.684882 0.744303 +v -0.125000 1.771706 0.251899 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn -0.8660 0.5000 0.0000 +vn 0.8660 -0.5000 0.0000 +vn -0.5000 -0.8660 0.0000 +vn 0.5000 0.8660 0.0000 +vn -0.8660 -0.5000 0.0000 +vn 0.8660 0.5000 0.0000 +vn 0.5000 -0.8660 0.0000 +vn -0.5000 0.8660 0.0000 +vn -0.6428 -0.7660 0.0000 +vn 0.6634 -0.5567 -0.5000 +vn 0.6428 0.7660 -0.0000 +vn -0.6634 0.5567 0.5000 +vn 0.3830 -0.3214 0.8660 +vn -0.3830 0.3214 -0.8660 +vn 0.7660 -0.6428 0.0000 +vn -0.7660 0.6428 0.0000 +vn 0.0000 0.5000 -0.8660 +vn 0.0000 -0.5000 0.8660 +vn 0.0000 0.8660 0.5000 +vn 0.0000 -0.8660 -0.5000 +vn 0.0000 0.9848 0.1736 +vn 0.0000 -0.9848 -0.1736 +vn 0.0000 -0.1736 0.9848 +vn 0.0000 0.1736 -0.9848 +s off +f 104//26 105//26 103//26 +f 106//27 109//27 105//27 +f 110//28 107//28 109//28 +f 108//29 103//29 107//29 +f 109//30 103//30 105//30 +f 106//31 108//31 110//31 +f 112//32 113//32 111//32 +f 113//27 118//27 117//27 +f 118//33 115//33 117//33 +f 116//29 111//29 115//29 +f 117//34 111//34 113//34 +f 114//35 116//35 118//35 +f 120//36 121//36 119//36 +f 122//27 125//27 121//27 +f 126//37 123//37 125//37 +f 123//29 120//29 119//29 +f 125//38 119//38 121//38 +f 122//39 124//39 126//39 +f 128//26 129//26 127//26 +f 130//27 133//27 129//27 +f 134//28 131//28 133//28 +f 132//29 127//29 131//29 +f 133//30 127//30 129//30 +f 130//31 132//31 134//31 +f 137//30 136//30 135//30 +f 141//31 139//31 140//31 +f 137//27 142//27 138//27 +f 136//29 140//29 135//29 +f 138//28 141//28 136//28 +f 135//26 139//26 137//26 +f 145//30 144//30 143//30 +f 149//31 147//31 148//31 +f 146//28 149//28 144//28 +f 143//26 147//26 145//26 +f 145//27 150//27 146//27 +f 144//29 148//29 143//29 +f 152//40 153//40 151//40 +f 154//41 157//41 153//41 +f 157//42 156//42 155//42 +f 156//43 151//43 155//43 +f 153//44 155//44 151//44 +f 154//45 156//45 158//45 +f 160//40 161//40 159//40 +f 162//27 165//27 161//27 +f 166//42 163//42 165//42 +f 163//29 160//29 159//29 +f 165//46 159//46 161//46 +f 162//47 164//47 166//47 +f 168//28 169//28 167//28 +f 170//48 173//48 169//48 +f 174//26 171//26 173//26 +f 172//49 167//49 171//49 +f 173//50 167//50 169//50 +f 170//51 172//51 174//51 +f 176//28 177//28 175//28 +f 178//52 181//52 177//52 +f 181//26 180//26 179//26 +f 180//53 175//53 179//53 +f 181//54 175//54 177//54 +f 178//55 180//55 182//55 +f 104//26 106//26 105//26 +f 106//27 110//27 109//27 +f 110//28 108//28 107//28 +f 108//29 104//29 103//29 +f 109//30 107//30 103//30 +f 106//31 104//31 108//31 +f 112//32 114//32 113//32 +f 113//27 114//27 118//27 +f 118//33 116//33 115//33 +f 116//29 112//29 111//29 +f 117//34 115//34 111//34 +f 114//35 112//35 116//35 +f 120//36 122//36 121//36 +f 122//27 126//27 125//27 +f 126//37 124//37 123//37 +f 123//29 124//29 120//29 +f 125//38 123//38 119//38 +f 122//39 120//39 124//39 +f 128//26 130//26 129//26 +f 130//27 134//27 133//27 +f 134//28 132//28 131//28 +f 132//29 128//29 127//29 +f 133//30 131//30 127//30 +f 130//31 128//31 132//31 +f 137//30 138//30 136//30 +f 141//31 142//31 139//31 +f 137//27 139//27 142//27 +f 136//29 141//29 140//29 +f 138//28 142//28 141//28 +f 135//26 140//26 139//26 +f 145//30 146//30 144//30 +f 149//31 150//31 147//31 +f 146//28 150//28 149//28 +f 143//26 148//26 147//26 +f 145//27 147//27 150//27 +f 144//29 149//29 148//29 +f 152//40 154//40 153//40 +f 154//41 158//41 157//41 +f 157//42 158//42 156//42 +f 156//43 152//43 151//43 +f 153//44 157//44 155//44 +f 154//45 152//45 156//45 +f 160//40 162//40 161//40 +f 162//27 166//27 165//27 +f 166//42 164//42 163//42 +f 163//29 164//29 160//29 +f 165//46 163//46 159//46 +f 162//47 160//47 164//47 +f 168//28 170//28 169//28 +f 170//48 174//48 173//48 +f 174//26 172//26 171//26 +f 172//49 168//49 167//49 +f 173//50 171//50 167//50 +f 170//51 168//51 172//51 +f 176//28 178//28 177//28 +f 178//52 182//52 181//52 +f 181//26 182//26 180//26 +f 180//53 176//53 175//53 +f 181//54 179//54 175//54 +f 178//55 176//55 180//55 o FumoHead v -0.250000 0.750000 -0.250000 v -0.250000 0.750000 0.250000 @@ -150,74 +840,74 @@ vn 0.7071 0.0000 0.7071 vn 0.8944 0.0000 0.4472 vn 0.8944 0.0000 -0.4472 s off -f 1/1/1 3/2/1 2/3/1 -f 7/4/2 5/5/2 6/6/2 -f 1/7/3 8/8/3 4/9/3 -f 3/10/4 6/11/4 2/12/4 -f 4/9/5 7/4/5 3/10/5 -f 2/13/6 5/14/6 1/7/6 -f 9/15/1 11/16/1 10/17/1 -f 15/18/2 13/19/2 14/20/2 -f 9/21/3 16/22/3 12/23/3 -f 11/24/4 14/25/4 10/26/4 -f 12/23/5 15/18/5 11/24/5 -f 10/27/6 13/28/6 9/21/6 -f 21/29/1 20/30/1 17/31/1 -f 24/32/1 18/33/1 19/34/1 -f 26/35/1 19/36/1 20/37/1 -f 28/38/1 17/39/1 18/40/1 -f 18/40/1 23/41/1 28/38/1 -f 19/34/1 25/42/1 24/32/1 -f 20/37/1 22/43/1 26/35/1 -f 17/31/1 27/44/1 21/29/1 -f 31/45/2 34/46/2 32/47/2 -f 29/48/2 36/49/2 30/50/2 -f 30/51/2 38/52/2 31/53/2 -f 32/54/2 40/55/2 29/56/2 -f 29/56/2 40/55/2 35/57/2 -f 30/50/2 36/49/2 37/58/2 -f 31/53/2 38/52/2 33/59/2 -f 32/47/2 34/46/2 39/60/2 -f 24/32/4 35/61/4 23/62/4 -f 21/29/3 33/63/3 22/64/3 -f 22/65/7 38/52/7 26/35/7 -f 27/66/8 34/46/8 21/29/8 -f 23/67/9 40/55/9 28/38/9 -f 28/38/6 39/68/6 27/69/6 -f 26/35/5 37/70/5 25/71/5 -f 25/72/10 36/49/10 24/32/10 -f 46/73/11 48/74/11 45/75/11 -f 42/76/12 44/77/12 41/78/12 -f 1/1/1 4/79/1 3/2/1 -f 7/4/2 8/8/2 5/5/2 -f 1/7/3 5/14/3 8/8/3 -f 3/10/4 7/4/4 6/11/4 -f 4/9/5 8/8/5 7/4/5 -f 2/13/6 6/80/6 5/14/6 -f 9/15/1 12/81/1 11/16/1 -f 15/18/2 16/22/2 13/19/2 -f 9/21/3 13/28/3 16/22/3 -f 11/24/4 15/18/4 14/25/4 -f 12/23/5 16/22/5 15/18/5 -f 10/27/6 14/82/6 13/28/6 -f 21/29/1 22/64/1 20/30/1 -f 24/32/1 23/62/1 18/33/1 -f 26/35/1 25/71/1 19/36/1 -f 28/38/1 27/69/1 17/39/1 -f 31/45/2 33/63/2 34/46/2 -f 29/48/2 35/61/2 36/49/2 -f 30/51/2 37/70/2 38/52/2 -f 32/54/2 39/68/2 40/55/2 -f 24/32/4 36/49/4 35/61/4 -f 21/29/3 34/46/3 33/63/3 -f 22/65/7 33/83/7 38/52/7 -f 27/66/8 39/84/8 34/46/8 -f 23/67/9 35/85/9 40/55/9 -f 28/38/6 40/55/6 39/68/6 -f 26/35/5 38/52/5 37/70/5 -f 25/72/10 37/86/10 36/49/10 -f 46/73/11 47/87/11 48/74/11 -f 42/76/12 43/88/12 44/77/12 +f 183/179/56 185/180/56 184/181/56 +f 189/182/57 187/183/57 188/184/57 +f 183/185/58 190/186/58 186/187/58 +f 185/188/59 188/189/59 184/190/59 +f 186/187/60 189/182/60 185/188/60 +f 184/191/61 187/192/61 183/185/61 +f 191/193/56 193/194/56 192/195/56 +f 197/196/57 195/197/57 196/198/57 +f 191/199/58 198/200/58 194/201/58 +f 193/202/59 196/203/59 192/204/59 +f 194/201/60 197/196/60 193/202/60 +f 192/205/61 195/206/61 191/199/61 +f 203/207/56 202/208/56 199/209/56 +f 206/210/56 200/211/56 201/212/56 +f 208/213/56 201/214/56 202/215/56 +f 210/216/56 199/217/56 200/218/56 +f 200/218/56 205/219/56 210/216/56 +f 201/212/56 207/220/56 206/210/56 +f 202/215/56 204/221/56 208/213/56 +f 199/209/56 209/222/56 203/207/56 +f 213/223/57 216/224/57 214/225/57 +f 211/226/57 218/227/57 212/228/57 +f 212/229/57 220/230/57 213/231/57 +f 214/232/57 222/233/57 211/234/57 +f 211/234/57 222/233/57 217/235/57 +f 212/228/57 218/227/57 219/236/57 +f 213/231/57 220/230/57 215/237/57 +f 214/225/57 216/224/57 221/238/57 +f 206/210/59 217/239/59 205/240/59 +f 203/207/58 215/241/58 204/242/58 +f 204/243/62 220/230/62 208/213/62 +f 209/244/63 216/224/63 203/207/63 +f 205/245/64 222/233/64 210/216/64 +f 210/216/61 221/246/61 209/247/61 +f 208/213/60 219/248/60 207/249/60 +f 207/250/65 218/227/65 206/210/65 +f 228/251/66 230/252/66 227/253/66 +f 224/254/67 226/255/67 223/256/67 +f 183/179/56 186/257/56 185/180/56 +f 189/182/57 190/186/57 187/183/57 +f 183/185/58 187/192/58 190/186/58 +f 185/188/59 189/182/59 188/189/59 +f 186/187/60 190/186/60 189/182/60 +f 184/191/61 188/258/61 187/192/61 +f 191/193/56 194/259/56 193/194/56 +f 197/196/57 198/200/57 195/197/57 +f 191/199/58 195/206/58 198/200/58 +f 193/202/59 197/196/59 196/203/59 +f 194/201/60 198/200/60 197/196/60 +f 192/205/61 196/260/61 195/206/61 +f 203/207/56 204/242/56 202/208/56 +f 206/210/56 205/240/56 200/211/56 +f 208/213/56 207/249/56 201/214/56 +f 210/216/56 209/247/56 199/217/56 +f 213/223/57 215/241/57 216/224/57 +f 211/226/57 217/239/57 218/227/57 +f 212/229/57 219/248/57 220/230/57 +f 214/232/57 221/246/57 222/233/57 +f 206/210/59 218/227/59 217/239/59 +f 203/207/58 216/224/58 215/241/58 +f 204/243/62 215/261/62 220/230/62 +f 209/244/63 221/262/63 216/224/63 +f 205/245/64 217/263/64 222/233/64 +f 210/216/61 222/233/61 221/246/61 +f 208/213/60 220/230/60 219/248/60 +f 207/250/65 219/264/65 218/227/65 +f 228/251/66 229/265/66 230/252/66 +f 224/254/67 225/266/67 226/255/67 o Fumo v -0.390165 0.375000 -0.213388 v -0.213388 0.375000 -0.390165 @@ -554,122 +1244,122 @@ vn 0.0000 0.9659 -0.2588 vn 0.0000 -0.9659 0.2588 vn 0.0000 -0.2588 -0.9659 s off -f 154/89/13 160/90/13 156/91/13 -f 154/92/14 155/93/14 153/94/14 -f 77/95/15 59/96/15 60/97/15 -f 151/98/16 149/99/16 150/100/16 -f 146/101/17 151/102/17 145/103/17 -f 58/104/18 59/105/18 57/106/18 -f 78/107/19 57/108/19 59/96/19 -f 54/109/20 55/110/20 56/111/20 -f 64/112/21 61/113/21 63/114/21 -f 80/115/22 60/97/22 58/104/22 -f 79/116/23 58/104/23 57/117/23 -f 67/118/19 66/119/19 65/120/19 -f 71/121/22 69/122/22 70/123/22 -f 68/124/13 71/121/13 66/125/13 -f 65/126/24 69/127/24 67/128/24 -f 67/128/25 72/129/25 68/124/25 -f 66/125/26 70/130/26 65/131/26 -f 73/132/27 76/133/27 74/134/27 -f 77/135/28 79/136/28 78/137/28 -f 89/138/29 92/139/29 90/140/29 -f 86/141/30 87/142/30 88/143/30 -f 146/101/22 149/144/22 152/145/22 -f 147/146/19 151/147/19 150/148/19 -f 93/149/31 96/150/31 94/151/31 -f 97/152/32 100/153/32 98/154/32 -f 102/155/33 103/156/33 104/157/33 -f 107/158/34 106/159/34 105/160/34 -f 49/161/35 52/162/35 51/163/35 -f 131/164/36 130/165/36 132/166/36 -f 116/167/13 106/168/13 108/169/13 -f 113/170/37 108/169/37 107/158/37 -f 115/171/38 105/172/38 106/168/38 -f 115/173/39 113/174/39 114/175/39 -f 81/176/40 84/177/40 83/178/40 -f 133/179/41 136/180/41 135/181/41 -f 112/182/42 109/183/42 110/184/42 -f 114/185/24 107/158/24 105/186/24 -f 117/187/43 120/188/43 119/189/43 -f 123/190/34 122/191/34 121/192/34 -f 124/193/13 127/194/13 122/195/13 -f 125/196/37 124/193/37 123/190/37 -f 127/194/38 121/197/38 122/195/38 -f 127/198/39 125/199/39 126/200/39 -f 126/201/24 123/190/24 121/202/24 -f 147/203/44 146/101/44 145/204/44 -f 147/146/45 149/144/45 148/205/45 -f 144/206/46 141/207/46 142/208/46 -f 140/209/47 137/210/47 138/211/47 -f 156/91/48 157/212/48 155/93/48 -f 153/213/49 159/214/49 154/89/49 -f 157/215/50 159/216/50 158/217/50 -f 153/218/24 157/212/24 158/219/24 -f 162/220/14 163/221/14 161/222/14 -f 164/223/13 167/224/13 168/225/13 -f 164/223/48 165/226/48 163/221/48 -f 161/227/49 167/224/49 162/228/49 -f 165/229/50 167/230/50 166/231/50 -f 163/221/24 166/232/24 161/233/24 -f 154/89/13 159/214/13 160/90/13 -f 154/92/14 156/91/14 155/93/14 -f 77/95/15 78/107/15 59/96/15 -f 151/98/16 152/234/16 149/99/16 -f 146/101/17 152/145/17 151/102/17 -f 58/104/18 60/97/18 59/105/18 -f 78/107/19 79/235/19 57/108/19 -f 54/109/20 53/236/20 55/110/20 -f 64/112/21 62/237/21 61/113/21 -f 80/115/22 77/95/22 60/97/22 -f 79/116/23 80/115/23 58/104/23 -f 67/118/19 68/238/19 66/119/19 -f 71/121/22 72/129/22 69/122/22 -f 68/124/13 72/129/13 71/121/13 -f 65/126/24 70/239/24 69/127/24 -f 67/128/25 69/127/25 72/129/25 -f 66/125/26 71/121/26 70/130/26 -f 73/132/27 75/240/27 76/133/27 -f 77/135/28 80/241/28 79/136/28 -f 89/138/29 91/242/29 92/139/29 -f 86/141/30 85/243/30 87/142/30 -f 146/101/22 148/205/22 149/144/22 -f 147/146/19 145/244/19 151/147/19 -f 93/149/31 95/245/31 96/150/31 -f 97/152/32 99/246/32 100/153/32 -f 102/155/33 101/247/33 103/156/33 -f 107/158/34 108/169/34 106/159/34 -f 49/161/35 50/248/35 52/162/35 -f 131/164/36 129/249/36 130/165/36 -f 116/167/13 115/171/13 106/168/13 -f 113/170/37 116/167/37 108/169/37 -f 115/171/38 114/250/38 105/172/38 -f 115/173/39 116/251/39 113/174/39 -f 81/176/40 82/252/40 84/177/40 -f 133/179/41 134/253/41 136/180/41 -f 112/182/42 111/254/42 109/183/42 -f 114/185/24 113/170/24 107/158/24 -f 117/187/43 118/255/43 120/188/43 -f 123/190/34 124/193/34 122/191/34 -f 124/193/13 128/256/13 127/194/13 -f 125/196/37 128/256/37 124/193/37 -f 127/194/38 126/257/38 121/197/38 -f 127/198/39 128/258/39 125/199/39 -f 126/201/24 125/196/24 123/190/24 -f 147/203/44 148/205/44 146/101/44 -f 147/146/45 150/148/45 149/144/45 -f 144/206/46 143/259/46 141/207/46 -f 140/209/47 139/260/47 137/210/47 -f 156/91/48 160/90/48 157/212/48 -f 153/213/49 158/261/49 159/214/49 -f 157/215/50 160/262/50 159/216/50 -f 153/218/24 155/93/24 157/212/24 -f 162/220/14 164/223/14 163/221/14 -f 164/223/13 162/228/13 167/224/13 -f 164/223/48 168/225/48 165/226/48 -f 161/227/49 166/263/49 167/224/49 -f 165/229/50 168/264/50 167/230/50 -f 163/221/24 165/226/24 166/232/24 +f 336/267/68 342/268/68 338/269/68 +f 336/270/69 337/271/69 335/272/69 +f 259/273/70 241/274/70 242/275/70 +f 333/276/71 331/277/71 332/278/71 +f 328/279/72 333/280/72 327/281/72 +f 240/282/73 241/283/73 239/284/73 +f 260/285/74 239/286/74 241/274/74 +f 236/287/75 237/288/75 238/289/75 +f 246/290/76 243/291/76 245/292/76 +f 262/293/77 242/275/77 240/282/77 +f 261/294/78 240/282/78 239/295/78 +f 249/296/74 248/297/74 247/298/74 +f 253/299/77 251/300/77 252/301/77 +f 250/302/68 253/299/68 248/303/68 +f 247/304/79 251/305/79 249/306/79 +f 249/306/80 254/307/80 250/302/80 +f 248/303/81 252/308/81 247/309/81 +f 255/310/82 258/311/82 256/312/82 +f 259/313/83 261/314/83 260/315/83 +f 271/316/84 274/317/84 272/318/84 +f 268/319/85 269/320/85 270/321/85 +f 328/279/77 331/322/77 334/323/77 +f 329/324/74 333/325/74 332/326/74 +f 275/327/86 278/328/86 276/329/86 +f 279/330/87 282/331/87 280/332/87 +f 284/333/88 285/334/88 286/335/88 +f 289/336/89 288/337/89 287/338/89 +f 231/339/90 234/340/90 233/341/90 +f 313/342/91 312/343/91 314/344/91 +f 298/345/68 288/346/68 290/347/68 +f 295/348/92 290/347/92 289/336/92 +f 297/349/93 287/350/93 288/346/93 +f 297/351/94 295/352/94 296/353/94 +f 263/354/95 266/355/95 265/356/95 +f 315/357/96 318/358/96 317/359/96 +f 294/360/97 291/361/97 292/362/97 +f 296/363/79 289/336/79 287/364/79 +f 299/365/98 302/366/98 301/367/98 +f 305/368/89 304/369/89 303/370/89 +f 306/371/68 309/372/68 304/373/68 +f 307/374/92 306/371/92 305/368/92 +f 309/372/93 303/375/93 304/373/93 +f 309/376/94 307/377/94 308/378/94 +f 308/379/79 305/368/79 303/380/79 +f 329/381/99 328/279/99 327/382/99 +f 329/324/100 331/322/100 330/383/100 +f 326/384/101 323/385/101 324/386/101 +f 322/387/102 319/388/102 320/389/102 +f 338/269/103 339/390/103 337/271/103 +f 335/391/104 341/392/104 336/267/104 +f 339/393/105 341/394/105 340/395/105 +f 335/396/79 339/390/79 340/397/79 +f 344/398/69 345/399/69 343/400/69 +f 346/401/68 349/402/68 350/403/68 +f 346/401/103 347/404/103 345/399/103 +f 343/405/104 349/402/104 344/406/104 +f 347/407/105 349/408/105 348/409/105 +f 345/399/79 348/410/79 343/411/79 +f 336/267/68 341/392/68 342/268/68 +f 336/270/69 338/269/69 337/271/69 +f 259/273/70 260/285/70 241/274/70 +f 333/276/71 334/412/71 331/277/71 +f 328/279/72 334/323/72 333/280/72 +f 240/282/73 242/275/73 241/283/73 +f 260/285/74 261/413/74 239/286/74 +f 236/287/75 235/414/75 237/288/75 +f 246/290/76 244/415/76 243/291/76 +f 262/293/77 259/273/77 242/275/77 +f 261/294/78 262/293/78 240/282/78 +f 249/296/74 250/416/74 248/297/74 +f 253/299/77 254/307/77 251/300/77 +f 250/302/68 254/307/68 253/299/68 +f 247/304/79 252/417/79 251/305/79 +f 249/306/80 251/305/80 254/307/80 +f 248/303/81 253/299/81 252/308/81 +f 255/310/82 257/418/82 258/311/82 +f 259/313/83 262/419/83 261/314/83 +f 271/316/84 273/420/84 274/317/84 +f 268/319/85 267/421/85 269/320/85 +f 328/279/77 330/383/77 331/322/77 +f 329/324/74 327/422/74 333/325/74 +f 275/327/86 277/423/86 278/328/86 +f 279/330/87 281/424/87 282/331/87 +f 284/333/88 283/425/88 285/334/88 +f 289/336/89 290/347/89 288/337/89 +f 231/339/90 232/426/90 234/340/90 +f 313/342/91 311/427/91 312/343/91 +f 298/345/68 297/349/68 288/346/68 +f 295/348/92 298/345/92 290/347/92 +f 297/349/93 296/428/93 287/350/93 +f 297/351/94 298/429/94 295/352/94 +f 263/354/95 264/430/95 266/355/95 +f 315/357/96 316/431/96 318/358/96 +f 294/360/97 293/432/97 291/361/97 +f 296/363/79 295/348/79 289/336/79 +f 299/365/98 300/433/98 302/366/98 +f 305/368/89 306/371/89 304/369/89 +f 306/371/68 310/434/68 309/372/68 +f 307/374/92 310/434/92 306/371/92 +f 309/372/93 308/435/93 303/375/93 +f 309/376/94 310/436/94 307/377/94 +f 308/379/79 307/374/79 305/368/79 +f 329/381/99 330/383/99 328/279/99 +f 329/324/100 332/326/100 331/322/100 +f 326/384/101 325/437/101 323/385/101 +f 322/387/102 321/438/102 319/388/102 +f 338/269/103 342/268/103 339/390/103 +f 335/391/104 340/439/104 341/392/104 +f 339/393/105 342/440/105 341/394/105 +f 335/396/79 337/271/79 339/390/79 +f 344/398/69 346/401/69 345/399/69 +f 346/401/68 344/406/68 349/402/68 +f 346/401/103 350/403/103 347/404/103 +f 343/405/104 348/441/104 349/402/104 +f 347/407/105 350/442/105 349/408/105 +f 345/399/79 347/404/79 348/410/79 o Horn v 0.205806 2.419194 0.062500 v 0.294194 2.330806 0.062500 @@ -690,10 +1380,10 @@ vn 0.0587 0.0587 -0.9965 vn 0.0587 0.0587 0.9965 vn -0.6459 0.7634 0.0000 s off -f 172/265/51 173/266/51 170/267/51 -f 171/268/52 173/266/52 172/269/52 -f 170/270/53 173/266/53 169/271/53 -f 171/272/54 169/273/54 173/266/54 +f 354/443/106 355/444/106 352/445/106 +f 353/446/107 355/444/107 354/447/107 +f 352/448/108 355/444/108 351/449/108 +f 353/450/109 351/451/109 355/444/109 o PelletShine v -0.000000 0.250000 -0.375000 v -0.187500 0.250000 -0.324760 @@ -757,64 +1447,64 @@ vn 0.1862 0.6947 0.6947 vn 0.5086 0.6947 0.5086 vn 0.0000 1.0000 0.0000 s off -f 188//55 175//55 176//55 -f 195//56 182//56 183//56 -f 192//57 179//57 180//57 -f 189//58 176//58 177//58 -f 196//59 183//59 184//59 -f 193//60 180//60 181//60 -f 190//61 177//61 178//61 -f 197//62 184//62 185//62 -f 187//63 174//63 175//63 -f 194//64 181//64 182//64 -f 191//65 178//65 179//65 -f 186//66 185//66 174//66 -f 195//67 206//67 194//67 -f 195//68 208//68 207//68 -f 196//69 209//69 208//69 -f 197//70 198//70 209//70 -f 186//71 199//71 198//71 -f 187//72 200//72 199//72 -f 189//73 200//73 188//73 -f 190//74 201//74 189//74 -f 191//75 202//75 190//75 -f 192//76 203//76 191//76 -f 193//77 204//77 192//77 -f 194//78 205//78 193//78 -f 206//79 208//79 198//79 -f 188//55 187//55 175//55 -f 195//56 194//56 182//56 -f 192//57 191//57 179//57 -f 189//58 188//58 176//58 -f 196//59 195//59 183//59 -f 193//60 192//60 180//60 -f 190//61 189//61 177//61 -f 197//62 196//62 184//62 -f 187//63 186//63 174//63 -f 194//64 193//64 181//64 -f 191//65 190//65 178//65 -f 186//66 197//66 185//66 -f 195//67 207//67 206//67 -f 195//68 196//68 208//68 -f 196//69 197//69 209//69 -f 197//70 186//70 198//70 -f 186//71 187//71 199//71 -f 187//72 188//72 200//72 -f 189//73 201//73 200//73 -f 190//74 202//74 201//74 -f 191//75 203//75 202//75 -f 192//76 204//76 203//76 -f 193//77 205//77 204//77 -f 194//78 206//78 205//78 -f 198//79 199//79 202//79 -f 199//79 200//79 202//79 -f 200//79 201//79 202//79 -f 202//79 203//79 204//79 -f 204//79 205//79 206//79 -f 206//79 207//79 208//79 -f 208//79 209//79 198//79 -f 202//79 204//79 198//79 -f 204//79 206//79 198//79 +f 370//110 357//110 358//110 +f 377//111 364//111 365//111 +f 374//112 361//112 362//112 +f 371//113 358//113 359//113 +f 378//114 365//114 366//114 +f 375//115 362//115 363//115 +f 372//116 359//116 360//116 +f 379//117 366//117 367//117 +f 369//118 356//118 357//118 +f 376//119 363//119 364//119 +f 373//120 360//120 361//120 +f 368//121 367//121 356//121 +f 377//122 388//122 376//122 +f 377//123 390//123 389//123 +f 378//124 391//124 390//124 +f 379//125 380//125 391//125 +f 368//126 381//126 380//126 +f 369//127 382//127 381//127 +f 371//128 382//128 370//128 +f 372//129 383//129 371//129 +f 373//130 384//130 372//130 +f 374//131 385//131 373//131 +f 375//132 386//132 374//132 +f 376//133 387//133 375//133 +f 388//134 390//134 380//134 +f 370//110 369//110 357//110 +f 377//111 376//111 364//111 +f 374//112 373//112 361//112 +f 371//113 370//113 358//113 +f 378//114 377//114 365//114 +f 375//115 374//115 362//115 +f 372//116 371//116 359//116 +f 379//117 378//117 366//117 +f 369//118 368//118 356//118 +f 376//119 375//119 363//119 +f 373//120 372//120 360//120 +f 368//121 379//121 367//121 +f 377//122 389//122 388//122 +f 377//123 378//123 390//123 +f 378//124 379//124 391//124 +f 379//125 368//125 380//125 +f 368//126 369//126 381//126 +f 369//127 370//127 382//127 +f 371//128 383//128 382//128 +f 372//129 384//129 383//129 +f 373//130 385//130 384//130 +f 374//131 386//131 385//131 +f 375//132 387//132 386//132 +f 376//133 388//133 387//133 +f 380//134 381//134 384//134 +f 381//134 382//134 384//134 +f 382//134 383//134 384//134 +f 384//134 385//134 386//134 +f 386//134 387//134 388//134 +f 388//134 389//134 390//134 +f 390//134 391//134 380//134 +f 384//134 386//134 380//134 +f 386//134 388//134 380//134 o Pellet v 0.000000 0.250000 -0.312500 v -0.156250 0.250000 -0.270633 @@ -940,64 +1630,64 @@ vn 0.6947 0.6947 0.1862 vn 0.6947 0.6947 -0.1862 vn 0.0000 1.0000 -0.0000 s off -f 216/274/80 227/275/80 215/276/80 -f 213/277/81 224/278/81 212/279/81 -f 220/280/82 231/281/82 219/282/82 -f 217/283/83 228/284/83 216/274/83 -f 214/285/84 225/286/84 213/287/84 -f 221/288/85 232/289/85 220/280/85 -f 211/290/86 222/291/86 210/292/86 -f 218/293/87 229/294/87 217/283/87 -f 215/276/88 226/295/88 214/285/88 -f 210/292/89 233/296/89 221/288/89 -f 212/279/90 223/297/90 211/290/90 -f 219/282/91 230/298/91 218/293/91 -f 232/289/92 245/299/92 244/300/92 -f 233/296/93 234/301/93 245/302/93 -f 223/297/94 234/303/94 222/291/94 -f 224/278/95 235/304/95 223/297/95 -f 225/305/96 236/306/96 224/278/96 -f 226/295/97 237/307/97 225/286/97 -f 227/275/98 238/308/98 226/295/98 -f 228/284/99 239/309/99 227/275/99 -f 229/294/100 240/310/100 228/284/100 -f 229/294/101 242/311/101 241/312/101 -f 230/298/102 243/313/102 242/314/102 -f 231/281/103 244/315/103 243/316/103 -f 238/317/104 242/318/104 234/319/104 -f 216/274/80 228/284/80 227/275/80 -f 213/277/81 225/305/81 224/278/81 -f 220/280/82 232/289/82 231/281/82 -f 217/283/83 229/294/83 228/284/83 -f 214/285/84 226/295/84 225/286/84 -f 221/288/85 233/296/85 232/289/85 -f 211/290/86 223/297/86 222/291/86 -f 218/293/87 230/298/87 229/294/87 -f 215/276/88 227/275/88 226/295/88 -f 210/292/89 222/291/89 233/296/89 -f 212/279/90 224/278/90 223/297/90 -f 219/282/91 231/281/91 230/298/91 -f 232/289/92 233/296/92 245/299/92 -f 233/296/93 222/291/93 234/301/93 -f 223/297/94 235/320/94 234/303/94 -f 224/278/95 236/321/95 235/304/95 -f 225/305/96 237/322/96 236/306/96 -f 226/295/97 238/323/97 237/307/97 -f 227/275/98 239/324/98 238/308/98 -f 228/284/99 240/325/99 239/309/99 -f 229/294/100 241/326/100 240/310/100 -f 229/294/101 230/298/101 242/311/101 -f 230/298/102 231/281/102 243/313/102 -f 231/281/103 232/289/103 244/315/103 -f 234/319/104 235/327/104 236/328/104 -f 236/328/104 237/329/104 238/317/104 -f 238/317/104 239/330/104 240/331/104 -f 240/331/104 241/332/104 238/317/104 -f 241/332/104 242/318/104 238/317/104 -f 242/318/104 243/333/104 244/334/104 -f 244/334/104 245/335/104 234/319/104 -f 234/319/104 236/328/104 238/317/104 -f 242/318/104 244/334/104 234/319/104 +f 398/452/135 409/453/135 397/454/135 +f 395/455/136 406/456/136 394/457/136 +f 402/458/137 413/459/137 401/460/137 +f 399/461/138 410/462/138 398/452/138 +f 396/463/139 407/464/139 395/465/139 +f 403/466/140 414/467/140 402/458/140 +f 393/468/141 404/469/141 392/470/141 +f 400/471/142 411/472/142 399/461/142 +f 397/454/143 408/473/143 396/463/143 +f 392/470/144 415/474/144 403/466/144 +f 394/457/145 405/475/145 393/468/145 +f 401/460/146 412/476/146 400/471/146 +f 414/467/147 427/477/147 426/478/147 +f 415/474/148 416/479/148 427/480/148 +f 405/475/149 416/481/149 404/469/149 +f 406/456/150 417/482/150 405/475/150 +f 407/483/151 418/484/151 406/456/151 +f 408/473/152 419/485/152 407/464/152 +f 409/453/153 420/486/153 408/473/153 +f 410/462/154 421/487/154 409/453/154 +f 411/472/155 422/488/155 410/462/155 +f 411/472/156 424/489/156 423/490/156 +f 412/476/157 425/491/157 424/492/157 +f 413/459/158 426/493/158 425/494/158 +f 420/495/159 424/496/159 416/497/159 +f 398/452/135 410/462/135 409/453/135 +f 395/455/136 407/483/136 406/456/136 +f 402/458/137 414/467/137 413/459/137 +f 399/461/138 411/472/138 410/462/138 +f 396/463/139 408/473/139 407/464/139 +f 403/466/140 415/474/140 414/467/140 +f 393/468/141 405/475/141 404/469/141 +f 400/471/142 412/476/142 411/472/142 +f 397/454/143 409/453/143 408/473/143 +f 392/470/144 404/469/144 415/474/144 +f 394/457/145 406/456/145 405/475/145 +f 401/460/146 413/459/146 412/476/146 +f 414/467/147 415/474/147 427/477/147 +f 415/474/148 404/469/148 416/479/148 +f 405/475/149 417/498/149 416/481/149 +f 406/456/150 418/499/150 417/482/150 +f 407/483/151 419/500/151 418/484/151 +f 408/473/152 420/501/152 419/485/152 +f 409/453/153 421/502/153 420/486/153 +f 410/462/154 422/503/154 421/487/154 +f 411/472/155 423/504/155 422/488/155 +f 411/472/156 412/476/156 424/489/156 +f 412/476/157 413/459/157 425/491/157 +f 413/459/158 414/467/158 426/493/158 +f 416/497/159 417/505/159 418/506/159 +f 418/506/159 419/507/159 420/495/159 +f 420/495/159 421/508/159 422/509/159 +f 422/509/159 423/510/159 420/495/159 +f 423/510/159 424/496/159 420/495/159 +f 424/496/159 425/511/159 426/512/159 +f 426/512/159 427/513/159 416/497/159 +f 416/497/159 418/506/159 420/495/159 +f 424/496/159 426/512/159 416/497/159 o Head v 0.375000 1.750000 0.375000 v -0.375000 1.750000 0.375000 @@ -1054,30 +1744,30 @@ vn 0.0000 0.0000 1.0000 vn -1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 s off -f 249/336/105 246/337/105 247/338/105 -f 250/339/106 252/340/106 251/341/106 -f 248/342/107 250/339/107 246/343/107 -f 246/343/108 251/344/108 247/345/108 -f 247/346/109 252/347/109 249/348/109 -f 249/348/110 253/349/110 248/342/110 -f 257/350/105 254/351/105 255/352/105 -f 258/353/106 260/354/106 259/355/106 -f 256/356/107 258/353/107 254/357/107 -f 254/357/108 259/358/108 255/359/108 -f 255/360/109 260/361/109 257/362/109 -f 257/362/110 261/363/110 256/356/110 -f 249/336/105 248/364/105 246/337/105 -f 250/339/106 253/349/106 252/340/106 -f 248/342/107 253/349/107 250/339/107 -f 246/343/108 250/339/108 251/344/108 -f 247/346/109 251/365/109 252/347/109 -f 249/348/110 252/347/110 253/349/110 -f 257/350/105 256/366/105 254/351/105 -f 258/353/106 261/363/106 260/354/106 -f 256/356/107 261/363/107 258/353/107 -f 254/357/108 258/353/108 259/358/108 -f 255/360/109 259/367/109 260/361/109 -f 257/362/110 260/361/110 261/363/110 +f 431/514/160 428/515/160 429/516/160 +f 432/517/161 434/518/161 433/519/161 +f 430/520/162 432/517/162 428/521/162 +f 428/521/163 433/522/163 429/523/163 +f 429/524/164 434/525/164 431/526/164 +f 431/526/165 435/527/165 430/520/165 +f 439/528/160 436/529/160 437/530/160 +f 440/531/161 442/532/161 441/533/161 +f 438/534/162 440/531/162 436/535/162 +f 436/535/163 441/536/163 437/537/163 +f 437/538/164 442/539/164 439/540/164 +f 439/540/165 443/541/165 438/534/165 +f 431/514/160 430/542/160 428/515/160 +f 432/517/161 435/527/161 434/518/161 +f 430/520/162 435/527/162 432/517/162 +f 428/521/163 432/517/163 433/522/163 +f 429/524/164 433/543/164 434/525/164 +f 431/526/165 434/525/165 435/527/165 +f 439/528/160 438/544/160 436/529/160 +f 440/531/161 443/541/161 442/532/161 +f 438/534/162 443/541/162 440/531/162 +f 436/535/163 440/531/163 441/536/163 +f 437/538/164 441/545/164 442/539/164 +f 439/540/165 442/539/165 443/541/165 o LA v -0.125000 1.000000 -0.250000 v 0.125000 1.000000 -0.250000 @@ -1134,30 +1824,30 @@ vn 0.0000 1.0000 0.0000 vn 0.0000 -1.0000 0.0000 vn 0.0000 0.0000 1.0000 s off -f 268/368/111 263/369/111 267/370/111 -f 267/370/112 269/371/112 268/368/112 -f 266/372/113 264/373/113 269/371/113 -f 268/368/114 264/374/114 265/375/114 -f 267/376/115 262/377/115 266/378/115 -f 264/379/116 263/369/116 265/375/116 -f 275/380/115 270/381/115 274/382/115 -f 277/383/111 271/384/111 275/385/111 -f 276/386/114 273/387/114 277/383/114 -f 274/388/113 272/389/113 276/390/113 -f 272/391/116 271/384/116 273/387/116 -f 275/385/112 276/390/112 277/383/112 -f 268/368/111 265/375/111 263/369/111 -f 267/370/112 266/372/112 269/371/112 -f 266/372/113 262/392/113 264/373/113 -f 268/368/114 269/393/114 264/374/114 -f 267/376/115 263/394/115 262/377/115 -f 264/379/116 262/395/116 263/369/116 -f 275/380/115 271/396/115 270/381/115 -f 277/383/111 273/387/111 271/384/111 -f 276/386/114 272/397/114 273/387/114 -f 274/388/113 270/398/113 272/389/113 -f 272/391/116 270/399/116 271/384/116 -f 275/385/112 274/388/112 276/390/112 +f 450/546/166 445/547/166 449/548/166 +f 449/548/167 451/549/167 450/546/167 +f 448/550/168 446/551/168 451/549/168 +f 450/546/169 446/552/169 447/553/169 +f 449/554/170 444/555/170 448/556/170 +f 446/557/171 445/547/171 447/553/171 +f 457/558/170 452/559/170 456/560/170 +f 459/561/166 453/562/166 457/563/166 +f 458/564/169 455/565/169 459/561/169 +f 456/566/168 454/567/168 458/568/168 +f 454/569/171 453/562/171 455/565/171 +f 457/563/167 458/568/167 459/561/167 +f 450/546/166 447/553/166 445/547/166 +f 449/548/167 448/550/167 451/549/167 +f 448/550/168 444/570/168 446/551/168 +f 450/546/169 451/571/169 446/552/169 +f 449/554/170 445/572/170 444/555/170 +f 446/557/171 444/573/171 445/547/171 +f 457/558/170 453/574/170 452/559/170 +f 459/561/166 455/565/166 453/562/166 +f 458/564/169 454/575/169 455/565/169 +f 456/566/168 452/576/168 454/567/168 +f 454/569/171 452/577/171 453/562/171 +f 457/563/167 456/566/167 458/568/167 o RA v -0.125000 1.750000 0.250000 v 0.125000 1.750000 0.250000 @@ -1214,30 +1904,30 @@ vn 0.0000 -1.0000 0.0000 vn 1.0000 0.0000 -0.0000 vn 0.0000 1.0000 0.0000 s off -f 280/400/117 278/401/117 279/402/117 -f 283/403/118 284/404/118 282/405/118 -f 281/406/119 283/407/119 278/401/119 -f 280/408/120 285/409/120 281/410/120 -f 279/402/121 284/404/121 280/400/121 -f 279/402/122 283/411/122 282/405/122 -f 288/412/117 287/413/117 286/414/117 -f 291/415/118 292/416/118 290/417/118 -f 289/418/119 291/419/119 287/413/119 -f 287/420/122 290/417/122 286/414/122 -f 286/414/121 292/416/121 288/412/121 -f 288/421/120 293/422/120 289/423/120 -f 280/400/117 281/406/117 278/401/117 -f 283/403/118 285/424/118 284/404/118 -f 281/406/119 285/425/119 283/407/119 -f 280/408/120 284/426/120 285/409/120 -f 279/402/121 282/405/121 284/404/121 -f 279/402/122 278/427/122 283/411/122 -f 288/412/117 289/418/117 287/413/117 -f 291/415/118 293/428/118 292/416/118 -f 289/418/119 293/429/119 291/419/119 -f 287/420/122 291/430/122 290/417/122 -f 286/414/121 290/417/121 292/416/121 -f 288/421/120 292/431/120 293/422/120 +f 462/578/172 460/579/172 461/580/172 +f 465/581/173 466/582/173 464/583/173 +f 463/584/174 465/585/174 460/579/174 +f 462/586/175 467/587/175 463/588/175 +f 461/580/176 466/582/176 462/578/176 +f 461/580/177 465/589/177 464/583/177 +f 470/590/172 469/591/172 468/592/172 +f 473/593/173 474/594/173 472/595/173 +f 471/596/174 473/597/174 469/591/174 +f 469/598/177 472/595/177 468/592/177 +f 468/592/176 474/594/176 470/590/176 +f 470/599/175 475/600/175 471/601/175 +f 462/578/172 463/584/172 460/579/172 +f 465/581/173 467/602/173 466/582/173 +f 463/584/174 467/603/174 465/585/174 +f 462/586/175 466/604/175 467/587/175 +f 461/580/176 464/583/176 466/582/176 +f 461/580/177 460/605/177 465/589/177 +f 470/590/172 471/596/172 469/591/172 +f 473/593/173 475/606/173 474/594/173 +f 471/596/174 475/607/174 473/597/174 +f 469/598/177 473/608/177 472/595/177 +f 468/592/176 472/595/176 474/594/176 +f 470/599/175 474/609/175 475/600/175 o LL v -0.125000 1.000000 -0.250000 v -0.125000 0.250000 -0.250000 @@ -1294,30 +1984,30 @@ vn 1.0000 0.0000 -0.0000 vn 0.0000 1.0000 0.0000 vn 0.0000 0.0000 -1.0000 s off -f 295/432/123 301/433/123 299/434/123 -f 298/435/124 295/436/124 299/437/124 -f 300/438/125 299/439/125 301/440/125 -f 296/441/126 301/440/126 297/442/126 -f 298/443/127 296/441/127 294/444/127 -f 294/445/128 297/442/128 295/436/128 -f 306/446/127 304/447/127 302/448/127 -f 303/449/123 309/450/123 307/451/123 -f 304/447/126 309/452/126 305/453/126 -f 302/454/128 305/453/128 303/455/128 -f 306/456/124 303/455/124 307/457/124 -f 308/458/125 307/459/125 309/452/125 -f 295/432/123 297/460/123 301/433/123 -f 298/435/124 294/445/124 295/436/124 -f 300/438/125 298/461/125 299/439/125 -f 296/441/126 300/438/126 301/440/126 -f 298/443/127 300/438/127 296/441/127 -f 294/445/128 296/441/128 297/442/128 -f 306/446/127 308/458/127 304/447/127 -f 303/449/123 305/462/123 309/450/123 -f 304/447/126 308/458/126 309/452/126 -f 302/454/128 304/447/128 305/453/128 -f 306/456/124 302/454/124 303/455/124 -f 308/458/125 306/463/125 307/459/125 +f 477/610/178 483/611/178 481/612/178 +f 480/613/179 477/614/179 481/615/179 +f 482/616/180 481/617/180 483/618/180 +f 478/619/181 483/618/181 479/620/181 +f 480/621/182 478/619/182 476/622/182 +f 476/623/183 479/620/183 477/614/183 +f 488/624/182 486/625/182 484/626/182 +f 485/627/178 491/628/178 489/629/178 +f 486/625/181 491/630/181 487/631/181 +f 484/632/183 487/631/183 485/633/183 +f 488/634/179 485/633/179 489/635/179 +f 490/636/180 489/637/180 491/630/180 +f 477/610/178 479/638/178 483/611/178 +f 480/613/179 476/623/179 477/614/179 +f 482/616/180 480/639/180 481/617/180 +f 478/619/181 482/616/181 483/618/181 +f 480/621/182 482/616/182 478/619/182 +f 476/623/183 478/619/183 479/620/183 +f 488/624/182 490/636/182 486/625/182 +f 485/627/178 487/640/178 491/628/178 +f 486/625/181 490/636/181 491/630/181 +f 484/632/183 486/625/183 487/631/183 +f 488/634/179 484/632/179 485/633/179 +f 490/636/180 488/641/180 489/637/180 o RL v 0.125000 0.250000 0.250000 v 0.125000 1.000000 0.250000 @@ -1374,30 +2064,30 @@ vn 1.0000 0.0000 -0.0000 vn 0.0000 -1.0000 0.0000 vn 0.0000 1.0000 0.0000 s off -f 311/464/129 312/465/129 310/466/129 -f 313/467/130 316/468/130 312/469/130 -f 317/470/131 314/471/131 316/468/131 -f 315/472/132 310/466/132 314/471/132 -f 316/473/133 310/474/133 312/475/133 -f 313/476/134 315/472/134 317/477/134 -f 319/478/129 320/479/129 318/480/129 -f 321/481/130 324/482/130 320/483/130 -f 325/484/131 322/485/131 324/482/131 -f 323/486/132 318/480/132 322/485/132 -f 324/487/133 318/488/133 320/489/133 -f 321/490/134 323/486/134 325/491/134 -f 311/464/129 313/492/129 312/465/129 -f 313/467/130 317/470/130 316/468/130 -f 317/470/131 315/472/131 314/471/131 -f 315/472/132 311/464/132 310/466/132 -f 316/473/133 314/493/133 310/474/133 -f 313/476/134 311/464/134 315/472/134 -f 319/478/129 321/494/129 320/479/129 -f 321/481/130 325/484/130 324/482/130 -f 325/484/131 323/486/131 322/485/131 -f 323/486/132 319/478/132 318/480/132 -f 324/487/133 322/495/133 318/488/133 -f 321/490/134 319/478/134 323/486/134 +f 493/642/184 494/643/184 492/644/184 +f 495/645/185 498/646/185 494/647/185 +f 499/648/186 496/649/186 498/646/186 +f 497/650/187 492/644/187 496/649/187 +f 498/651/188 492/652/188 494/653/188 +f 495/654/189 497/650/189 499/655/189 +f 501/656/184 502/657/184 500/658/184 +f 503/659/185 506/660/185 502/661/185 +f 507/662/186 504/663/186 506/660/186 +f 505/664/187 500/658/187 504/663/187 +f 506/665/188 500/666/188 502/667/188 +f 503/668/189 505/664/189 507/669/189 +f 493/642/184 495/670/184 494/643/184 +f 495/645/185 499/648/185 498/646/185 +f 499/648/186 497/650/186 496/649/186 +f 497/650/187 493/642/187 492/644/187 +f 498/651/188 496/671/188 492/652/188 +f 495/654/189 493/642/189 497/650/189 +f 501/656/184 503/672/184 502/657/184 +f 503/659/185 507/662/185 506/660/185 +f 507/662/186 505/664/186 504/663/186 +f 505/664/187 501/656/187 500/658/187 +f 506/665/188 504/673/188 500/666/188 +f 503/668/189 501/656/189 505/664/189 o Head17 v 0.375000 1.750000 0.375000 v -0.375000 1.750000 0.375000 @@ -1454,30 +2144,30 @@ vn 0.0000 0.0000 1.0000 vn -1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 s off -f 329/496/135 326/497/135 327/498/135 -f 330/499/136 332/500/136 331/501/136 -f 328/502/137 330/499/137 326/503/137 -f 326/503/138 331/504/138 327/505/138 -f 327/506/139 332/507/139 329/508/139 -f 329/508/140 333/509/140 328/502/140 -f 337/510/135 334/511/135 335/512/135 -f 338/513/136 340/514/136 339/515/136 -f 336/516/137 338/513/137 334/517/137 -f 334/517/138 339/518/138 335/519/138 -f 335/520/139 340/521/139 337/522/139 -f 337/522/140 341/523/140 336/516/140 -f 329/496/135 328/524/135 326/497/135 -f 330/499/136 333/509/136 332/500/136 -f 328/502/137 333/509/137 330/499/137 -f 326/503/138 330/499/138 331/504/138 -f 327/506/139 331/525/139 332/507/139 -f 329/508/140 332/507/140 333/509/140 -f 337/510/135 336/526/135 334/511/135 -f 338/513/136 341/523/136 340/514/136 -f 336/516/137 341/523/137 338/513/137 -f 334/517/138 338/513/138 339/518/138 -f 335/520/139 339/527/139 340/521/139 -f 337/522/140 340/521/140 341/523/140 +f 511/674/190 508/675/190 509/676/190 +f 512/677/191 514/678/191 513/679/191 +f 510/680/192 512/677/192 508/681/192 +f 508/681/193 513/682/193 509/683/193 +f 509/684/194 514/685/194 511/686/194 +f 511/686/195 515/687/195 510/680/195 +f 519/688/190 516/689/190 517/690/190 +f 520/691/191 522/692/191 521/693/191 +f 518/694/192 520/691/192 516/695/192 +f 516/695/193 521/696/193 517/697/193 +f 517/698/194 522/699/194 519/700/194 +f 519/700/195 523/701/195 518/694/195 +f 511/674/190 510/702/190 508/675/190 +f 512/677/191 515/687/191 514/678/191 +f 510/680/192 515/687/192 512/677/192 +f 508/681/193 512/677/193 513/682/193 +f 509/684/194 513/703/194 514/685/194 +f 511/686/195 514/685/195 515/687/195 +f 519/688/190 518/704/190 516/689/190 +f 520/691/191 523/701/191 522/692/191 +f 518/694/192 523/701/192 520/691/192 +f 516/695/193 520/691/193 521/696/193 +f 517/698/194 521/705/194 522/699/194 +f 519/700/195 522/699/195 523/701/195 o RA17 v -0.125000 1.750000 0.250000 v 0.125000 1.750000 0.250000 @@ -1510,18 +2200,18 @@ vn 0.0000 -1.0000 0.0000 vn 1.0000 0.0000 -0.0000 vn 0.0000 1.0000 0.0000 s off -f 344/528/141 342/529/141 343/530/141 -f 347/531/142 348/532/142 346/533/142 -f 345/534/143 347/535/143 342/529/143 -f 344/536/144 349/537/144 345/538/144 -f 343/530/145 348/532/145 344/528/145 -f 343/530/146 347/539/146 346/533/146 -f 344/528/141 345/534/141 342/529/141 -f 347/531/142 349/540/142 348/532/142 -f 345/534/143 349/541/143 347/535/143 -f 344/536/144 348/542/144 349/537/144 -f 343/530/145 346/533/145 348/532/145 -f 343/530/146 342/543/146 347/539/146 +f 526/706/196 524/707/196 525/708/196 +f 529/709/197 530/710/197 528/711/197 +f 527/712/198 529/713/198 524/707/198 +f 526/714/199 531/715/199 527/716/199 +f 525/708/200 530/710/200 526/706/200 +f 525/708/201 529/717/201 528/711/201 +f 526/706/196 527/712/196 524/707/196 +f 529/709/197 531/718/197 530/710/197 +f 527/712/198 531/719/198 529/713/198 +f 526/714/199 530/720/199 531/715/199 +f 525/708/200 528/711/200 530/710/200 +f 525/708/201 524/721/201 529/717/201 o LA17 v -0.125000 1.000000 -0.500000 v 0.125000 1.000000 -0.500000 @@ -1554,18 +2244,18 @@ vn 0.0000 -1.0000 0.0000 vn 0.0000 0.0000 1.0000 vn -1.0000 0.0000 -0.0000 s off -f 351/544/147 352/545/147 353/546/147 -f 356/547/148 352/548/148 357/549/148 -f 351/544/149 356/547/149 355/550/149 -f 350/551/150 355/552/150 354/553/150 -f 357/554/151 355/550/151 356/547/151 -f 352/555/152 354/556/152 357/554/152 -f 351/544/147 350/557/147 352/545/147 -f 356/547/148 353/546/148 352/548/148 -f 351/544/149 353/546/149 356/547/149 -f 350/551/150 351/558/150 355/552/150 -f 357/554/151 354/556/151 355/550/151 -f 352/555/152 350/559/152 354/556/152 +f 533/722/202 534/723/202 535/724/202 +f 538/725/203 534/726/203 539/727/203 +f 533/722/204 538/725/204 537/728/204 +f 532/729/205 537/730/205 536/731/205 +f 539/732/206 537/728/206 538/725/206 +f 534/733/207 536/734/207 539/732/207 +f 533/722/202 532/735/202 534/723/202 +f 538/725/203 535/724/203 534/726/203 +f 533/722/204 535/724/204 538/725/204 +f 532/729/205 533/736/205 537/730/205 +f 539/732/206 536/734/206 537/728/206 +f 534/733/207 532/737/207 536/734/207 o LL17 v -0.125000 1.000000 0.000000 v -0.125000 0.250000 0.000000 @@ -1598,18 +2288,18 @@ vn 0.0000 0.0000 1.0000 vn -1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 s off -f 360/560/153 362/561/153 358/562/153 -f 365/563/154 359/564/154 363/565/154 -f 365/566/155 360/560/155 361/567/155 -f 361/567/156 358/568/156 359/569/156 -f 359/569/157 362/570/157 363/571/157 -f 363/572/158 364/573/158 365/566/158 -f 360/560/153 364/573/153 362/561/153 -f 365/563/154 361/574/154 359/564/154 -f 365/566/155 364/573/155 360/560/155 -f 361/567/156 360/560/156 358/568/156 -f 359/569/157 358/568/157 362/570/157 -f 363/572/158 362/575/158 364/573/158 +f 542/738/208 544/739/208 540/740/208 +f 547/741/209 541/742/209 545/743/209 +f 547/744/210 542/738/210 543/745/210 +f 543/745/211 540/746/211 541/747/211 +f 541/747/212 544/748/212 545/749/212 +f 545/750/213 546/751/213 547/744/213 +f 542/738/208 546/751/208 544/739/208 +f 547/741/209 543/752/209 541/742/209 +f 547/744/210 546/751/210 542/738/210 +f 543/745/211 542/738/211 540/746/211 +f 541/747/212 540/746/212 544/748/212 +f 545/750/213 544/753/213 546/751/213 o RL17 v 0.125000 0.250000 0.250000 v 0.125000 1.000000 0.250000 @@ -1642,18 +2332,18 @@ vn 1.0000 0.0000 -0.0000 vn 0.0000 -1.0000 0.0000 vn 0.0000 1.0000 0.0000 s off -f 367/576/159 368/577/159 366/578/159 -f 369/579/160 372/580/160 368/581/160 -f 373/582/161 370/583/161 372/580/161 -f 371/584/162 366/578/162 370/583/162 -f 372/585/163 366/586/163 368/587/163 -f 369/588/164 371/584/164 373/589/164 -f 367/576/159 369/590/159 368/577/159 -f 369/579/160 373/582/160 372/580/160 -f 373/582/161 371/584/161 370/583/161 -f 371/584/162 367/576/162 366/578/162 -f 372/585/163 370/591/163 366/586/163 -f 369/588/164 367/576/164 371/584/164 +f 549/754/214 550/755/214 548/756/214 +f 551/757/215 554/758/215 550/759/215 +f 555/760/216 552/761/216 554/758/216 +f 553/762/217 548/756/217 552/761/217 +f 554/763/218 548/764/218 550/765/218 +f 551/766/219 553/762/219 555/767/219 +f 549/754/214 551/768/214 550/755/214 +f 551/757/215 555/760/215 554/758/215 +f 555/760/216 553/762/216 552/761/216 +f 553/762/217 549/754/217 548/756/217 +f 554/763/218 552/769/218 548/764/218 +f 551/766/219 549/754/219 553/762/219 o Body17 v 0.125000 1.750000 0.250000 v -0.125000 1.750000 0.250000 @@ -1686,18 +2376,18 @@ vn 0.0000 0.0000 -1.0000 vn 1.0000 0.0000 -0.0000 vn 0.0000 0.0000 1.0000 s off -f 374/592/165 377/593/165 375/594/165 -f 380/595/166 378/596/166 379/597/166 -f 377/598/167 379/599/167 375/600/167 -f 376/601/168 380/602/168 377/598/168 -f 374/592/169 381/603/169 376/601/169 -f 375/604/170 378/605/170 374/592/170 -f 374/592/165 376/601/165 377/593/165 -f 380/595/166 381/606/166 378/596/166 -f 377/598/167 380/602/167 379/599/167 -f 376/601/168 381/603/168 380/602/168 -f 374/592/169 378/605/169 381/603/169 -f 375/604/170 379/607/170 378/605/170 +f 556/770/220 559/771/220 557/772/220 +f 562/773/221 560/774/221 561/775/221 +f 559/776/222 561/777/222 557/778/222 +f 558/779/223 562/780/223 559/776/223 +f 556/770/224 563/781/224 558/779/224 +f 557/782/225 560/783/225 556/770/225 +f 556/770/220 558/779/220 559/771/220 +f 562/773/221 563/784/221 560/774/221 +f 559/776/222 562/780/222 561/777/222 +f 558/779/223 563/781/223 562/780/223 +f 556/770/224 560/783/224 563/781/224 +f 557/782/225 561/785/225 560/783/225 o Socket v 0.625000 0.000000 0.625000 v 0.625000 0.000000 -0.625000 @@ -1734,18 +2424,18 @@ vn 1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 vn 0.0000 0.0000 1.0000 s off -f 384/608/171 383/609/171 382/610/171 -f 388/611/172 386/612/172 387/613/172 -f 384/614/173 389/615/173 385/616/173 -f 383/617/174 387/618/174 382/619/174 -f 385/620/175 388/621/175 383/609/175 -f 382/622/176 386/612/176 384/623/176 -f 384/608/171 385/620/171 383/609/171 -f 388/611/172 389/624/172 386/612/172 -f 384/614/173 386/625/173 389/615/173 -f 383/617/174 388/626/174 387/618/174 -f 385/620/175 389/627/175 388/621/175 -f 382/622/176 387/613/176 386/612/176 +f 566/786/226 565/787/226 564/788/226 +f 570/789/227 568/790/227 569/791/227 +f 566/792/228 571/793/228 567/794/228 +f 565/795/229 569/796/229 564/797/229 +f 567/798/230 570/799/230 565/787/230 +f 564/800/231 568/790/231 566/801/231 +f 566/786/226 567/798/226 565/787/226 +f 570/789/227 571/802/227 568/790/227 +f 566/792/228 568/803/228 571/793/228 +f 565/795/229 570/804/229 569/796/229 +f 567/798/230 571/805/230 570/799/230 +f 564/800/231 569/791/231 568/790/231 o Body v 0.125000 1.750000 0.250000 v -0.125000 1.750000 0.250000 @@ -1802,27 +2492,27 @@ vn 0.0000 0.0000 -1.0000 vn 1.0000 0.0000 -0.0000 vn 0.0000 0.0000 1.0000 s off -f 390/628/177 393/629/177 391/630/177 -f 396/631/178 394/632/178 395/633/178 -f 393/634/179 395/635/179 391/636/179 -f 392/637/180 396/638/180 393/634/180 -f 390/628/181 397/639/181 392/637/181 -f 391/640/182 394/641/182 390/628/182 -f 398/642/177 401/643/177 399/644/177 -f 403/645/178 405/646/178 402/647/178 -f 401/648/179 403/649/179 399/650/179 -f 400/651/180 404/652/180 401/648/180 -f 398/642/181 405/653/181 400/651/181 -f 399/654/182 402/655/182 398/642/182 -f 390/628/177 392/637/177 393/629/177 -f 396/631/178 397/656/178 394/632/178 -f 393/634/179 396/638/179 395/635/179 -f 392/637/180 397/639/180 396/638/180 -f 390/628/181 394/641/181 397/639/181 -f 391/640/182 395/657/182 394/641/182 -f 398/642/177 400/651/177 401/643/177 -f 403/645/178 404/658/178 405/646/178 -f 401/648/179 404/652/179 403/649/179 -f 400/651/180 405/653/180 404/652/180 -f 398/642/181 402/655/181 405/653/181 -f 399/654/182 403/659/182 402/655/182 +f 572/806/232 575/807/232 573/808/232 +f 578/809/233 576/810/233 577/811/233 +f 575/812/234 577/813/234 573/814/234 +f 574/815/235 578/816/235 575/812/235 +f 572/806/236 579/817/236 574/815/236 +f 573/818/237 576/819/237 572/806/237 +f 580/820/232 583/821/232 581/822/232 +f 585/823/233 587/824/233 584/825/233 +f 583/826/234 585/827/234 581/828/234 +f 582/829/235 586/830/235 583/826/235 +f 580/820/236 587/831/236 582/829/236 +f 581/832/237 584/833/237 580/820/237 +f 572/806/232 574/815/232 575/807/232 +f 578/809/233 579/834/233 576/810/233 +f 575/812/234 578/816/234 577/813/234 +f 574/815/235 579/817/235 578/816/235 +f 572/806/236 576/819/236 579/817/236 +f 573/818/237 577/835/237 576/819/237 +f 580/820/232 582/829/232 583/821/232 +f 585/823/233 586/836/233 587/824/233 +f 583/826/234 586/830/234 585/827/234 +f 582/829/235 587/831/235 586/830/235 +f 580/820/236 584/833/236 587/831/236 +f 581/832/237 585/837/237 584/833/237 diff --git a/src/main/resources/assets/hbm/textures/models/machines/crucible.png b/src/main/resources/assets/hbm/textures/models/machines/crucible.png new file mode 100644 index 000000000..63b8be6bf Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/machines/crucible.png differ