diff --git a/changelog b/changelog index 5efebd412..4bfc0e045 100644 --- a/changelog +++ b/changelog @@ -24,10 +24,14 @@ * Certain earlygame things can now be recycled like stirling engines and gears * Antenna part recycling has been moved to the anvil * NTM's pickaxes now have a break speed bonus for glass +* renamed the foundry slag outlet to foundry spill outlet because people always assume it's for slag and only slag (it is not) +* The description for heatable/coolable fluid tags is now written in the same line as the label ## Fixed * Fixed DFC receivers not outputting power * Fixed the custom machine NEI handlers not working * Fixed a potential crash caused by invalid assembly templates * Fixed general weirdness with the schrabidium transmutator item IO -* Fixed certain tooltips using the backslash escape character despite not needing them \ No newline at end of file +* Fixed certain tooltips using the backslash escape character despite not needing them +* Hopefully fixed the immense lag caused by tom post impact mechanics, burning grass will now only spread 20% of the time (instead of 100) and the world destruction handler will only process half the blocks per chunk +* Hopefully fixed an issue where substations would not reliably connect to cable blocks \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/generic/WasteEarth.java b/src/main/java/com/hbm/blocks/generic/WasteEarth.java index 6c2558ece..e38f5d9d2 100644 --- a/src/main/java/com/hbm/blocks/generic/WasteEarth.java +++ b/src/main/java/com/hbm/blocks/generic/WasteEarth.java @@ -129,29 +129,31 @@ public class WasteEarth extends Block { if(this == ModBlocks.burning_earth) { - for(int i = -1; i < 2; i++) { - for(int j = -1; j < 2; j++) { - for(int k = -1; k < 2; k++) { - - if(!world.blockExists(x + i, y + j, z + k)) continue; - - Block b0 = world.getBlock(x + i, y + j, z + k); - Block b1 = world.getBlock(x + i, y + j + 1, z + k); - - if(!b1.isOpaqueCube() && - ((b0 == Blocks.grass || b0 == Blocks.mycelium || b0 == ModBlocks.waste_earth || - b0 == ModBlocks.frozen_grass || b0 == ModBlocks.waste_mycelium) - && !world.canLightningStrikeAt(x, y, z))) { - world.setBlock(x + i, y + j, z + k, ModBlocks.burning_earth); - } - if((b0 instanceof BlockLeaves || b0 instanceof BlockBush)) { - world.setBlockToAir(x + i, y + j, z + k); - } - if(b0 == ModBlocks.frozen_dirt) { - world.setBlock(x + i, y + j, z + k, Blocks.dirt); - } - if(b1.isFlammable(world, x, y, z, ForgeDirection.UP) && !(b1 instanceof BlockLeaves || b1 instanceof BlockBush) && world.getBlock(x, y + 1, z) == Blocks.air) { - world.setBlock(x, y + 1, z, Blocks.fire); + if(rand.nextInt(5) == 0) { + for(int i = -1; i < 2; i++) { + for(int j = -1; j < 2; j++) { + for(int k = -1; k < 2; k++) { + + if(!world.blockExists(x + i, y + j, z + k)) continue; + + Block b0 = world.getBlock(x + i, y + j, z + k); + Block b1 = world.getBlock(x + i, y + j + 1, z + k); + + if(!b1.isOpaqueCube() && + ((b0 == Blocks.grass || b0 == Blocks.mycelium || b0 == ModBlocks.waste_earth || + b0 == ModBlocks.frozen_grass || b0 == ModBlocks.waste_mycelium) + && !world.canLightningStrikeAt(x, y, z))) { + world.setBlock(x + i, y + j, z + k, ModBlocks.burning_earth); + } + if((b0 instanceof BlockLeaves || b0 instanceof BlockBush)) { + world.setBlockToAir(x + i, y + j, z + k); + } + if(b0 == ModBlocks.frozen_dirt) { + world.setBlock(x + i, y + j, z + k, Blocks.dirt); + } + if(b1.isFlammable(world, x, y, z, ForgeDirection.UP) && !(b1 instanceof BlockLeaves || b1 instanceof BlockBush) && world.getBlock(x, y + 1, z) == Blocks.air) { + world.setBlock(x, y + 1, z, Blocks.fire); + } } } } diff --git a/src/main/java/com/hbm/handler/ImpactWorldHandler.java b/src/main/java/com/hbm/handler/ImpactWorldHandler.java index 4fcf45157..fc528fc6d 100644 --- a/src/main/java/com/hbm/handler/ImpactWorldHandler.java +++ b/src/main/java/com/hbm/handler/ImpactWorldHandler.java @@ -45,6 +45,8 @@ public class ImpactWorldHandler { for(int x = 0; x < 16; x++) { for(int z = 0; z < 16; z++) { + if(world.rand.nextBoolean()) continue; + int X = coord.getCenterXPos() - 8 + x; int Z = coord.getCenterZPosition() - 8 + z; int Y = world.getHeightValue(X, Z) - world.rand.nextInt(Math.max(1, world.getHeightValue(X, Z))); diff --git a/src/main/java/com/hbm/inventory/container/ContainerICF.java b/src/main/java/com/hbm/inventory/container/ContainerICF.java index b3db3ab42..a5cfabe47 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerICF.java +++ b/src/main/java/com/hbm/inventory/container/ContainerICF.java @@ -1,5 +1,7 @@ package com.hbm.inventory.container; +import com.hbm.inventory.SlotCraftingOutput; +import com.hbm.items.machine.IItemFluidIdentifier; import com.hbm.tileentity.machine.TileEntityICF; import net.minecraft.entity.player.EntityPlayer; @@ -15,20 +17,58 @@ public class ContainerICF extends Container { public ContainerICF(InventoryPlayer invPlayer, TileEntityICF tedf) { this.icf = tedf; + for(int i = 0; i < 5; i++) this.addSlotToContainer(new Slot(icf, i, 80 + i * 18, 18)); + this.addSlotToContainer(new Slot(icf, 5, 116, 54)); + for(int i = 0; i < 5; i++) this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, icf, 6 + i, 80 + i * 18, 90)); + this.addSlotToContainer(new Slot(icf, 11, 44, 90)); + for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 147 + i * 18)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 44 + j * 18, 140 + i * 18)); } } for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 205)); + this.addSlotToContainer(new Slot(invPlayer, i, 44 + i * 18, 198)); } } - + @Override - public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { - return null; //TODO + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack copy = null; + Slot slot = (Slot) this.inventorySlots.get(index); + + if(slot != null && slot.getHasStack()) { + ItemStack stack = slot.getStack(); + copy = stack.copy(); + + if(index <= 11) { + if(!this.mergeItemStack(stack, 12, this.inventorySlots.size(), true)) { + return null; + } + } else { + + if(copy.getItem() instanceof IItemFluidIdentifier) { + if(!this.mergeItemStack(stack, 11, 12, false)) { + return null; + } + } else { + if(!this.mergeItemStack(stack, 5, 6, false)) { + if(!this.mergeItemStack(stack, 0, 5, false)) { + return null; + } + } + } + } + + if(stack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + } + + return copy; } @Override diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 0e6c14627..0a096eac2 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -173,6 +173,7 @@ public class Fluids { public static FluidType THORIUM_SALT_HOT; public static FluidType THORIUM_SALT_DEPLETED; public static FluidType FULLERENE; + public static FluidType STELLAR_FLUX; public static List customFluids = new ArrayList(); @@ -367,7 +368,8 @@ public class Fluids { CRACKOIL_DS = new FluidType("CRACKOIL_DS", 0x2A1C11, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x424242)).addTraits(LIQUID, VISCOUS, P_OIL); HOTCRACKOIL_DS = new FluidType("HOTCRACKOIL_DS", 0x3A1A28, 2, 3, 0, EnumSymbol.NONE).setTemp(350).addTraits(LIQUID, VISCOUS, P_OIL); NAPHTHA_DS = new FluidType("NAPHTHA_DS", 0x63614E, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x5F6D44)).addTraits(LIQUID, VISCOUS, P_FUEL); - LIGHTOIL_DS = new FluidType(138, "LIGHTOIL_DS", 0x63543E, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xB46B52)).addTraits(LIQUID, P_FUEL); + LIGHTOIL_DS = new FluidType("LIGHTOIL_DS", 0x63543E, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xB46B52)).addTraits(LIQUID, P_FUEL); + STELLAR_FLUX = new FluidType(139, "STELLAR_FLUX", 0xE300FF, 0, 4, 4, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS); // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE @@ -520,6 +522,8 @@ public class Fluids { //garbage metaOrder.add(XPJUICE); metaOrder.add(ENDERJUICE); + //plasma-esque + metaOrder.add(STELLAR_FLUX); //plasma metaOrder.add(PLASMA_DT); metaOrder.add(PLASMA_HD); diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java index 1bb6d3574..87f595015 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java @@ -42,14 +42,13 @@ public class FT_Coolable extends FluidTrait { @Override public void addInfoHidden(List info) { - info.add(EnumChatFormatting.AQUA + "Thermal capacity: " + heatEnergy + " TU"); + info.add(EnumChatFormatting.RED + "Thermal capacity: " + heatEnergy + " TU"); for(CoolingType type : CoolingType.values()) { double eff = getEfficiency(type); if(eff > 0) { - info.add(EnumChatFormatting.AQUA + "[" + type.name + "]"); - info.add(EnumChatFormatting.AQUA + "Efficiency: " + ((int) (eff * 100D)) + "%"); + info.add(EnumChatFormatting.YELLOW + "[" + type.name + "] " + EnumChatFormatting.AQUA + "Efficiency: " + ((int) (eff * 100D)) + "%"); } } } diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java index c828858b8..ac60c74a5 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java @@ -42,14 +42,13 @@ public class FT_Heatable extends FluidTrait { @Override public void addInfoHidden(List info) { - info.add(EnumChatFormatting.AQUA + "Thermal capacity: " + this.getFirstStep().heatReq + " TU"); + info.add(EnumChatFormatting.RED + "Thermal capacity: " + this.getFirstStep().heatReq + " TU"); for(HeatingType type : HeatingType.values()) { double eff = getEfficiency(type); if(eff > 0) { - info.add(EnumChatFormatting.AQUA + "[" + type.name + "]"); - info.add(EnumChatFormatting.AQUA + "Efficiency: " + ((int) (eff * 100D)) + "%"); + info.add(EnumChatFormatting.YELLOW + "[" + type.name + "] " + EnumChatFormatting.AQUA + "Efficiency: " + ((int) (eff * 100D)) + "%"); } } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIICF.java b/src/main/java/com/hbm/inventory/gui/GUIICF.java index 55661f6c4..9b74b86e2 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIICF.java +++ b/src/main/java/com/hbm/inventory/gui/GUIICF.java @@ -2,6 +2,7 @@ package com.hbm.inventory.gui; import com.hbm.inventory.container.ContainerICF; import com.hbm.lib.RefStrings; +import com.hbm.render.util.GaugeUtil; import com.hbm.tileentity.machine.TileEntityICF; import net.minecraft.client.Minecraft; @@ -22,15 +23,31 @@ public class GUIICF extends GuiInfoContainer { this.ySize = 222; } + @Override + public void drawScreen(int x, int y, float interp) { + super.drawScreen(x, y, interp); + + icf.tanks[0].renderTankInfo(this, x, y, guiLeft + 44, guiTop + 18, 16, 70); + icf.tanks[1].renderTankInfo(this, x, y, guiLeft + 188, guiTop + 18, 16, 70); + icf.tanks[2].renderTankInfo(this, x, y, guiLeft + 224, guiTop + 18, 16, 70); + } + @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.icf.hasCustomInventoryName() ? this.icf.getInventoryName() : I18n.format(this.icf.getInventoryName()); - this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 93, 4210752); + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 44, this.ySize - 93, 4210752); } @Override protected void drawGuiContainerBackgroundLayer(float interp, int x, int y) { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + GaugeUtil.drawSmoothGauge(guiLeft + 196, guiTop + 98, this.zLevel, 0D, 5, 2, 1, 0xFF00AF); + + icf.tanks[0].renderTank(guiLeft + 44, guiTop + 88, this.zLevel, 16, 70); + icf.tanks[1].renderTank(guiLeft + 188, guiTop + 88, this.zLevel, 16, 70); + icf.tanks[2].renderTank(guiLeft + 224, guiTop + 88, this.zLevel, 16, 70); } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java b/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java index f6e6d0f81..c4e34d4fe 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java @@ -1,10 +1,13 @@ package com.hbm.tileentity.machine; import com.hbm.inventory.container.ContainerICF; +import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.gui.GUIICF; import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; +import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.GuiScreen; @@ -13,10 +16,16 @@ import net.minecraft.inventory.Container; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider { +public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider, IFluidStandardTransceiver { + + public FluidTank[] tanks; public TileEntityICF() { super(12); + this.tanks = new FluidTank[3]; + this.tanks[0] = new FluidTank(Fluids.COOLANT, 256_000); + this.tanks[1] = new FluidTank(Fluids.COOLANT_HOT, 256_000); + this.tanks[2] = new FluidTank(Fluids.STELLAR_FLUX, 16_000); } @Override @@ -27,6 +36,20 @@ public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider @Override public void updateEntity() { + for(int i = 0; i < 3; i++) tanks[i].setFill(tanks[i].getMaxFill()); + + if(!worldObj.isRemote) { + + } + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) { + return false; + } else { + return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 256; + } } AxisAlignedBB bb = null; @@ -54,6 +77,21 @@ public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider return 65536.0D; } + @Override + public FluidTank[] getAllTanks() { + return tanks; + } + + @Override + public FluidTank[] getSendingTanks() { + return new FluidTank[] {tanks[1], tanks[2]}; + } + + @Override + public FluidTank[] getReceivingTanks() { + return new FluidTank[] {tanks[0]}; + } + @Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerICF(player.inventory, this); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java b/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java index 4dd8789d7..9c43e6970 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java @@ -8,6 +8,7 @@ import com.hbm.tileentity.TileEntityTickingBase; import com.hbm.util.fauxpointtwelve.BlockPos; import api.hbm.energymk2.IEnergyReceiverMK2; +import net.minecraftforge.common.util.ForgeDirection; public class TileEntityICFController extends TileEntityTickingBase implements IEnergyReceiverMK2 { @@ -29,6 +30,37 @@ public class TileEntityICFController extends TileEntityTickingBase implements IE this.capacitorCount = 0; this.turbochargerCount = 0; + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata()).getOpposite(); + BlockPos pos = new BlockPos(0, 0, 0); + + for(int i = 0; i < cells.size(); i++) { + int j = i + 1; + + if(cells.contains(pos.mutate(xCoord + dir.offsetX * j, yCoord, zCoord + dir.offsetZ * j))) { + this.cellCount++; + } else { + break; + } + } + + for(BlockPos emitter : emitters) { for(ForgeDirection offset : ForgeDirection.VALID_DIRECTIONS) { + pos.mutate(emitter.getX() + offset.offsetX, emitter.getY() + offset.offsetY, emitter.getZ() + offset.offsetZ); + if(cells.contains(pos)) { this.emitterCount++; break; } + } + } + + for(BlockPos capacitor : capacitors) { for(ForgeDirection offset : ForgeDirection.VALID_DIRECTIONS) { + pos.mutate(capacitor.getX() + offset.offsetX, capacitor.getY() + offset.offsetY, capacitor.getZ() + offset.offsetZ); + if(emitters.contains(pos)) { this.emitterCount++; break; } + } + } + + for(BlockPos turbo : turbochargers) { for(ForgeDirection offset : ForgeDirection.VALID_DIRECTIONS) { + pos.mutate(turbo.getX() + offset.offsetX, turbo.getY() + offset.offsetY, turbo.getZ() + offset.offsetZ); + if(capacitors.contains(pos)) { this.emitterCount++; break; } + } + } + this.ports.addAll(ports); } diff --git a/src/main/java/com/hbm/tileentity/network/TileEntitySubstation.java b/src/main/java/com/hbm/tileentity/network/TileEntitySubstation.java index 33d6291c8..1f6b90818 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntitySubstation.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntitySubstation.java @@ -51,7 +51,11 @@ public class TileEntitySubstation extends TileEntityPylonBase { @Override public PowerNode createNode() { TileEntity tile = (TileEntity) this; - PowerNode node = new PowerNode(new BlockPos(tile.xCoord, tile.yCoord, tile.zCoord)).setConnections( + PowerNode node = new PowerNode(new BlockPos(tile.xCoord, tile.yCoord, tile.zCoord), + new BlockPos(tile.xCoord + 1, tile.yCoord, tile.zCoord + 1), + new BlockPos(tile.xCoord + 1, tile.yCoord, tile.zCoord - 1), + new BlockPos(tile.xCoord - 1, tile.yCoord, tile.zCoord + 1), + new BlockPos(tile.xCoord - 1, tile.yCoord, tile.zCoord - 1)).setConnections( new DirPos(xCoord, yCoord, zCoord, ForgeDirection.UNKNOWN), new DirPos(xCoord + 2, yCoord, zCoord - 1, Library.POS_X), new DirPos(xCoord + 2, yCoord, zCoord + 1, Library.POS_X), diff --git a/src/main/java/com/hbm/util/fauxpointtwelve/BlockPos.java b/src/main/java/com/hbm/util/fauxpointtwelve/BlockPos.java index 4b2c6a1c8..90d897693 100644 --- a/src/main/java/com/hbm/util/fauxpointtwelve/BlockPos.java +++ b/src/main/java/com/hbm/util/fauxpointtwelve/BlockPos.java @@ -9,9 +9,9 @@ import net.minecraftforge.common.util.ForgeDirection; */ public class BlockPos implements Cloneable { - private final int x; - private final int y; - private final int z; + private int x; + private int y; + private int z; public BlockPos(int x, int y, int z) { this.x = x; @@ -27,6 +27,15 @@ public class BlockPos implements Cloneable { this((int)MathHelper.floor_double(x), (int)MathHelper.floor_double(y), (int)MathHelper.floor_double(z)); } + /** Basically a setter for the coords. Violates the "muh unmutability" horseshit I don't care about and + * lets me re-use the same instance for a ton of checks. RAM has priority over stupid religious bullshit. */ + public BlockPos mutate(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + return this; + } + public BlockPos add(int x, int y, int z) { return x == 0 && y == 0 && z == 0 ? this : new BlockPos(this.getX() + x, this.getY() + y, this.getZ() + z); } diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 10bc7c4e5..cb0258ef3 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5042,7 +5042,7 @@ tile.foundry_channel.name=Foundry Channel tile.foundry_tank.name=Foundry Storage Basin tile.foundry_mold.name=Shallow Foundry Basin tile.foundry_outlet.name=Foundry Outlet -tile.foundry_slagtap.name=Foundry Slag Outlet +tile.foundry_slagtap.name=Foundry Spill Outlet tile.fraction_spacer.name=Fractioning Tower Separator tile.frozen_dirt.name=Frozen Dirt tile.frozen_grass.name=Frozen Grass diff --git a/src/main/resources/assets/hbm/models/reactors/icf.obj b/src/main/resources/assets/hbm/models/reactors/icf.obj index 8c4daf462..9ff991a0d 100644 --- a/src/main/resources/assets/hbm/models/reactors/icf.obj +++ b/src/main/resources/assets/hbm/models/reactors/icf.obj @@ -4191,42 +4191,42 @@ vt 0.817708 0.830128 vt 0.726543 0.925696 vt 0.734335 0.942308 vt 0.710957 0.958920 -vt 0.978416 0.920329 -vt 0.988115 0.910733 -vt 0.988115 0.917130 -vt 0.978417 0.811576 -vt 0.988115 0.821172 -vt 0.978417 0.824371 -vt 0.978417 0.849960 -vt 0.988116 0.859555 -vt 0.978417 0.862754 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.926726 -vt 0.988115 0.936322 -vt 0.978417 0.939520 -vt 0.978416 0.881946 -vt 0.988115 0.872350 -vt 0.988115 0.878747 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.945918 -vt 0.988115 0.955513 -vt 0.978417 0.958712 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.965109 -vt 0.988115 0.974705 -vt 0.978417 0.977904 +vt 0.979167 0.919872 +vt 0.989583 0.910256 +vt 0.989583 0.916667 +vt 0.979167 0.810897 +vt 0.989583 0.820513 +vt 0.979167 0.823718 +vt 0.979167 0.849359 +vt 0.989583 0.858974 +vt 0.979167 0.862179 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.926282 +vt 0.989583 0.935897 +vt 0.979167 0.939103 +vt 0.979167 0.881410 +vt 0.989583 0.871795 +vt 0.989583 0.878205 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.945513 +vt 0.989583 0.955128 +vt 0.979167 0.958333 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.964744 +vt 0.989583 0.974359 +vt 0.979167 0.977564 vt 0.765625 0.923077 vt 0.770833 0.926282 vt 0.765625 0.929487 @@ -5029,42 +5029,42 @@ vt 0.817708 0.830128 vt 0.710957 0.958920 vt 0.710957 0.925696 vt 0.734335 0.942308 -vt 0.978416 0.920329 -vt 0.988115 0.910733 -vt 0.988115 0.917130 -vt 0.978417 0.824371 -vt 0.988115 0.814775 -vt 0.988115 0.821172 -vt 0.978417 0.849960 -vt 0.988116 0.859555 -vt 0.978417 0.862754 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.939520 -vt 0.988116 0.929924 -vt 0.988115 0.936322 -vt 0.978416 0.869151 -vt 0.988115 0.878747 -vt 0.978416 0.881946 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.958712 -vt 0.988115 0.949116 -vt 0.988115 0.955513 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.965109 -vt 0.988115 0.974705 -vt 0.978417 0.977904 +vt 0.979167 0.919872 +vt 0.989583 0.910256 +vt 0.989583 0.916667 +vt 0.979167 0.823718 +vt 0.989583 0.814103 +vt 0.989583 0.820513 +vt 0.979167 0.849359 +vt 0.989583 0.858974 +vt 0.979167 0.862179 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.939103 +vt 0.989583 0.929487 +vt 0.989583 0.935897 +vt 0.979167 0.868590 +vt 0.989583 0.878205 +vt 0.979167 0.881410 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.958333 +vt 0.989583 0.948718 +vt 0.989583 0.955128 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.964744 +vt 0.989583 0.974359 +vt 0.979167 0.977564 vt 0.765625 0.923077 vt 0.770833 0.926282 vt 0.765625 0.929487 @@ -5136,42 +5136,42 @@ vt 0.817708 0.830128 vt 0.726543 0.925696 vt 0.734335 0.942308 vt 0.710957 0.958920 -vt 0.978416 0.920329 -vt 0.988115 0.910733 -vt 0.988115 0.917130 -vt 0.978417 0.824371 -vt 0.988115 0.814775 -vt 0.988115 0.821172 -vt 0.978417 0.849960 -vt 0.988116 0.859555 -vt 0.978417 0.862754 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.939520 -vt 0.988116 0.929924 -vt 0.988115 0.936322 -vt 0.978416 0.881946 -vt 0.988115 0.872350 -vt 0.988115 0.878747 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.945918 -vt 0.988115 0.955513 -vt 0.978417 0.958712 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.965109 -vt 0.988115 0.974705 -vt 0.978417 0.977904 +vt 0.979167 0.919872 +vt 0.989583 0.910256 +vt 0.989583 0.916667 +vt 0.979167 0.823718 +vt 0.989583 0.814103 +vt 0.989583 0.820513 +vt 0.979167 0.849359 +vt 0.989583 0.858974 +vt 0.979167 0.862179 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.939103 +vt 0.989583 0.929487 +vt 0.989583 0.935897 +vt 0.979167 0.881410 +vt 0.989583 0.871795 +vt 0.989583 0.878205 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.945513 +vt 0.989583 0.955128 +vt 0.979167 0.958333 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.964744 +vt 0.989583 0.974359 +vt 0.979167 0.977564 vt 0.765625 0.923077 vt 0.770833 0.926282 vt 0.765625 0.929487 @@ -5243,42 +5243,42 @@ vt 0.817708 0.830128 vt 0.726543 0.958920 vt 0.710957 0.958920 vt 0.710957 0.925696 -vt 0.978416 0.907534 -vt 0.988115 0.917130 -vt 0.978416 0.920329 -vt 0.978417 0.811576 -vt 0.988115 0.821172 -vt 0.978417 0.824371 -vt 0.978417 0.862754 -vt 0.988115 0.853158 -vt 0.988116 0.859555 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.926726 -vt 0.988115 0.936322 -vt 0.978417 0.939520 -vt 0.978416 0.881946 -vt 0.988115 0.872350 -vt 0.988115 0.878747 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.958712 -vt 0.988115 0.949116 -vt 0.988115 0.955513 -vt 0.978417 0.901137 -vt 0.988115 0.891541 -vt 0.988115 0.897939 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.843562 -vt 0.988115 0.833967 -vt 0.988115 0.840364 -vt 0.978417 0.977904 -vt 0.988115 0.968308 -vt 0.988115 0.974705 +vt 0.979167 0.907051 +vt 0.989583 0.916667 +vt 0.979167 0.919872 +vt 0.979167 0.810897 +vt 0.989583 0.820513 +vt 0.979167 0.823718 +vt 0.979167 0.862179 +vt 0.989583 0.852564 +vt 0.989583 0.858974 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.926282 +vt 0.989583 0.935897 +vt 0.979167 0.939103 +vt 0.979167 0.881410 +vt 0.989583 0.871795 +vt 0.989583 0.878205 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.958333 +vt 0.989583 0.948718 +vt 0.989583 0.955128 +vt 0.979167 0.900641 +vt 0.989583 0.891026 +vt 0.989583 0.897436 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.842949 +vt 0.989583 0.833333 +vt 0.989583 0.839744 +vt 0.979167 0.977564 +vt 0.989583 0.967949 +vt 0.989583 0.974359 vt 0.765625 0.929487 vt 0.770833 0.923077 vt 0.770833 0.926282 @@ -5351,42 +5351,42 @@ vt 0.817708 0.830128 vt 0.726543 0.958920 vt 0.710957 0.958920 vt 0.710957 0.925696 -vt 0.978416 0.920329 -vt 0.988115 0.910733 -vt 0.988115 0.917130 -vt 0.978417 0.824371 -vt 0.988115 0.814775 -vt 0.988115 0.821172 -vt 0.978417 0.862754 -vt 0.988115 0.853158 -vt 0.988116 0.859555 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.939520 -vt 0.988116 0.929924 -vt 0.988115 0.936322 -vt 0.978416 0.869151 -vt 0.988115 0.878747 -vt 0.978416 0.881946 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.945918 -vt 0.988115 0.955513 -vt 0.978417 0.958712 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.965109 -vt 0.988115 0.974705 -vt 0.978417 0.977904 +vt 0.979167 0.919872 +vt 0.989583 0.910256 +vt 0.989583 0.916667 +vt 0.979167 0.823718 +vt 0.989583 0.814103 +vt 0.989583 0.820513 +vt 0.979167 0.862179 +vt 0.989583 0.852564 +vt 0.989583 0.858974 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.939103 +vt 0.989583 0.929487 +vt 0.989583 0.935897 +vt 0.979167 0.868590 +vt 0.989583 0.878205 +vt 0.979167 0.881410 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.945513 +vt 0.989583 0.955128 +vt 0.979167 0.958333 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.964744 +vt 0.989583 0.974359 +vt 0.979167 0.977564 vt 0.765625 0.923077 vt 0.770833 0.926282 vt 0.765625 0.929487 @@ -5420,42 +5420,42 @@ vt 0.770833 0.958333 vt 0.723980 0.967949 vt 0.726573 0.962420 vt 0.734353 0.967949 -vt 0.978416 0.920329 -vt 0.988115 0.910733 -vt 0.988115 0.917130 -vt 0.978417 0.811576 -vt 0.988115 0.821172 -vt 0.978417 0.824371 -vt 0.978417 0.849960 -vt 0.988116 0.859555 -vt 0.978417 0.862754 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.926726 -vt 0.988115 0.936322 -vt 0.978417 0.939520 -vt 0.978416 0.881946 -vt 0.988115 0.872350 -vt 0.988115 0.878747 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.958712 -vt 0.988115 0.949116 -vt 0.988115 0.955513 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.965109 -vt 0.988115 0.974705 -vt 0.978417 0.977904 +vt 0.979167 0.919872 +vt 0.989583 0.910256 +vt 0.989583 0.916667 +vt 0.979167 0.810897 +vt 0.989583 0.820513 +vt 0.979167 0.823718 +vt 0.979167 0.849359 +vt 0.989583 0.858974 +vt 0.979167 0.862179 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.926282 +vt 0.989583 0.935897 +vt 0.979167 0.939103 +vt 0.979167 0.881410 +vt 0.989583 0.871795 +vt 0.989583 0.878205 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.958333 +vt 0.989583 0.948718 +vt 0.989583 0.955128 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.964744 +vt 0.989583 0.974359 +vt 0.979167 0.977564 vt 0.765625 0.923077 vt 0.770833 0.926282 vt 0.765625 0.929487 @@ -5593,42 +5593,42 @@ vt 0.817708 0.830128 vt 0.726543 0.925696 vt 0.734335 0.942308 vt 0.710957 0.958920 -vt 0.978416 0.920329 -vt 0.988115 0.910733 -vt 0.988115 0.917130 -vt 0.978417 0.811576 -vt 0.988115 0.821172 -vt 0.978417 0.824371 -vt 0.978417 0.849960 -vt 0.988116 0.859555 -vt 0.978417 0.862754 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.939520 -vt 0.988116 0.929924 -vt 0.988115 0.936322 -vt 0.978416 0.881946 -vt 0.988115 0.872350 -vt 0.988115 0.878747 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.958712 -vt 0.988115 0.949116 -vt 0.988115 0.955513 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.977904 -vt 0.988115 0.968308 -vt 0.988115 0.974705 +vt 0.979167 0.919872 +vt 0.989583 0.910256 +vt 0.989583 0.916667 +vt 0.979167 0.810897 +vt 0.989583 0.820513 +vt 0.979167 0.823718 +vt 0.979167 0.849359 +vt 0.989583 0.858974 +vt 0.979167 0.862179 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.939103 +vt 0.989583 0.929487 +vt 0.989583 0.935897 +vt 0.979167 0.881410 +vt 0.989583 0.871795 +vt 0.989583 0.878205 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.958333 +vt 0.989583 0.948718 +vt 0.989583 0.955128 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.977564 +vt 0.989583 0.967949 +vt 0.989583 0.974359 vt 0.765625 0.929487 vt 0.770833 0.923077 vt 0.770833 0.926282 @@ -5699,42 +5699,42 @@ vt 0.822917 0.830128 vt 0.726543 0.925696 vt 0.734335 0.942308 vt 0.710957 0.958920 -vt 0.978416 0.907534 -vt 0.988115 0.917130 -vt 0.978416 0.920329 -vt 0.978417 0.824371 -vt 0.988115 0.814775 -vt 0.988115 0.821172 -vt 0.978417 0.849960 -vt 0.988116 0.859555 -vt 0.978417 0.862754 -vt 0.978417 0.984301 -vt 0.988115 0.993896 -vt 0.978417 0.997095 -vt 0.978417 0.939520 -vt 0.988116 0.929924 -vt 0.988115 0.936322 -vt 0.978416 0.881946 -vt 0.988115 0.872350 -vt 0.988115 0.878747 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.945918 -vt 0.988115 0.955513 -vt 0.978417 0.958712 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.965109 -vt 0.988115 0.974705 -vt 0.978417 0.977904 +vt 0.979167 0.907051 +vt 0.989583 0.916667 +vt 0.979167 0.919872 +vt 0.979167 0.823718 +vt 0.989583 0.814103 +vt 0.989583 0.820513 +vt 0.979167 0.849359 +vt 0.989583 0.858974 +vt 0.979167 0.862179 +vt 0.979167 0.983974 +vt 0.989583 0.993590 +vt 0.979167 0.996795 +vt 0.979167 0.939103 +vt 0.989583 0.929487 +vt 0.989583 0.935897 +vt 0.979167 0.881410 +vt 0.989583 0.871795 +vt 0.989583 0.878205 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.945513 +vt 0.989583 0.955128 +vt 0.979167 0.958333 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.964744 +vt 0.989583 0.974359 +vt 0.979167 0.977564 vt 0.765625 0.929487 vt 0.770833 0.923077 vt 0.770833 0.926282 @@ -5805,42 +5805,42 @@ vt 0.817708 0.830128 vt 0.726543 0.958920 vt 0.710957 0.958920 vt 0.710957 0.925696 -vt 0.978416 0.907534 -vt 0.988115 0.917130 -vt 0.978416 0.920329 -vt 0.978417 0.811576 -vt 0.988115 0.821172 -vt 0.978417 0.824371 -vt 0.978417 0.862754 -vt 0.988115 0.853158 -vt 0.988116 0.859555 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.926726 -vt 0.988115 0.936322 -vt 0.978417 0.939520 -vt 0.978416 0.869151 -vt 0.988115 0.878747 -vt 0.978416 0.881946 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.958712 -vt 0.988115 0.949116 -vt 0.988115 0.955513 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.792385 -vt 0.988115 0.801981 -vt 0.978417 0.805179 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.977904 -vt 0.988115 0.968308 -vt 0.988115 0.974705 +vt 0.979167 0.907051 +vt 0.989583 0.916667 +vt 0.979167 0.919872 +vt 0.979167 0.810897 +vt 0.989583 0.820513 +vt 0.979167 0.823718 +vt 0.979167 0.862179 +vt 0.989583 0.852564 +vt 0.989583 0.858974 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.926282 +vt 0.989583 0.935897 +vt 0.979167 0.939103 +vt 0.979167 0.868590 +vt 0.989583 0.878205 +vt 0.979167 0.881410 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.958333 +vt 0.989583 0.948718 +vt 0.989583 0.955128 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.791667 +vt 0.989583 0.801282 +vt 0.979167 0.804487 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.977564 +vt 0.989583 0.967949 +vt 0.989583 0.974359 vt 0.765625 0.929487 vt 0.770833 0.923077 vt 0.770833 0.926282 @@ -5912,42 +5912,42 @@ vt 0.817708 0.830128 vt 0.726543 0.925696 vt 0.734335 0.942308 vt 0.710957 0.958920 -vt 0.978416 0.920329 -vt 0.988115 0.910733 -vt 0.988115 0.917130 -vt 0.978417 0.824371 -vt 0.988115 0.814775 -vt 0.988115 0.821172 -vt 0.978417 0.862754 -vt 0.988115 0.853158 -vt 0.988116 0.859555 -vt 0.978417 0.997095 -vt 0.988115 0.987499 -vt 0.988115 0.993896 -vt 0.978417 0.939520 -vt 0.988116 0.929924 -vt 0.988115 0.936322 -vt 0.978416 0.881946 -vt 0.988115 0.872350 -vt 0.988115 0.878747 -vt 0.978417 0.773193 -vt 0.988115 0.782789 -vt 0.978417 0.785988 -vt 0.978417 0.958712 -vt 0.988115 0.949116 -vt 0.988115 0.955513 -vt 0.978417 0.888343 -vt 0.988115 0.897939 -vt 0.978417 0.901137 -vt 0.978417 0.805179 -vt 0.988115 0.795583 -vt 0.988115 0.801981 -vt 0.978417 0.830768 -vt 0.988115 0.840364 -vt 0.978417 0.843562 -vt 0.978417 0.965109 -vt 0.988115 0.974705 -vt 0.978417 0.977904 +vt 0.979167 0.919872 +vt 0.989583 0.910256 +vt 0.989583 0.916667 +vt 0.979167 0.823718 +vt 0.989583 0.814103 +vt 0.989583 0.820513 +vt 0.979167 0.862179 +vt 0.989583 0.852564 +vt 0.989583 0.858974 +vt 0.979167 0.996795 +vt 0.989583 0.987179 +vt 0.989583 0.993590 +vt 0.979167 0.939103 +vt 0.989583 0.929487 +vt 0.989583 0.935897 +vt 0.979167 0.881410 +vt 0.989583 0.871795 +vt 0.989583 0.878205 +vt 0.979167 0.772436 +vt 0.989583 0.782051 +vt 0.979167 0.785256 +vt 0.979167 0.958333 +vt 0.989583 0.948718 +vt 0.989583 0.955128 +vt 0.979167 0.887821 +vt 0.989583 0.897436 +vt 0.979167 0.900641 +vt 0.979167 0.804487 +vt 0.989583 0.794872 +vt 0.989583 0.801282 +vt 0.979167 0.830128 +vt 0.989583 0.839744 +vt 0.979167 0.842949 +vt 0.979167 0.964744 +vt 0.989583 0.974359 +vt 0.979167 0.977564 vt 0.765625 0.923077 vt 0.770833 0.926282 vt 0.765625 0.929487 @@ -6209,18 +6209,18 @@ vt 0.705253 0.932717 vt 0.710957 0.925696 vt 0.718750 0.923126 vt 0.732247 0.932717 -vt 0.978416 0.907534 -vt 0.988115 0.814775 -vt 0.988115 0.853158 -vt 0.978417 0.984301 -vt 0.988116 0.929924 -vt 0.978416 0.869151 -vt 0.988115 0.776392 -vt 0.988115 0.949116 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.988115 0.968308 +vt 0.979167 0.907051 +vt 0.989583 0.814103 +vt 0.989583 0.852564 +vt 0.979167 0.983974 +vt 0.989583 0.929487 +vt 0.979167 0.868590 +vt 0.989583 0.775641 +vt 0.989583 0.948718 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.989583 0.967949 vt 0.770833 0.923077 vt 0.770833 0.980769 vt 0.770833 0.961538 @@ -6381,18 +6381,18 @@ vt 0.705253 0.932717 vt 0.718750 0.923126 vt 0.726543 0.925696 vt 0.732247 0.932717 -vt 0.978416 0.907534 -vt 0.978417 0.811576 -vt 0.988115 0.853158 -vt 0.978417 0.984301 -vt 0.978417 0.926726 -vt 0.988115 0.872350 -vt 0.988115 0.776392 -vt 0.978417 0.945918 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.988115 0.968308 +vt 0.979167 0.907051 +vt 0.979167 0.810897 +vt 0.989583 0.852564 +vt 0.979167 0.983974 +vt 0.979167 0.926282 +vt 0.989583 0.871795 +vt 0.989583 0.775641 +vt 0.979167 0.945513 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.989583 0.967949 vt 0.770833 0.923077 vt 0.770833 0.980769 vt 0.770833 0.929487 @@ -6431,18 +6431,18 @@ vt 0.705253 0.932717 vt 0.710957 0.925696 vt 0.718750 0.923126 vt 0.732247 0.932717 -vt 0.978416 0.907534 -vt 0.978417 0.811576 -vt 0.988115 0.853158 -vt 0.978417 0.984301 -vt 0.978417 0.926726 -vt 0.978416 0.869151 -vt 0.988115 0.776392 -vt 0.988115 0.949116 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.988115 0.968308 +vt 0.979167 0.907051 +vt 0.979167 0.810897 +vt 0.989583 0.852564 +vt 0.979167 0.983974 +vt 0.979167 0.926282 +vt 0.979167 0.868590 +vt 0.989583 0.775641 +vt 0.989583 0.948718 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.989583 0.967949 vt 0.770833 0.923077 vt 0.770833 0.980769 vt 0.770833 0.961538 @@ -6481,18 +6481,18 @@ vt 0.705253 0.932717 vt 0.718750 0.923126 vt 0.726543 0.925696 vt 0.732247 0.932717 -vt 0.988115 0.910733 -vt 0.988115 0.814775 -vt 0.978417 0.849960 -vt 0.978417 0.984301 -vt 0.988116 0.929924 -vt 0.978416 0.869151 -vt 0.988115 0.776392 -vt 0.978417 0.945918 -vt 0.978417 0.888343 -vt 0.978417 0.792385 -vt 0.978417 0.830768 -vt 0.978417 0.965109 +vt 0.989583 0.910256 +vt 0.989583 0.814103 +vt 0.979167 0.849359 +vt 0.979167 0.983974 +vt 0.989583 0.929487 +vt 0.979167 0.868590 +vt 0.989583 0.775641 +vt 0.979167 0.945513 +vt 0.979167 0.887821 +vt 0.979167 0.791667 +vt 0.979167 0.830128 +vt 0.979167 0.964744 vt 0.765625 0.923077 vt 0.770833 0.980769 vt 0.770833 0.987179 @@ -6530,18 +6530,18 @@ vt 0.705253 0.932717 vt 0.718750 0.923126 vt 0.726543 0.925696 vt 0.732247 0.932717 -vt 0.978416 0.907534 -vt 0.978417 0.811576 -vt 0.978417 0.849960 -vt 0.978417 0.984301 -vt 0.978417 0.926726 -vt 0.988115 0.872350 -vt 0.988115 0.776392 -vt 0.988115 0.949116 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.988115 0.968308 +vt 0.979167 0.907051 +vt 0.979167 0.810897 +vt 0.979167 0.849359 +vt 0.979167 0.983974 +vt 0.979167 0.926282 +vt 0.989583 0.871795 +vt 0.989583 0.775641 +vt 0.989583 0.948718 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.989583 0.967949 vt 0.770833 0.923077 vt 0.770833 0.980769 vt 0.770833 0.961538 @@ -6558,18 +6558,18 @@ vt 0.733658 0.964757 vt 0.733658 0.971141 vt 0.731760 0.973477 vt 0.729167 0.974332 -vt 0.978416 0.907534 -vt 0.988115 0.814775 -vt 0.988115 0.853158 -vt 0.978417 0.984301 -vt 0.988116 0.929924 -vt 0.978416 0.869151 -vt 0.988115 0.776392 -vt 0.978417 0.945918 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.988115 0.968308 +vt 0.979167 0.907051 +vt 0.989583 0.814103 +vt 0.989583 0.852564 +vt 0.979167 0.983974 +vt 0.989583 0.929487 +vt 0.979167 0.868590 +vt 0.989583 0.775641 +vt 0.979167 0.945513 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.989583 0.967949 vt 0.770833 0.923077 vt 0.770833 0.961538 vt 0.770833 0.942308 @@ -6628,18 +6628,18 @@ vt 0.705253 0.932717 vt 0.710957 0.925696 vt 0.718750 0.923126 vt 0.732247 0.932717 -vt 0.978416 0.907534 -vt 0.988115 0.814775 -vt 0.988115 0.853158 -vt 0.978417 0.984301 -vt 0.978417 0.926726 -vt 0.978416 0.869151 -vt 0.988115 0.776392 -vt 0.978417 0.945918 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.978417 0.965109 +vt 0.979167 0.907051 +vt 0.989583 0.814103 +vt 0.989583 0.852564 +vt 0.979167 0.983974 +vt 0.979167 0.926282 +vt 0.979167 0.868590 +vt 0.989583 0.775641 +vt 0.979167 0.945513 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.979167 0.964744 vt 0.765625 0.923077 vt 0.770833 0.929487 vt 0.770833 0.942308 @@ -6679,18 +6679,18 @@ vt 0.705253 0.932717 vt 0.710957 0.925696 vt 0.718750 0.923126 vt 0.732247 0.932717 -vt 0.988115 0.910733 -vt 0.978417 0.811576 -vt 0.988115 0.853158 -vt 0.988115 0.987499 -vt 0.978417 0.926726 -vt 0.978416 0.869151 -vt 0.988115 0.776392 -vt 0.988115 0.949116 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.988115 0.968308 +vt 0.989583 0.910256 +vt 0.979167 0.810897 +vt 0.989583 0.852564 +vt 0.989583 0.987179 +vt 0.979167 0.926282 +vt 0.979167 0.868590 +vt 0.989583 0.775641 +vt 0.989583 0.948718 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.989583 0.967949 vt 0.765625 0.923077 vt 0.770833 0.980769 vt 0.770833 0.961538 @@ -6730,18 +6730,18 @@ vt 0.705253 0.932717 vt 0.718750 0.923126 vt 0.726543 0.925696 vt 0.732247 0.932717 -vt 0.988115 0.910733 -vt 0.988115 0.814775 -vt 0.978417 0.849960 -vt 0.978417 0.984301 -vt 0.988116 0.929924 -vt 0.988115 0.872350 -vt 0.988115 0.776392 -vt 0.978417 0.945918 -vt 0.988115 0.891541 -vt 0.988115 0.795583 -vt 0.988115 0.833967 -vt 0.978417 0.965109 +vt 0.989583 0.910256 +vt 0.989583 0.814103 +vt 0.979167 0.849359 +vt 0.979167 0.983974 +vt 0.989583 0.929487 +vt 0.989583 0.871795 +vt 0.989583 0.775641 +vt 0.979167 0.945513 +vt 0.989583 0.891026 +vt 0.989583 0.794872 +vt 0.989583 0.833333 +vt 0.979167 0.964744 vt 0.765625 0.923077 vt 0.770833 0.980769 vt 0.770833 0.929487 @@ -6780,18 +6780,18 @@ vt 0.703165 0.942308 vt 0.705253 0.932717 vt 0.718750 0.923126 vt 0.732247 0.932717 -vt 0.978416 0.907534 -vt 0.978417 0.811576 -vt 0.978417 0.849960 -vt 0.978417 0.984301 -vt 0.978417 0.926726 -vt 0.978416 0.869151 -vt 0.988115 0.776392 -vt 0.978417 0.945918 -vt 0.988115 0.891541 -vt 0.978417 0.792385 -vt 0.988115 0.833967 -vt 0.988115 0.968308 +vt 0.979167 0.907051 +vt 0.979167 0.810897 +vt 0.979167 0.849359 +vt 0.979167 0.983974 +vt 0.979167 0.926282 +vt 0.979167 0.868590 +vt 0.989583 0.775641 +vt 0.979167 0.945513 +vt 0.989583 0.891026 +vt 0.979167 0.791667 +vt 0.989583 0.833333 +vt 0.989583 0.967949 vt 0.770833 0.923077 vt 0.770833 0.980769 vt 0.770833 0.961538 @@ -7414,31 +7414,31 @@ vt 1.000000 0.086538 vt 0.718750 0.769213 vt 0.781264 0.846154 vt 0.718750 0.923094 -vt 0.918169 0.849960 +vt 0.916667 0.849359 vt 0.901042 0.865385 vt 0.901042 0.846154 -vt 0.918169 0.881946 +vt 0.916667 0.881410 vt 0.901042 0.884615 -vt 0.918169 0.888343 +vt 0.916667 0.887821 vt 0.901042 0.903846 -vt 0.918169 0.920329 +vt 0.916667 0.919872 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.958712 +vt 0.916667 0.958333 vt 0.901042 0.961538 -vt 0.918169 0.965109 +vt 0.916667 0.964744 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 -vt 0.918169 0.773193 +vt 0.916667 0.772436 vt 0.901042 0.788462 vt 0.901042 0.769231 -vt 0.918169 0.805179 +vt 0.916667 0.804487 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.830768 +vt 0.916667 0.830128 vt 0.838542 0.942308 vt 0.838542 0.884615 vt 0.838542 0.788462 @@ -7464,17 +7464,17 @@ vt 0.781250 0.945513 vt 0.781250 0.887821 vt 0.781250 0.791667 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.862754 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.869151 -vt 0.918169 0.785987 -vt 0.918169 0.945918 -vt 0.918169 0.901137 -vt 0.918169 0.792385 -vt 0.918169 0.843562 -vt 0.918169 0.977903 +vt 0.916667 0.810897 +vt 0.916667 0.862179 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.868590 +vt 0.916667 0.785256 +vt 0.916667 0.945513 +vt 0.916667 0.900641 +vt 0.916667 0.791667 +vt 0.916667 0.842949 +vt 0.916667 0.977564 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -8340,18 +8340,18 @@ vt 0.901042 0.826923 vt 0.901042 0.807692 vt 0.901042 0.903846 vt 0.901042 0.961538 -vt 0.918169 0.830768 -vt 0.918169 0.824371 -vt 0.918169 0.805179 -vt 0.918169 0.773193 -vt 0.918169 0.984301 -vt 0.918169 0.965109 -vt 0.918169 0.958712 -vt 0.918169 0.926726 -vt 0.918169 0.907534 -vt 0.918169 0.888343 -vt 0.918169 0.869151 -vt 0.918169 0.849960 +vt 0.916667 0.830128 +vt 0.916667 0.823718 +vt 0.916667 0.804487 +vt 0.916667 0.772436 +vt 0.916667 0.983974 +vt 0.916667 0.964744 +vt 0.916667 0.958333 +vt 0.916667 0.926282 +vt 0.916667 0.907051 +vt 0.916667 0.887821 +vt 0.916667 0.868590 +vt 0.916667 0.849359 vt 0.526042 0.903846 vt 0.609375 0.910256 vt 0.526042 0.910256 @@ -8437,30 +8437,30 @@ vt 0.520833 0.935897 vt 0.520833 0.948718 vt 0.354167 0.961538 vt 0.901042 0.846154 -vt 0.918169 0.862754 +vt 0.916667 0.862179 vt 0.901042 0.865385 -vt 0.918169 0.869151 +vt 0.916667 0.868590 vt 0.901042 0.884615 -vt 0.918169 0.888343 +vt 0.916667 0.887821 vt 0.901042 0.903846 -vt 0.918169 0.907534 +vt 0.916667 0.907051 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.945918 +vt 0.916667 0.945513 vt 0.901042 0.961538 -vt 0.918169 0.977903 +vt 0.916667 0.977564 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 vt 0.901042 0.769231 -vt 0.918169 0.785987 +vt 0.916667 0.785256 vt 0.901042 0.788462 -vt 0.918169 0.792385 +vt 0.916667 0.791667 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.843562 +vt 0.916667 0.842949 vt 0.838542 0.961538 vt 0.838542 0.942308 vt 0.838542 0.884615 @@ -8491,16 +8491,16 @@ vt 0.781250 0.945513 vt 0.781250 0.887821 vt 0.781250 0.791667 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.881946 -vt 0.918169 0.958712 -vt 0.918169 0.901137 -vt 0.918169 0.805179 -vt 0.918169 0.830768 -vt 0.918169 0.965109 -vt 0.918169 0.920329 +vt 0.916667 0.810897 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.881410 +vt 0.916667 0.958333 +vt 0.916667 0.900641 +vt 0.916667 0.804487 +vt 0.916667 0.830128 +vt 0.916667 0.964744 +vt 0.916667 0.919872 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -8529,31 +8529,31 @@ vt 0.781250 0.935897 vt 0.781250 0.939103 vt 0.781250 0.951923 vt 0.781250 0.996795 -vt 0.918169 0.849960 +vt 0.916667 0.849359 vt 0.901042 0.865385 vt 0.901042 0.846154 -vt 0.918169 0.869151 +vt 0.916667 0.868590 vt 0.901042 0.884615 -vt 0.918169 0.901137 +vt 0.916667 0.900641 vt 0.901042 0.903846 -vt 0.918169 0.920329 +vt 0.916667 0.919872 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.958712 +vt 0.916667 0.958333 vt 0.901042 0.961538 -vt 0.918169 0.965109 +vt 0.916667 0.964744 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 -vt 0.918169 0.773193 +vt 0.916667 0.772436 vt 0.901042 0.788462 vt 0.901042 0.769231 -vt 0.918169 0.792385 +vt 0.916667 0.791667 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.830768 +vt 0.916667 0.830128 vt 0.838542 0.942308 vt 0.838542 0.903846 vt 0.838542 0.884615 @@ -8582,16 +8582,16 @@ vt 0.781250 0.897436 vt 0.781250 0.887821 vt 0.781250 0.791667 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.862754 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.881946 -vt 0.918169 0.785987 -vt 0.918169 0.888343 -vt 0.918169 0.805179 -vt 0.918169 0.843562 -vt 0.918169 0.977903 +vt 0.916667 0.810897 +vt 0.916667 0.862179 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.881410 +vt 0.916667 0.785256 +vt 0.916667 0.887821 +vt 0.916667 0.804487 +vt 0.916667 0.842949 +vt 0.916667 0.977564 vt 0.734375 0.980769 vt 0.734375 0.961538 vt 0.734375 0.923077 @@ -8621,30 +8621,30 @@ vt 0.781250 0.939103 vt 0.781250 0.951923 vt 0.781250 0.996795 vt 0.901042 0.846154 -vt 0.918169 0.862754 +vt 0.916667 0.862179 vt 0.901042 0.865385 -vt 0.918169 0.869151 +vt 0.916667 0.868590 vt 0.901042 0.884615 -vt 0.918169 0.888343 +vt 0.916667 0.887821 vt 0.901042 0.903846 -vt 0.918169 0.907534 +vt 0.916667 0.907051 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.945918 +vt 0.916667 0.945513 vt 0.901042 0.961538 -vt 0.918169 0.965109 +vt 0.916667 0.964744 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 vt 0.901042 0.769231 -vt 0.918169 0.785987 +vt 0.916667 0.785256 vt 0.901042 0.788462 -vt 0.918169 0.805179 +vt 0.916667 0.804487 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.843562 +vt 0.916667 0.842949 vt 0.838542 0.942308 vt 0.838542 0.884615 vt 0.838542 0.788462 @@ -8676,16 +8676,16 @@ vt 0.781250 0.801282 vt 0.781250 0.791667 vt 0.781250 0.839744 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.849960 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.881946 -vt 0.918169 0.773193 -vt 0.918169 0.958712 -vt 0.918169 0.901137 -vt 0.918169 0.977903 -vt 0.918169 0.920329 +vt 0.916667 0.810897 +vt 0.916667 0.849359 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.881410 +vt 0.916667 0.772436 +vt 0.916667 0.958333 +vt 0.916667 0.900641 +vt 0.916667 0.977564 +vt 0.916667 0.919872 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -8714,31 +8714,31 @@ vt 0.781250 0.939103 vt 0.781250 0.951923 vt 0.781250 0.993590 vt 0.781250 0.996795 -vt 0.918169 0.849960 +vt 0.916667 0.849359 vt 0.901042 0.865385 vt 0.901042 0.846154 -vt 0.918169 0.869151 +vt 0.916667 0.868590 vt 0.901042 0.884615 -vt 0.918169 0.901137 +vt 0.916667 0.900641 vt 0.901042 0.903846 -vt 0.918169 0.920329 +vt 0.916667 0.919872 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.958712 +vt 0.916667 0.958333 vt 0.901042 0.961538 -vt 0.918169 0.965109 +vt 0.916667 0.964744 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 -vt 0.918169 0.773193 +vt 0.916667 0.772436 vt 0.901042 0.788462 vt 0.901042 0.769231 -vt 0.918169 0.792385 +vt 0.916667 0.791667 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.830768 +vt 0.916667 0.830128 vt 0.838542 0.942308 vt 0.838542 0.884615 vt 0.838542 0.788462 @@ -8768,16 +8768,16 @@ vt 0.781250 0.887821 vt 0.781250 0.791667 vt 0.781250 0.839744 vt 0.781250 0.830128 -vt 0.918169 0.862754 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.881946 -vt 0.918169 0.785987 -vt 0.918169 0.945918 -vt 0.918169 0.888343 -vt 0.918169 0.805179 -vt 0.918169 0.843562 -vt 0.918169 0.977903 +vt 0.916667 0.862179 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.881410 +vt 0.916667 0.785256 +vt 0.916667 0.945513 +vt 0.916667 0.887821 +vt 0.916667 0.804487 +vt 0.916667 0.842949 +vt 0.916667 0.977564 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -8809,18 +8809,18 @@ vt 0.781250 0.951923 vt 0.781250 0.993590 vt 0.781250 0.996795 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.862754 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.881946 -vt 0.918169 0.785987 -vt 0.918169 0.945918 -vt 0.918169 0.901137 -vt 0.918169 0.792385 -vt 0.918169 0.843562 -vt 0.918169 0.977903 -vt 0.918169 0.920329 +vt 0.916667 0.810897 +vt 0.916667 0.862179 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.881410 +vt 0.916667 0.785256 +vt 0.916667 0.945513 +vt 0.916667 0.900641 +vt 0.916667 0.791667 +vt 0.916667 0.842949 +vt 0.916667 0.977564 +vt 0.916667 0.919872 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -8969,31 +8969,31 @@ vt 0.526042 0.910256 vt 0.484375 0.910256 vt 0.526042 0.884615 vt 0.526042 0.897436 -vt 0.918169 0.849960 +vt 0.916667 0.849359 vt 0.901042 0.865385 vt 0.901042 0.846154 -vt 0.918169 0.869151 +vt 0.916667 0.868590 vt 0.901042 0.884615 -vt 0.918169 0.901137 +vt 0.916667 0.900641 vt 0.901042 0.903846 -vt 0.918169 0.920329 +vt 0.916667 0.919872 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.945918 +vt 0.916667 0.945513 vt 0.901042 0.961538 -vt 0.918169 0.977903 +vt 0.916667 0.977564 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 vt 0.901042 0.769231 -vt 0.918169 0.785987 +vt 0.916667 0.785256 vt 0.901042 0.788462 -vt 0.918169 0.792385 +vt 0.916667 0.791667 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.843562 +vt 0.916667 0.842949 vt 0.838542 0.942308 vt 0.838542 0.903846 vt 0.838542 0.884615 @@ -9024,16 +9024,16 @@ vt 0.781250 0.887821 vt 0.781250 0.801282 vt 0.781250 0.791667 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.862754 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.881946 -vt 0.918169 0.958712 -vt 0.918169 0.805179 -vt 0.918169 0.830768 -vt 0.918169 0.965109 -vt 0.918169 0.907534 +vt 0.916667 0.810897 +vt 0.916667 0.862179 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.881410 +vt 0.916667 0.958333 +vt 0.916667 0.804487 +vt 0.916667 0.830128 +vt 0.916667 0.964744 +vt 0.916667 0.907051 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -9063,30 +9063,30 @@ vt 0.781250 0.939103 vt 0.781250 0.951923 vt 0.781250 0.996795 vt 0.901042 0.846154 -vt 0.918169 0.862754 +vt 0.916667 0.862179 vt 0.901042 0.865385 -vt 0.918169 0.881946 +vt 0.916667 0.881410 vt 0.901042 0.884615 -vt 0.918169 0.901137 +vt 0.916667 0.900641 vt 0.901042 0.903846 -vt 0.918169 0.920329 +vt 0.916667 0.919872 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.945918 +vt 0.916667 0.945513 vt 0.901042 0.961538 -vt 0.918169 0.965109 +vt 0.916667 0.964744 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 -vt 0.918169 0.773193 +vt 0.916667 0.772436 vt 0.901042 0.788462 vt 0.901042 0.769231 -vt 0.918169 0.792385 +vt 0.916667 0.791667 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.830768 +vt 0.916667 0.830128 vt 0.838542 0.942308 vt 0.838542 0.903846 vt 0.838542 0.884615 @@ -9118,17 +9118,17 @@ vt 0.781250 0.887821 vt 0.781250 0.791667 vt 0.781250 0.839744 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.849960 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.785987 -vt 0.918169 0.958712 -vt 0.918169 0.888343 -vt 0.918169 0.805179 -vt 0.918169 0.843562 -vt 0.918169 0.977903 -vt 0.918169 0.907534 +vt 0.916667 0.810897 +vt 0.916667 0.849359 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.785256 +vt 0.916667 0.958333 +vt 0.916667 0.887821 +vt 0.916667 0.804487 +vt 0.916667 0.842949 +vt 0.916667 0.977564 +vt 0.916667 0.907051 vt 0.734375 0.980769 vt 0.734375 0.961538 vt 0.734375 0.923077 @@ -9160,30 +9160,30 @@ vt 0.781250 0.939103 vt 0.781250 0.951923 vt 0.781250 0.996795 vt 0.901042 0.846154 -vt 0.918169 0.862754 +vt 0.916667 0.862179 vt 0.901042 0.865385 -vt 0.918169 0.869151 +vt 0.916667 0.868590 vt 0.901042 0.884615 -vt 0.918169 0.901137 +vt 0.916667 0.900641 vt 0.901042 0.903846 -vt 0.918169 0.907534 +vt 0.916667 0.907051 vt 0.901042 0.923077 -vt 0.918169 0.926726 +vt 0.916667 0.926282 vt 0.901042 0.942308 -vt 0.918169 0.945918 +vt 0.916667 0.945513 vt 0.901042 0.961538 -vt 0.918169 0.965109 +vt 0.916667 0.964744 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 vt 0.901042 0.769231 -vt 0.918169 0.785987 +vt 0.916667 0.785256 vt 0.901042 0.788462 -vt 0.918169 0.805179 +vt 0.916667 0.804487 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.843562 +vt 0.916667 0.842949 vt 0.838542 0.942308 vt 0.838542 0.884615 vt 0.838542 0.788462 @@ -9213,14 +9213,14 @@ vt 0.781250 0.887821 vt 0.781250 0.791667 vt 0.781250 0.839744 vt 0.781250 0.830128 -vt 0.918169 0.997095 -vt 0.918169 0.939520 -vt 0.918169 0.881946 -vt 0.918169 0.773193 -vt 0.918169 0.958712 -vt 0.918169 0.830768 -vt 0.918169 0.977903 -vt 0.918169 0.920329 +vt 0.916667 0.996795 +vt 0.916667 0.939103 +vt 0.916667 0.881410 +vt 0.916667 0.772436 +vt 0.916667 0.958333 +vt 0.916667 0.830128 +vt 0.916667 0.977564 +vt 0.916667 0.919872 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -9248,30 +9248,30 @@ vt 0.781250 0.939103 vt 0.781250 0.951923 vt 0.781250 0.996795 vt 0.901042 0.846154 -vt 0.918169 0.862754 +vt 0.916667 0.862179 vt 0.901042 0.865385 -vt 0.918169 0.881946 +vt 0.916667 0.881410 vt 0.901042 0.884615 -vt 0.918169 0.901137 +vt 0.916667 0.900641 vt 0.901042 0.903846 -vt 0.918169 0.907534 +vt 0.916667 0.907051 vt 0.901042 0.923077 -vt 0.918169 0.939520 +vt 0.916667 0.939103 vt 0.901042 0.942308 -vt 0.918169 0.958712 +vt 0.916667 0.958333 vt 0.901042 0.961538 -vt 0.918169 0.977903 +vt 0.916667 0.977564 vt 0.901042 0.980769 -vt 0.918169 0.984301 +vt 0.916667 0.983974 vt 0.901042 1.000000 -vt 0.918169 0.773193 +vt 0.916667 0.772436 vt 0.901042 0.788462 vt 0.901042 0.769231 -vt 0.918169 0.792385 +vt 0.916667 0.791667 vt 0.901042 0.807692 -vt 0.918169 0.824371 +vt 0.916667 0.823718 vt 0.901042 0.826923 -vt 0.918169 0.843562 +vt 0.916667 0.842949 vt 0.838542 0.942308 vt 0.838542 0.903846 vt 0.838542 0.884615 @@ -9304,14 +9304,14 @@ vt 0.781250 0.887821 vt 0.781250 0.791667 vt 0.781250 0.839744 vt 0.781250 0.830128 -vt 0.918169 0.811576 -vt 0.918169 0.849960 -vt 0.918169 0.997095 -vt 0.918169 0.785987 -vt 0.918169 0.888343 -vt 0.918169 0.805179 -vt 0.918169 0.965109 -vt 0.918169 0.920329 +vt 0.916667 0.810897 +vt 0.916667 0.849359 +vt 0.916667 0.996795 +vt 0.916667 0.785256 +vt 0.916667 0.887821 +vt 0.916667 0.804487 +vt 0.916667 0.964744 +vt 0.916667 0.919872 vt 0.734375 0.974359 vt 0.734375 0.980769 vt 0.734375 0.955128 @@ -9439,7 +9439,7 @@ vt 0.776506 0.816710 vt 0.776506 0.875598 vt 0.762954 0.900559 vt 0.742673 0.917238 -vt 0.918169 0.907534 +vt 0.916667 0.907051 vt 0.781250 0.974359 vt 0.781250 0.916667 vt 0.781250 0.820513 @@ -9522,8 +9522,8 @@ vt 0.354167 0.923077 vt 0.354167 0.910256 vt 0.354167 0.935897 vt 0.354167 0.948718 -vt 0.918169 0.849960 -vt 0.918169 0.773193 +vt 0.916667 0.849359 +vt 0.916667 0.772436 vt 0.781250 0.916667 vt 0.781250 0.820513 vt 0.781250 0.993590 @@ -9540,8 +9540,8 @@ vt 0.781250 0.987179 vt 0.781250 0.967949 vt 0.781250 0.948718 vt 0.781250 0.993590 -vt 0.918169 0.907534 -vt 0.918169 0.945918 +vt 0.916667 0.907051 +vt 0.916667 0.945513 vt 0.781250 0.916667 vt 0.781250 0.820513 vt 0.781250 0.858974 @@ -9560,8 +9560,8 @@ vt 0.781250 0.987179 vt 0.781250 0.967949 vt 0.781250 0.948718 vt 0.781250 0.993590 -vt 0.918169 0.792385 -vt 0.918169 0.830768 +vt 0.916667 0.791667 +vt 0.916667 0.830128 vt 0.838542 1.000000 vt 0.781250 0.916667 vt 0.781250 0.820513 @@ -9577,8 +9577,8 @@ vt 0.781250 0.929487 vt 0.781250 0.942308 vt 0.781250 0.987179 vt 0.781250 0.948718 -vt 0.918169 0.907534 -vt 0.918169 0.811576 +vt 0.916667 0.907051 +vt 0.916667 0.810897 vt 0.838542 1.000000 vt 0.781250 0.916667 vt 0.781250 0.820513 @@ -9624,8 +9624,8 @@ vt 0.520833 0.910256 vt 0.434896 0.910256 vt 0.656250 0.884615 vt 0.656250 0.897436 -vt 0.918169 0.888343 -vt 0.918169 0.773193 +vt 0.916667 0.887821 +vt 0.916667 0.772436 vt 0.781250 0.916667 vt 0.781250 0.820513 vt 0.781250 0.858974 @@ -9642,7 +9642,7 @@ vt 0.781250 0.929487 vt 0.781250 0.987179 vt 0.781250 0.948718 vt 0.781250 0.993590 -vt 0.918169 0.869151 +vt 0.916667 0.868590 vt 0.781250 0.916667 vt 0.781250 0.820513 vt 0.781250 0.858974 @@ -9656,10 +9656,10 @@ vt 0.781250 0.929487 vt 0.781250 0.987179 vt 0.781250 0.948718 vt 0.781250 0.993590 -vt 0.918169 0.849960 -vt 0.918169 0.888343 -vt 0.918169 0.792385 -vt 0.918169 0.811576 +vt 0.916667 0.849359 +vt 0.916667 0.887821 +vt 0.916667 0.791667 +vt 0.916667 0.810897 vt 0.838542 1.000000 vt 0.781250 0.916667 vt 0.781250 0.820513 @@ -9679,10 +9679,10 @@ vt 0.781250 0.942308 vt 0.781250 0.987179 vt 0.781250 0.948718 vt 0.781250 0.993590 -vt 0.918169 0.869151 -vt 0.918169 0.926726 -vt 0.918169 0.945918 -vt 0.918169 0.830768 +vt 0.916667 0.868590 +vt 0.916667 0.926282 +vt 0.916667 0.945513 +vt 0.916667 0.830128 vt 0.781250 0.916667 vt 0.781250 0.820513 vt 0.781250 0.858974 diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/stellar_flux.png b/src/main/resources/assets/hbm/textures/gui/fluids/stellar_flux.png new file mode 100644 index 000000000..ff5e2c9ff Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/stellar_flux.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/reactors/gui_icf.png b/src/main/resources/assets/hbm/textures/gui/reactors/gui_icf.png index cd2c35659..f78c497db 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/reactors/gui_icf.png and b/src/main/resources/assets/hbm/textures/gui/reactors/gui_icf.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/icf.png b/src/main/resources/assets/hbm/textures/models/machines/icf.png index cbf85a914..641a3b66c 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/icf.png and b/src/main/resources/assets/hbm/textures/models/machines/icf.png differ