Merge branch 'master' into abel-abilities

CONTRIBUTING.md

@@ -13,6 +13,7 @@ Things you should also avoid include:
 * duplicate util functions (just use what we have, man)
 * unused or half finished util functions (for obvious reasons)
 * half finished or obviously broken features (à la "bob will fix it, i'm sure of it", please don't do that)
+* updating the changelog (you're guaranteed to cause a merge conflict with that)
 
 ## Test your code
 

changelog

@@ -1,47 +1,10 @@
-## Added
-* Sandbags
-  * Connect to other sandbags or solid blocks
-  * Pretty
-* Wooden barrier
-  * Pretty
-  * Automatically walls off connected solid blocks in addition to the direction it was placed in
-* Some other wooden blocks like a roof, ceiling and scaffold
-* Flow control pump
-  * The fluid equivalent to a diode
-  * Supports up to 10,000mB/t
-  * Unlike the diode, it is configured via GUI
-  * Can be shut off with redstone like a fluid valve
-* Charge thrower
-  * A new weapon/tool
-  * Can fire two tiers of demolition charges or a grappling hook
-  * The grappling hook's line can be controlled via left and right mouse buttons
-* Anti-materiel rifle
-  * Fires 12.7mm of fun
-  * x5 magnification scope
-
 ## Changed
-* Increased bayonet damage from 5 to 7.5 hearts
+* All compound plates can now also be made in the assembler
-* Two numeric redstone over radio signals sent over the same channel will now be added together instead of one signal replacing the other
+* Opening crates when held is now disabled by default
-  * This means that reading the fill state of multiple batteries over the same channel should result the combined fill state of all batteries
-* Halved base spread of the .22 SMG
-* Certain secret guns now have a proper way of being obtained
-* Demolition mini nukes now create fire again
-* New server configs
-  * `CRATE_OPEN_HELD` can toggle whether crates can be opened when held
-  * `CRATE_KEEP_CONTENTS` can toggle whether crates keep their contents when broken
-  * `ITEM_HAZARD_DROP_TICKRATE` can change the time between ticks for dropped item hazard checks (gunpowder, lithium), default is 2, lowest is 1
-* Duds now have multiple variants
-  * Dismantling different variants yields different drops
-  * Magnetic extraction can no longer be performed
-* `isItemBlacklisted` on the item hazard checks now employs caching instead of doing a full ore dictionary lookup for every single check, this should make it marginally more performant
-* The unfinished trains stuff is no longer listed in the creative tabs
 
 ## Fixed
-* Fixed RoR controller having the wrong recipe
+* Fixed all dud variants having the balefire explosion effect
-* Either fixed the crate dupe/voiding issues or made them even worse
+* Fixed demolition charges being able to explode multiple times when hitting entities
-* Fixed skeletons and pedestals allowing blocks to be placed inside the player
+* Condensers are no longer affected by post-impact effects, fixing an issue where HP condenser tanks would go into the negatives
-* Fixed artillery shells not playing the explosion animation when directly impacting entities
+* Probably fixed particle accelerator recipe config not working
-* Fixed bauxite and malachite vein toggles being on backwards
+* Fixed potential dupe bug involving many held inventories
-* Fixed pneumatic tube order settings not saving
-* Fixed crash caused by launching ABMs with blank target designators
-* Fixed particle source throwing errors when trying to save nonexistant particles

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5334
+mod_build_number=5335
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\

src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java

@@ -83,8 +83,8 @@ public class BlockCrashedBomb extends BlockEnumMulti implements ITileEntityProvi
 
 		if(!world.isRemote) {
 
-			world.setBlockToAir(x, y, z);
 			EnumDudType type = EnumUtil.grabEnumSafely(EnumDudType.class, world.getBlockMetadata(x, y, z));
+			world.setBlockToAir(x, y, z);
 
 			if(type == type.BALEFIRE) {
 				EntityBalefire bf = new EntityBalefire(world);

src/main/java/com/hbm/config/ServerConfig.java

@@ -17,7 +17,7 @@ public class ServerConfig extends RunningConfig {
 	public static ConfigWrapper<Float> MINE_NUKE_DAMAGE =				new ConfigWrapper(100F);
 	public static ConfigWrapper<Float> MINE_NAVAL_DAMAGE =				new ConfigWrapper(60F);
 	public static ConfigWrapper<Boolean> TAINT_TRAILS =					new ConfigWrapper(false);
-	public static ConfigWrapper<Boolean> CRATE_OPEN_HELD =				new ConfigWrapper(true);
+	public static ConfigWrapper<Boolean> CRATE_ALLOW_OPEN_HELD =		new ConfigWrapper(false);
 	public static ConfigWrapper<Boolean> CRATE_KEEP_CONTENTS =			new ConfigWrapper(true);
 	public static ConfigWrapper<Integer> ITEM_HAZARD_DROP_TICKRATE =	new ConfigWrapper(2);
 
@@ -29,7 +29,7 @@ public class ServerConfig extends RunningConfig {
 		configMap.put("MINE_NUKE_DAMAGE", MINE_NUKE_DAMAGE);
 		configMap.put("MINE_NAVAL_DAMAGE", MINE_NAVAL_DAMAGE);
 		configMap.put("TAINT_TRAILS", TAINT_TRAILS);
-		configMap.put("CRATE_OPEN_HELD", CRATE_OPEN_HELD);
+		configMap.put("CRATE_ALLOW_OPEN_HELD", CRATE_ALLOW_OPEN_HELD);
 		configMap.put("CRATE_KEEP_CONTENTS", CRATE_KEEP_CONTENTS);
 		configMap.put("ITEM_HAZARD_DROP_TICKRATE", ITEM_HAZARD_DROP_TICKRATE);
 	}

src/main/java/com/hbm/handler/HbmKeybinds.java

@@ -14,6 +14,7 @@ import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.MouseInputEvent;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
 
 public class HbmKeybinds {
@@ -81,6 +82,7 @@ public class HbmKeybinds {
 	@SubscribeEvent
 	public void keyEvent(KeyInputEvent event) {
 		if (calculatorKey.getIsKeyPressed()) { // handle the calculator client-side only
+			Minecraft.getMinecraft().thePlayer.closeScreen();
 			FMLCommonHandler.instance().showGuiScreen(new GUICalculator());
 		}
 		

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

@@ -1076,6 +1076,31 @@ public class AssemblerRecipes extends SerializableRecipe {
 				new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BISMOID)
 			}, 100);
 		
+		
+		/// PLATES ///
+		makeRecipe(new ComparableStack(ModItems.plate_desh, 4), new AStack[] {
+				new OreDictStack(DESH.ingot(), 4),
+				new OreDictStack(ANY_PLASTIC.dust(), 2),
+				new OreDictStack(DURA.ingot(), 1),
+			}, 200);
+		makeRecipe(new ComparableStack(ModItems.plate_bismuth, 1), new AStack[] {
+				new ComparableStack(ModItems.nugget_bismuth, 2),
+				new OreDictStack(U238.billet(), 2),
+				new OreDictStack(NB.dust(), 1),
+			}, 200);
+		makeRecipe(new ComparableStack(ModItems.plate_euphemium, 1), new AStack[] {
+				new OreDictStack(EUPH.ingot(), 4),
+				new OreDictStack(AT.dust(), 3),
+				new OreDictStack(BI.dust(), 1),
+				new OreDictStack(VOLCANIC.gem(), 1),
+				new ComparableStack(ModItems.ingot_osmiridium),
+			}, 600);
+		makeRecipe(new ComparableStack(ModItems.plate_dineutronium, 4), new AStack[] {
+				new OreDictStack(DNT.ingot(), 4),
+				new ComparableStack(ModItems.powder_spark_mix, 2),
+				new OreDictStack(DESH.ingot(), 1),
+			}, 600);
+
 		makeRecipe(new ComparableStack(DictFrame.fromOne(ModBlocks.block_cap, EnumCapBlock.NUKA)), new AStack[] { new ComparableStack(ModItems.cap_nuka, 128) }, 10);
 		makeRecipe(new ComparableStack(DictFrame.fromOne(ModBlocks.block_cap, EnumCapBlock.QUANTUM)), new AStack[] { new ComparableStack(ModItems.cap_quantum, 128) }, 10);
 		makeRecipe(new ComparableStack(DictFrame.fromOne(ModBlocks.block_cap, EnumCapBlock.SPARKLE)), new AStack[] { new ComparableStack(ModItems.cap_sparkle, 128) }, 10);
@@ -1239,6 +1264,7 @@ public class AssemblerRecipes extends SerializableRecipe {
 				new OreDictStack(DURA.bolt(), 16),
 				new ComparableStack(ModItems.motor, 2)
 		}, 200);
+		
 		makeRecipe(new ComparableStack(ModBlocks.large_vehicle_door, 1), new AStack[]{new OreDictStack(STEEL.plateCast(), 16), new ComparableStack(ModItems.plate_polymer, 4), new ComparableStack(ModItems.motor, 4), new OreDictStack(DURA.bolt(), 16), new OreDictStack("dyeGreen", 4)}, 400);
 		makeRecipe(new ComparableStack(ModBlocks.water_door, 1), new AStack[]{new OreDictStack(STEEL.plate(), 16), new OreDictStack(DURA.bolt(), 4), new OreDictStack("dyeRed", 1)}, 200);
 		makeRecipe(new ComparableStack(ModBlocks.qe_containment, 1), new AStack[]{new OreDictStack(STEEL.plateCast(), 4), new OreDictStack(ALLOY.plate(), 4), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.motor, 2), new OreDictStack(DURA.bolt(), 32), new OreDictStack("dyeBlack", 4)}, 400);

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

@@ -168,10 +168,10 @@ public class ParticleAcceleratorRecipes extends SerializableRecipe {
 
 		this.recipes.add(new ParticleAcceleratorRecipe(
 				in[0],
-				in[1],
+				in.length > 1 ? in[1] : null,
 				momentum,
 				out[0],
-				out[1]
+				out.length > 1 ? out[1] : null
 				));
 	}
 

src/main/java/com/hbm/items/block/ItemBlockStorageCrate.java

@@ -30,7 +30,7 @@ public class ItemBlockStorageCrate extends ItemBlockBase implements IGUIProvider
 
 	@Override
 	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
-		if(!ServerConfig.CRATE_OPEN_HELD.get()) return stack;
+		if(!ServerConfig.CRATE_ALLOW_OPEN_HELD.get()) return stack;
 		
 		Block block = Block.getBlockFromItem(player.getHeldItem().getItem());
 		if(block == ModBlocks.mass_storage) return stack; // Genuinely can't figure out how to make this part work, so I'm just not gonna mess with it.

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

@@ -71,6 +71,7 @@ public class XFactoryTool {
 		vnt.setPlayerProcessor(new PlayerProcessorStandard());
 		vnt.setSFX(new ExplosionEffectWeapon(10, 2.5F, 1F));
 		vnt.explode();
+		bullet.setDead();
 	};
 	
 	public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_MORTAR_CHARGE = (bullet, mop) -> {
@@ -82,6 +83,7 @@ public class XFactoryTool {
 		vnt.setPlayerProcessor(new PlayerProcessorStandard());
 		ExplosionCreator.composeEffectSmall(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord + 0.5, mop.hitVec.zCoord);
 		vnt.explode();
+		bullet.setDead();
 	};
 
 	public static void init() {

src/main/java/com/hbm/lib/RefStrings.java

@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (5334)";
+	public static final String VERSION = "1.0.27 BETA (5335)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/main/ModEventHandlerClient.java

@@ -948,6 +948,7 @@ public class ModEventHandlerClient {
 			if(comp != null) {
 				CanneryBase cannery = Jars.canneries.get(comp);
 				if(cannery != null) {
+					Minecraft.getMinecraft().thePlayer.closeScreen();
 					FMLCommonHandler.instance().showGuiScreen(new GuiWorldInAJar(cannery.createScript(), cannery.getName(), cannery.getIcon(), cannery.seeAlso()));
 				}
 			}
@@ -959,6 +960,7 @@ public class ModEventHandlerClient {
 			if(stack != null) {
 				stack = stack.copy();
 				stack.stackSize = 1;
+				Minecraft.getMinecraft().thePlayer.closeScreen();
 				FMLCommonHandler.instance().showGuiScreen(new GUIScreenPreview(stack));
 			}
 		}
@@ -1002,6 +1004,7 @@ public class ModEventHandlerClient {
 					}
 				}
 
+				Minecraft.getMinecraft().thePlayer.closeScreen();
 				FMLCommonHandler.instance().showGuiScreen(new GUIScreenWikiRender(stacks.toArray(new ItemStack[0]), prefix, "wiki-block-renders-256", scale));
 			}
 		} else {

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

@@ -36,7 +36,7 @@ public class RenderBreeder extends TileEntitySpecialRenderer {
 			for(int i = 0; i < 3; i++) {
 				GL11.glPushMatrix();
 		        GL11.glRotatef((float) (Math.PI * i), 0F, 1F, 0F);
-				RenderSparks.renderSpark((int) ((System.currentTimeMillis() % 10000) / 100 + i), 0, 1.875, 0, 0.15F, 3, 4, 0x00ff00, 0xffffff);
+				RenderSparks.renderSpark((int) ((System.currentTimeMillis() % 10000) / 100 + i), 0, 1.5625, 0, 0.15F, 3, 4, 0x00ff00, 0xffffff);
 				GL11.glPopMatrix();
 			}
 		

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

@@ -6,7 +6,6 @@ import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
-import com.hbm.saveddata.TomSaveData;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.IFluidCopiable;
 import com.hbm.tileentity.IConfigurableMachine;
@@ -17,7 +16,6 @@ import api.hbm.fluid.IFluidStandardTransceiver;
 import api.hbm.tile.IInfoProviderEC;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.EnumSkyBlock;
 
 public class TileEntityCondenser extends TileEntityLoadedBase implements IFluidStandardTransceiver, IInfoProviderEC, IConfigurableMachine, IBufPacketReceiver, IFluidCopiable {
 
@@ -76,14 +74,7 @@ public class TileEntityCondenser extends TileEntityLoadedBase implements IFluidS
 				if(convert > 0)
 					this.waterTimer = 20;
 				
-				int light = this.worldObj.getSavedLightValue(EnumSkyBlock.Sky, this.xCoord, this.yCoord, this.zCoord);
+				tanks[1].setFill(tanks[1].getFill() + convert);
-
-				if(TomSaveData.forWorld(worldObj).fire > 1e-5 && light > 7) { // Make both steam and water evaporate during firestorms...
-					tanks[1].setFill(tanks[1].getFill() - convert);
-				} else {
-					tanks[1].setFill(tanks[1].getFill() + convert);
-				}
-
 				postConvert(convert);
 			}
 

src/main/java/com/hbm/wiaj/GuiWorldInAJar.java

@@ -216,6 +216,7 @@ public class GuiWorldInAJar extends GuiScreen {
 			if(15 <= mouseX && 39 > mouseX && 15 + 36 * (i + 1) < mouseY && 39 + 36 * (i + 1) >= mouseY) {
 				CanneryBase cannery = seeAlso[i];
 				mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
+				Minecraft.getMinecraft().thePlayer.closeScreen();
 				FMLCommonHandler.instance().showGuiScreen(new GuiWorldInAJar(cannery.createScript(), cannery.getName(), cannery.getIcon(), cannery.seeAlso()));
 				return;
 			}

src/main/resources/assets/hbm/models/reactors/breeder.obj

@@ -1,6 +1,6 @@
 # Blender v2.79 (sub 7) OBJ File: 'breeding_reactor.blend'
 # www.blender.org
-mtllib breeding_reactor.mtl
+mtllib breeding_reactor_fixed.mtl
 o Cube_Cube.001
 v -0.437500 0.437500 -0.437500
 v -0.437500 0.437500 -0.500000
@@ -82,30 +82,6 @@ v -0.500000 2.687499 -0.500000
 v -0.437500 2.687499 -0.437500
 v -0.500000 2.749999 -0.500000
 v -0.437500 0.500000 0.437500
-v -0.000000 1.250000 -0.482963
-v 0.241481 1.250000 -0.418258
-v 0.418258 1.250000 -0.241481
-v 0.482963 1.250000 0.000000
-v 0.418258 1.250000 0.241482
-v 0.241482 1.250000 0.418258
-v 0.000000 1.250000 0.482963
-v -0.241481 1.250000 0.418258
-v -0.418258 1.250000 0.241482
-v -0.482963 1.250000 0.000000
-v -0.418258 1.250000 -0.241481
-v -0.241482 1.250000 -0.418258
-v -0.000000 1.875000 -0.482963
-v 0.241481 1.875000 -0.418258
-v 0.418258 1.875000 -0.241481
-v 0.482963 1.875000 0.000000
-v 0.418258 1.875000 0.241482
-v 0.241482 1.875000 0.418258
-v 0.000000 1.875000 0.482963
-v -0.241481 1.875000 0.418258
-v -0.418258 1.875000 0.241482
-v -0.482963 1.875000 0.000000
-v -0.418258 1.875000 -0.241481
-v -0.241482 1.875000 -0.418258
 v -0.187500 0.625000 0.250000
 v -0.187500 3.250000 0.250000
 v -0.250000 0.625000 0.250000
@@ -198,22 +174,15 @@ v -0.000000 1.250000 -0.482963
 v 0.241481 1.250000 -0.418258
 v 0.418258 1.250000 -0.241481
 v 0.482963 1.250000 0.000000
-v 0.418258 1.250000 0.241482
 v 0.241482 1.250000 0.418258
 v 0.000000 1.250000 0.482963
-v -0.241481 1.250000 0.418258
 v -0.418258 1.250000 0.241482
 v -0.482963 1.250000 0.000000
-v -0.418258 1.250000 -0.241481
 v -0.241482 1.250000 -0.418258
 v -0.000000 1.875000 -0.482963
 v 0.241481 1.875000 -0.418258
 v 0.418258 1.875000 -0.241481
 v 0.482963 1.875000 0.000000
-v 0.418258 1.875000 0.241482
-v 0.241482 1.875000 0.418258
-v 0.000000 1.875000 0.482963
-v -0.241481 1.875000 0.418258
 v -0.418258 1.875000 0.241482
 v -0.482963 1.875000 0.000000
 v -0.418258 1.875000 -0.241481
@@ -242,6 +211,13 @@ v -0.418258 0.375000 -0.241481
 v -0.418258 0.625000 -0.241481
 v -0.241482 0.375000 -0.418258
 v -0.241482 0.625000 -0.418258
+v 0.418258 1.250000 0.241482
+v -0.241481 1.250000 0.418258
+v -0.418258 1.250000 -0.241481
+v 0.418258 1.875000 0.241482
+v 0.241482 1.875000 0.418258
+v 0.000000 1.875000 0.482963
+v -0.241481 1.875000 0.418258
 vt 0.196262 0.875000
 vt 0.327103 0.854167
 vt 0.327103 0.875000
@@ -596,31 +572,6 @@ vt 0.905029 0.947544
 vt 0.869675 0.968591
 vt 0.808440 0.890042
 vt 0.808440 0.732944
-vt 0.598131 0.604167
-vt 0.560748 0.395833
-vt 0.598131 0.395833
-vt 0.635514 0.604167
-vt 0.635514 0.395833
-vt 0.672897 0.604167
-vt 0.672897 0.395833
-vt 0.710280 0.604167
-vt 0.710280 0.395833
-vt 0.747664 0.604167
-vt 0.747664 0.395833
-vt 0.785047 0.604167
-vt 0.785047 0.395833
-vt 0.373832 0.604167
-vt 0.336449 0.395833
-vt 0.373832 0.395833
-vt 0.411215 0.604167
-vt 0.411215 0.395833
-vt 0.448598 0.604167
-vt 0.448598 0.395833
-vt 0.485981 0.604167
-vt 0.485981 0.395833
-vt 0.523364 0.604167
-vt 0.523364 0.395833
-vt 0.560748 0.604167
 vt 0.560748 0.979167
 vt 0.523364 0.895833
 vt 0.560748 0.895833
@@ -721,10 +672,9 @@ vt 0.635514 0.104167
 vt 0.635514 0.187500
 vt 0.598131 0.104167
 vt 0.598131 0.187500
-vt 0.336449 0.604167
+vt 0.336449 0.395833
 vt 0.336449 0.979167
 vt 0.336449 0.812500
-vt 0.336449 0.395833
 vt 0.336449 0.187500
 vn 0.0000 -1.0000 -0.0000
 vn 0.0000 -0.0000 1.0000
@@ -736,38 +686,14 @@ 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.5000 0.0000 -0.8660
-vn -0.8660 0.0000 -0.5000
-vn -0.8660 0.0000 0.5000
-vn -0.5000 0.0000 0.8660
-vn 0.5000 0.0000 0.8660
-vn 0.8660 0.0000 0.5000
-vn 0.8660 0.0000 -0.5000
 vn 0.5000 0.0000 -0.8660
-vn 0.0000 0.6532 -0.7571
+vn 0.8660 0.0000 -0.5000
-vn 0.3786 -0.6532 -0.6557
+vn 0.8660 0.0000 0.5000
-vn 0.0000 -0.6532 -0.7571
+vn 0.5000 0.0000 0.8660
-vn 0.3786 0.6532 -0.6557
+vn -0.5000 0.0000 0.8660
-vn 0.6557 -0.6532 -0.3786
+vn -0.8660 0.0000 0.5000
-vn 0.6557 0.6532 -0.3786
+vn -0.8660 0.0000 -0.5000
-vn 0.7571 -0.6532 0.0000
+vn -0.5000 0.0000 -0.8660
-vn 0.7571 0.6532 0.0000
-vn 0.6557 -0.6532 0.3786
-vn 0.6557 0.6532 0.3786
-vn 0.3786 -0.6532 0.6557
-vn 0.3786 0.6532 0.6557
-vn 0.0000 -0.6532 0.7571
-vn 0.0000 0.6532 0.7571
-vn -0.3786 -0.6532 0.6557
-vn -0.3786 0.6532 0.6557
-vn -0.6557 -0.6532 0.3786
-vn -0.6557 0.6532 0.3786
-vn -0.7571 -0.6532 0.0000
-vn -0.7571 0.6532 0.0000
-vn -0.6557 -0.6532 -0.3786
-vn -0.6557 0.6532 -0.3786
-vn -0.3786 -0.6532 -0.6557
-vn -0.3786 0.6532 -0.6557
 usemtl None
 s off
 f 78/1/1 7/2/1 39/3/1
@@ -858,44 +784,44 @@ f 73/153/2 78/154/2 66/155/2
 f 4/156/3 67/157/3 5/158/3
 f 66/155/6 79/159/6 77/149/6
 f 3/150/4 79/159/4 4/156/4
-f 106/160/2 107/161/2 105/162/2
+f 82/160/2 83/161/2 81/162/2
-f 108/163/6 111/164/6 107/161/6
+f 84/163/6 87/164/6 83/161/6
-f 112/165/4 109/166/4 111/164/4
+f 88/165/4 85/166/4 87/164/4
-f 110/167/5 105/162/5 109/168/5
+f 86/167/5 81/162/5 85/168/5
-f 111/164/1 105/169/1 107/161/1
+f 87/164/1 81/169/1 83/161/1
-f 108/163/3 110/170/3 112/165/3
+f 84/163/3 86/170/3 88/165/3
-f 114/171/6 115/172/6 113/173/6
+f 90/171/6 91/172/6 89/173/6
-f 116/174/4 119/175/4 115/172/4
+f 92/174/4 95/175/4 91/172/4
-f 120/176/5 117/177/5 119/175/5
+f 96/176/5 93/177/5 95/175/5
-f 118/178/2 113/173/2 117/179/2
+f 94/178/2 89/173/2 93/179/2
-f 119/175/1 113/180/1 115/172/1
+f 95/175/1 89/180/1 91/172/1
-f 116/174/3 118/181/3 120/176/3
+f 92/174/3 94/181/3 96/176/3
-f 122/182/4 123/183/4 121/184/4
+f 98/182/4 99/183/4 97/184/4
-f 124/185/5 127/186/5 123/183/5
+f 100/185/5 103/186/5 99/183/5
-f 128/187/2 125/188/2 127/186/2
+f 104/187/2 101/188/2 103/186/2
-f 126/189/6 121/184/6 125/190/6
+f 102/189/6 97/184/6 101/190/6
-f 127/186/1 121/191/1 123/183/1
+f 103/186/1 97/191/1 99/183/1
-f 124/185/3 126/192/3 128/187/3
+f 100/185/3 102/192/3 104/187/3
-f 130/193/5 131/194/5 129/195/5
+f 106/193/5 107/194/5 105/195/5
-f 132/196/2 135/197/2 131/194/2
+f 108/196/2 111/197/2 107/194/2
-f 136/198/6 133/199/6 135/197/6
+f 112/198/6 109/199/6 111/197/6
-f 134/200/4 129/195/4 133/201/4
+f 110/200/4 105/195/4 109/201/4
-f 135/197/1 129/202/1 131/194/1
+f 111/197/1 105/202/1 107/194/1
-f 132/196/3 134/203/3 136/198/3
+f 108/196/3 110/203/3 112/198/3
-f 138/204/7 139/205/7 137/206/7
+f 114/204/7 115/205/7 113/206/7
-f 140/207/8 143/208/8 139/205/8
+f 116/207/8 119/208/8 115/205/8
-f 144/209/9 141/210/9 143/208/9
+f 120/209/9 117/210/9 119/208/9
-f 142/211/10 137/206/10 141/212/10
+f 118/211/10 113/206/10 117/212/10
-f 139/205/1 141/213/1 137/214/1
+f 115/205/1 117/213/1 113/214/1
-f 140/207/3 142/215/3 144/209/3
+f 116/207/3 118/215/3 120/209/3
-f 154/216/3 150/217/3 166/218/3
+f 130/216/3 126/217/3 142/218/3
-f 159/219/1 163/220/1 167/221/1
+f 135/219/1 139/220/1 143/221/1
-f 178/222/3 174/223/3 190/224/3
+f 154/222/3 150/223/3 166/224/3
-f 183/225/1 187/226/1 191/227/1
+f 159/225/1 163/226/1 167/227/1
-f 194/228/3 204/229/3 200/230/3
+f 170/228/3 177/229/3 211/230/3
-f 215/231/3 213/232/3 209/233/3
+f 184/231/3 182/232/3 213/233/3
-f 226/234/3 222/235/3 238/236/3
+f 195/234/3 191/235/3 207/236/3
-f 231/237/1 235/238/1 239/239/1
+f 200/237/1 204/238/1 208/239/1
 f 78/1/1 3/13/1 7/2/1
 f 78/4/2 39/240/2 24/5/2
 f 1/7/2 13/241/2 19/8/2
@@ -984,226 +910,226 @@ f 73/153/2 76/267/2 78/154/2
 f 4/156/3 79/159/3 67/157/3
 f 66/155/6 67/268/6 79/159/6
 f 3/150/4 77/149/4 79/159/4
-f 106/160/2 108/163/2 107/161/2
+f 82/160/2 84/163/2 83/161/2
-f 108/163/6 112/165/6 111/164/6
+f 84/163/6 88/165/6 87/164/6
-f 112/165/4 110/269/4 109/166/4
+f 88/165/4 86/269/4 85/166/4
-f 110/167/5 106/160/5 105/162/5
+f 86/167/5 82/160/5 81/162/5
-f 111/164/1 109/270/1 105/169/1
+f 87/164/1 85/270/1 81/169/1
-f 108/163/3 106/271/3 110/170/3
+f 84/163/3 82/271/3 86/170/3
-f 114/171/6 116/174/6 115/172/6
+f 90/171/6 92/174/6 91/172/6
-f 116/174/4 120/176/4 119/175/4
+f 92/174/4 96/176/4 95/175/4
-f 120/176/5 118/272/5 117/177/5
+f 96/176/5 94/272/5 93/177/5
-f 118/178/2 114/171/2 113/173/2
+f 94/178/2 90/171/2 89/173/2
-f 119/175/1 117/273/1 113/180/1
+f 95/175/1 93/273/1 89/180/1
-f 116/174/3 114/274/3 118/181/3
+f 92/174/3 90/274/3 94/181/3
-f 122/182/4 124/185/4 123/183/4
+f 98/182/4 100/185/4 99/183/4
-f 124/185/5 128/187/5 127/186/5
+f 100/185/5 104/187/5 103/186/5
-f 128/187/2 126/275/2 125/188/2
+f 104/187/2 102/275/2 101/188/2
-f 126/189/6 122/182/6 121/184/6
+f 102/189/6 98/182/6 97/184/6
-f 127/186/1 125/276/1 121/191/1
+f 103/186/1 101/276/1 97/191/1
-f 124/185/3 122/277/3 126/192/3
+f 100/185/3 98/277/3 102/192/3
-f 130/193/5 132/196/5 131/194/5
+f 106/193/5 108/196/5 107/194/5
-f 132/196/2 136/198/2 135/197/2
+f 108/196/2 112/198/2 111/197/2
-f 136/198/6 134/278/6 133/199/6
+f 112/198/6 110/278/6 109/199/6
-f 134/200/4 130/193/4 129/195/4
+f 110/200/4 106/193/4 105/195/4
-f 135/197/1 133/279/1 129/202/1
+f 111/197/1 109/279/1 105/202/1
-f 132/196/3 130/280/3 134/203/3
+f 108/196/3 106/280/3 110/203/3
-f 138/204/7 140/207/7 139/205/7
+f 114/204/7 116/207/7 115/205/7
-f 140/207/8 144/209/8 143/208/8
+f 116/207/8 120/209/8 119/208/8
-f 144/209/9 142/281/9 141/210/9
+f 120/209/9 118/281/9 117/210/9
-f 142/211/10 138/204/10 137/206/10
+f 118/211/10 114/204/10 113/206/10
-f 139/205/1 143/208/1 141/213/1
+f 115/205/1 119/208/1 117/213/1
-f 140/207/3 138/282/3 142/215/3
+f 116/207/3 114/282/3 118/215/3
-f 150/217/3 148/283/3 146/284/3
+f 126/217/3 124/283/3 122/284/3
-f 146/284/3 168/285/3 166/218/3
+f 122/284/3 144/285/3 142/218/3
-f 166/218/3 164/286/3 162/287/3
+f 142/218/3 140/286/3 138/287/3
-f 162/287/3 160/288/3 166/218/3
+f 138/287/3 136/288/3 142/218/3
-f 160/288/3 158/289/3 166/218/3
+f 136/288/3 134/289/3 142/218/3
-f 158/289/3 156/290/3 154/216/3
+f 134/289/3 132/290/3 130/216/3
-f 154/216/3 152/291/3 150/217/3
+f 130/216/3 128/291/3 126/217/3
-f 150/217/3 146/284/3 166/218/3
+f 126/217/3 122/284/3 142/218/3
-f 158/289/3 154/216/3 166/218/3
+f 134/289/3 130/216/3 142/218/3
-f 167/221/1 145/292/1 147/293/1
+f 143/221/1 121/292/1 123/293/1
-f 147/293/1 149/294/1 151/295/1
+f 123/293/1 125/294/1 127/295/1
-f 151/295/1 153/296/1 155/297/1
+f 127/295/1 129/296/1 131/297/1
-f 155/297/1 157/298/1 151/295/1
+f 131/297/1 133/298/1 127/295/1
-f 157/298/1 159/219/1 151/295/1
+f 133/298/1 135/219/1 127/295/1
-f 159/219/1 161/299/1 163/220/1
+f 135/219/1 137/299/1 139/220/1
-f 163/220/1 165/300/1 167/221/1
+f 139/220/1 141/300/1 143/221/1
-f 167/221/1 147/293/1 159/219/1
+f 143/221/1 123/293/1 135/219/1
-f 147/293/1 151/295/1 159/219/1
+f 123/293/1 127/295/1 135/219/1
-f 174/223/3 172/301/3 170/302/3
+f 150/223/3 148/301/3 146/302/3
-f 170/302/3 192/303/3 190/224/3
+f 146/302/3 168/303/3 166/224/3
-f 190/224/3 188/304/3 186/305/3
+f 166/224/3 164/304/3 162/305/3
-f 186/305/3 184/306/3 190/224/3
+f 162/305/3 160/306/3 166/224/3
-f 184/306/3 182/307/3 190/224/3
+f 160/306/3 158/307/3 166/224/3
-f 182/307/3 180/308/3 178/222/3
+f 158/307/3 156/308/3 154/222/3
-f 178/222/3 176/309/3 174/223/3
+f 154/222/3 152/309/3 150/223/3
-f 174/223/3 170/302/3 190/224/3
+f 150/223/3 146/302/3 166/224/3
-f 182/307/3 178/222/3 190/224/3
+f 158/307/3 154/222/3 166/224/3
-f 191/227/1 169/310/1 171/311/1
+f 167/227/1 145/310/1 147/311/1
-f 171/311/1 173/312/1 175/313/1
+f 147/311/1 149/312/1 151/313/1
-f 175/313/1 177/314/1 179/315/1
+f 151/313/1 153/314/1 155/315/1
-f 179/315/1 181/316/1 175/313/1
+f 155/315/1 157/316/1 151/313/1
-f 181/316/1 183/225/1 175/313/1
+f 157/316/1 159/225/1 151/313/1
-f 183/225/1 185/317/1 187/226/1
+f 159/225/1 161/317/1 163/226/1
-f 187/226/1 189/318/1 191/227/1
+f 163/226/1 165/318/1 167/227/1
-f 191/227/1 171/311/1 183/225/1
+f 167/227/1 147/311/1 159/225/1
-f 171/311/1 175/313/1 183/225/1
+f 147/311/1 151/313/1 159/225/1
-f 204/229/3 203/319/3 202/320/3
+f 177/229/3 212/319/3 176/320/3
-f 202/320/3 201/321/3 200/230/3
+f 176/320/3 175/321/3 211/230/3
-f 200/230/3 199/322/3 196/323/3
+f 211/230/3 174/322/3 172/323/3
-f 199/322/3 198/324/3 196/323/3
+f 174/322/3 173/324/3 172/323/3
-f 198/324/3 197/325/3 196/323/3
+f 173/324/3 210/325/3 172/323/3
-f 196/323/3 195/326/3 194/228/3
+f 172/323/3 171/326/3 170/228/3
-f 194/228/3 193/327/3 204/229/3
+f 170/228/3 169/327/3 177/229/3
-f 204/229/3 202/320/3 200/230/3
+f 177/229/3 176/320/3 211/230/3
-f 196/323/3 194/228/3 200/230/3
+f 172/323/3 170/228/3 211/230/3
-f 205/328/3 216/329/3 215/231/3
+f 178/328/3 185/329/3 184/231/3
-f 215/231/3 214/330/3 213/232/3
+f 184/231/3 183/330/3 182/232/3
-f 213/232/3 212/331/3 209/233/3
+f 182/232/3 216/331/3 213/233/3
-f 212/331/3 211/332/3 209/233/3
+f 216/331/3 215/332/3 213/233/3
-f 211/332/3 210/333/3 209/233/3
+f 215/332/3 214/333/3 213/233/3
-f 209/233/3 208/334/3 207/335/3
+f 213/233/3 181/334/3 180/335/3
-f 207/335/3 206/336/3 209/233/3
+f 180/335/3 179/336/3 213/233/3
-f 206/336/3 205/328/3 209/233/3
+f 179/336/3 178/328/3 213/233/3
-f 205/328/3 215/231/3 209/233/3
+f 178/328/3 184/231/3 213/233/3
-f 222/235/3 220/337/3 218/338/3
+f 191/235/3 189/337/3 187/338/3
-f 218/338/3 240/339/3 238/236/3
+f 187/338/3 209/339/3 207/236/3
-f 238/236/3 236/340/3 234/341/3
+f 207/236/3 205/340/3 203/341/3
-f 234/341/3 232/342/3 238/236/3
+f 203/341/3 201/342/3 207/236/3
-f 232/342/3 230/343/3 238/236/3
+f 201/342/3 199/343/3 207/236/3
-f 230/343/3 228/344/3 226/234/3
+f 199/343/3 197/344/3 195/234/3
-f 226/234/3 224/345/3 222/235/3
+f 195/234/3 193/345/3 191/235/3
-f 222/235/3 218/338/3 238/236/3
+f 191/235/3 187/338/3 207/236/3
-f 230/343/3 226/234/3 238/236/3
+f 199/343/3 195/234/3 207/236/3
-f 239/239/1 217/346/1 219/347/1
+f 208/239/1 186/346/1 188/347/1
-f 219/347/1 221/348/1 223/349/1
+f 188/347/1 190/348/1 192/349/1
-f 223/349/1 225/350/1 227/351/1
+f 192/349/1 194/350/1 196/351/1
-f 227/351/1 229/352/1 223/349/1
+f 196/351/1 198/352/1 192/349/1
-f 229/352/1 231/237/1 223/349/1
+f 198/352/1 200/237/1 192/349/1
-f 231/237/1 233/353/1 235/238/1
+f 200/237/1 202/353/1 204/238/1
-f 235/238/1 237/354/1 239/239/1
+f 204/238/1 206/354/1 208/239/1
-f 239/239/1 219/347/1 231/237/1
+f 208/239/1 188/347/1 200/237/1
-f 219/347/1 223/349/1 231/237/1
+f 188/347/1 192/349/1 200/237/1
 s 1
-f 104/355/11 81/356/4 92/357/11
+f 122/355/4 123/356/11 121/357/4
-f 103/358/12 92/357/11 91/359/12
+f 124/358/11 125/359/12 123/356/11
-f 102/360/6 91/359/12 90/361/6
+f 126/360/12 127/361/5 125/359/12
-f 101/362/13 90/361/6 89/363/13
+f 128/362/5 129/363/13 127/361/5
-f 100/364/14 89/363/13 88/365/14
+f 130/364/13 131/365/14 129/363/13
-f 99/366/2 88/365/14 87/367/2
+f 132/366/14 133/367/2 131/365/14
-f 98/368/15 87/369/2 86/370/15
+f 134/368/2 135/369/15 133/370/2
-f 97/371/16 86/370/15 85/372/16
+f 136/371/15 137/372/16 135/369/15
-f 96/373/5 85/372/16 84/374/5
+f 138/373/16 139/374/6 137/372/16
-f 95/375/17 84/374/5 83/376/17
+f 140/375/6 141/376/17 139/374/6
-f 94/377/18 83/376/17 82/378/18
+f 142/377/17 143/378/18 141/376/17
-f 93/379/4 82/378/18 81/356/4
+f 144/379/18 121/357/4 143/378/18
-f 146/380/19 147/381/20 145/382/21
+f 146/380/4 179/381/11 178/382/4
-f 148/383/22 149/384/23 147/381/20
+f 148/383/11 180/384/12 179/381/11
-f 150/385/24 151/386/25 149/384/23
+f 150/385/12 181/386/5 180/384/12
-f 152/387/26 153/388/27 151/386/25
+f 152/387/5 213/388/13 181/386/5
-f 154/389/28 155/390/29 153/388/27
+f 154/389/13 214/390/14 213/388/13
-f 156/391/30 157/392/31 155/390/29
+f 156/391/14 215/392/2 214/390/14
-f 158/393/32 159/394/33 157/395/31
+f 158/393/2 216/394/15 215/395/2
-f 160/396/34 161/397/35 159/394/33
+f 160/396/15 182/397/16 216/394/15
-f 162/398/36 163/399/37 161/397/35
+f 162/398/16 183/399/6 182/397/16
-f 164/400/38 165/401/39 163/399/37
+f 164/400/6 184/401/17 183/399/6
-f 166/402/40 167/403/41 165/401/39
+f 166/402/17 185/403/18 184/401/17
-f 168/404/42 145/382/21 167/403/41
+f 168/404/18 178/382/4 185/403/18
-f 170/405/19 206/406/22 205/407/19
+f 177/405/18 145/406/4 167/407/18
-f 172/408/22 207/409/24 206/406/22
+f 212/408/17 167/407/18 165/409/17
-f 174/410/24 208/411/26 207/409/24
+f 176/410/6 165/409/17 163/411/6
-f 176/412/26 209/413/28 208/411/26
+f 175/412/16 163/411/6 161/413/16
-f 178/414/28 210/415/30 209/413/28
+f 211/414/15 161/413/16 159/415/15
-f 180/416/30 211/417/32 210/415/30
+f 174/416/2 159/415/15 157/417/2
-f 182/418/32 212/419/34 211/420/32
+f 173/418/14 157/419/2 155/420/14
-f 184/421/34 213/422/36 212/419/34
+f 210/421/13 155/420/14 153/422/13
-f 186/423/36 214/424/38 213/422/36
+f 172/423/5 153/422/13 151/424/5
-f 188/425/38 215/426/40 214/424/38
+f 171/425/12 151/424/5 149/426/12
-f 190/427/40 216/428/42 215/426/40
+f 170/427/11 149/426/12 147/428/11
-f 192/429/42 205/407/19 216/428/42
+f 169/429/4 147/428/11 145/406/4
-f 204/430/42 169/431/21 191/432/41
+f 187/430/4 188/431/11 186/432/4
-f 203/433/40 191/432/41 189/434/39
+f 189/433/11 190/434/12 188/431/11
-f 202/435/38 189/434/39 187/436/37
+f 191/435/12 192/436/5 190/434/12
-f 201/437/36 187/436/37 185/438/35
+f 193/437/5 194/438/13 192/436/5
-f 200/439/34 185/438/35 183/440/33
+f 195/439/13 196/440/14 194/438/13
-f 199/441/32 183/440/33 181/442/31
+f 197/441/14 198/442/2 196/440/14
-f 198/443/30 181/444/31 179/445/29
+f 199/443/2 200/444/15 198/445/2
-f 197/446/28 179/445/29 177/447/27
+f 201/446/15 202/447/16 200/444/15
-f 196/448/26 177/447/27 175/449/25
+f 203/448/16 204/449/6 202/447/16
-f 195/450/24 175/449/25 173/451/23
+f 205/450/6 206/451/17 204/449/6
-f 194/452/22 173/451/23 171/453/20
+f 207/452/17 208/453/18 206/451/17
-f 193/454/19 171/453/20 169/431/21
+f 209/454/18 186/432/4 208/453/18
-f 218/455/19 219/456/20 217/457/21
+f 185/403/18 169/429/4 177/405/18
-f 220/458/22 221/459/23 219/456/20
+f 184/401/17 177/405/18 212/408/17
-f 222/460/24 223/461/25 221/459/23
+f 183/399/6 212/408/17 176/410/6
-f 224/462/26 225/463/27 223/461/25
+f 182/397/16 176/410/6 175/412/16
-f 226/464/28 227/465/29 225/463/27
+f 216/394/15 175/412/16 211/414/15
-f 228/466/30 229/467/31 227/465/29
+f 215/395/2 211/414/15 174/416/2
-f 230/468/32 231/469/33 229/470/31
+f 214/390/14 174/455/2 173/418/14
-f 232/471/34 233/472/35 231/469/33
+f 213/388/13 173/418/14 210/421/13
-f 234/473/36 235/474/37 233/472/35
+f 181/386/5 210/421/13 172/423/5
-f 236/475/38 237/476/39 235/474/37
+f 180/384/12 172/423/5 171/425/12
-f 238/477/40 239/478/41 237/476/39
+f 179/381/11 171/425/12 170/427/11
-f 240/479/42 217/457/21 239/478/41
+f 178/382/4 170/427/11 169/429/4
-f 104/355/11 93/379/4 81/356/4
+f 122/355/4 124/358/11 123/356/11
-f 103/358/12 104/355/11 92/357/11
+f 124/358/11 126/360/12 125/359/12
-f 102/360/6 103/358/12 91/359/12
+f 126/360/12 128/362/5 127/361/5
-f 101/362/13 102/360/6 90/361/6
+f 128/362/5 130/364/13 129/363/13
-f 100/364/14 101/362/13 89/363/13
+f 130/364/13 132/366/14 131/365/14
-f 99/366/2 100/364/14 88/365/14
+f 132/366/14 134/456/2 133/367/2
-f 98/368/15 99/480/2 87/369/2
+f 134/368/2 136/371/15 135/369/15
-f 97/371/16 98/368/15 86/370/15
+f 136/371/15 138/373/16 137/372/16
-f 96/373/5 97/371/16 85/372/16
+f 138/373/16 140/375/6 139/374/6
-f 95/375/17 96/373/5 84/374/5
+f 140/375/6 142/377/17 141/376/17
-f 94/377/18 95/375/17 83/376/17
+f 142/377/17 144/379/18 143/378/18
-f 93/379/4 94/377/18 82/378/18
+f 144/379/18 122/355/4 121/357/4
-f 146/380/19 148/383/22 147/381/20
+f 146/380/4 148/383/11 179/381/11
-f 148/383/22 150/385/24 149/384/23
+f 148/383/11 150/385/12 180/384/12
-f 150/385/24 152/387/26 151/386/25
+f 150/385/12 152/387/5 181/386/5
-f 152/387/26 154/389/28 153/388/27
+f 152/387/5 154/389/13 213/388/13
-f 154/389/28 156/391/30 155/390/29
+f 154/389/13 156/391/14 214/390/14
-f 156/391/30 158/481/32 157/392/31
+f 156/391/14 158/457/2 215/392/2
-f 158/393/32 160/396/34 159/394/33
+f 158/393/2 160/396/15 216/394/15
-f 160/396/34 162/398/36 161/397/35
+f 160/396/15 162/398/16 182/397/16
-f 162/398/36 164/400/38 163/399/37
+f 162/398/16 164/400/6 183/399/6
-f 164/400/38 166/402/40 165/401/39
+f 164/400/6 166/402/17 184/401/17
-f 166/402/40 168/404/42 167/403/41
+f 166/402/17 168/404/18 185/403/18
-f 168/404/42 146/380/19 145/382/21
+f 168/404/18 146/380/4 178/382/4
-f 170/405/19 172/408/22 206/406/22
+f 177/405/18 169/429/4 145/406/4
-f 172/408/22 174/410/24 207/409/24
+f 212/408/17 177/405/18 167/407/18
-f 174/410/24 176/412/26 208/411/26
+f 176/410/6 212/408/17 165/409/17
-f 176/412/26 178/414/28 209/413/28
+f 175/412/16 176/410/6 163/411/6
-f 178/414/28 180/416/30 210/415/30
+f 211/414/15 175/412/16 161/413/16
-f 180/416/30 182/482/32 211/417/32
+f 174/416/2 211/414/15 159/415/15
-f 182/418/32 184/421/34 212/419/34
+f 173/418/14 174/455/2 157/419/2
-f 184/421/34 186/423/36 213/422/36
+f 210/421/13 173/418/14 155/420/14
-f 186/423/36 188/425/38 214/424/38
+f 172/423/5 210/421/13 153/422/13
-f 188/425/38 190/427/40 215/426/40
+f 171/425/12 172/423/5 151/424/5
-f 190/427/40 192/429/42 216/428/42
+f 170/427/11 171/425/12 149/426/12
-f 192/429/42 170/405/19 205/407/19
+f 169/429/4 170/427/11 147/428/11
-f 204/430/42 193/454/19 169/431/21
+f 187/430/4 189/433/11 188/431/11
-f 203/433/40 204/430/42 191/432/41
+f 189/433/11 191/435/12 190/434/12
-f 202/435/38 203/433/40 189/434/39
+f 191/435/12 193/437/5 192/436/5
-f 201/437/36 202/435/38 187/436/37
+f 193/437/5 195/439/13 194/438/13
-f 200/439/34 201/437/36 185/438/35
+f 195/439/13 197/441/14 196/440/14
-f 199/441/32 200/439/34 183/440/33
+f 197/441/14 199/458/2 198/442/2
-f 198/443/30 199/483/32 181/444/31
+f 199/443/2 201/446/15 200/444/15
-f 197/446/28 198/443/30 179/445/29
+f 201/446/15 203/448/16 202/447/16
-f 196/448/26 197/446/28 177/447/27
+f 203/448/16 205/450/6 204/449/6
-f 195/450/24 196/448/26 175/449/25
+f 205/450/6 207/452/17 206/451/17
-f 194/452/22 195/450/24 173/451/23
+f 207/452/17 209/454/18 208/453/18
-f 193/454/19 194/452/22 171/453/20
+f 209/454/18 187/430/4 186/432/4
-f 218/455/19 220/458/22 219/456/20
+f 185/403/18 178/382/4 169/429/4
-f 220/458/22 222/460/24 221/459/23
+f 184/401/17 185/403/18 177/405/18
-f 222/460/24 224/462/26 223/461/25
+f 183/399/6 184/401/17 212/408/17
-f 224/462/26 226/464/28 225/463/27
+f 182/397/16 183/399/6 176/410/6
-f 226/464/28 228/466/30 227/465/29
+f 216/394/15 182/397/16 175/412/16
-f 228/466/30 230/484/32 229/467/31
+f 215/395/2 216/394/15 211/414/15
-f 230/468/32 232/471/34 231/469/33
+f 214/390/14 215/392/2 174/455/2
-f 232/471/34 234/473/36 233/472/35
+f 213/388/13 214/390/14 173/418/14
-f 234/473/36 236/475/38 235/474/37
+f 181/386/5 213/388/13 210/421/13
-f 236/475/38 238/477/40 237/476/39
+f 180/384/12 181/386/5 172/423/5
-f 238/477/40 240/479/42 239/478/41
+f 179/381/11 180/384/12 171/425/12
-f 240/479/42 218/455/19 217/457/21
+f 178/382/4 179/381/11 170/427/11