From b111b0cff80b30495a1e8472e64616892e50edfd Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 30 Jun 2024 16:03:23 +0200 Subject: [PATCH] the slop consumes --- changelog | 35 +- src/main/java/com/hbm/config/WorldConfig.java | 2 + .../java/com/hbm/crafting/PowderRecipes.java | 2 + .../java/com/hbm/crafting/ToolRecipes.java | 2 +- .../com/hbm/inventory/OreDictManager.java | 2 + .../container/ContainerOreSlopper.java | 51 +- .../inventory/recipes/AssemblerRecipes.java | 7 + .../inventory/recipes/ChemplantRecipes.java | 9 +- .../hbm/inventory/recipes/CokerRecipes.java | 2 + .../inventory/recipes/CombinationRecipes.java | 1 + .../recipes/ElectrolyserFluidRecipes.java | 1 + .../recipes/LiquefactionRecipes.java | 5 +- .../hbm/inventory/recipes/SILEXRecipes.java | 7 + .../inventory/recipes/ShredderRecipes.java | 3 +- .../recipes/SolidificationRecipes.java | 2 + src/main/java/com/hbm/items/ModItems.java | 6 + src/main/java/com/hbm/lib/HbmWorldGen.java | 38 +- .../java/com/hbm/main/CraftingManager.java | 4 +- src/main/resources/assets/hbm/lang/de_DE.lang | 3 + src/main/resources/assets/hbm/lang/en_US.lang | 5 +- .../hbm/models/machines/ore_slopper.obj | 1089 +++++++++-------- .../hbm/textures/items/powder_cement.png | Bin 0 -> 280 bytes .../hbm/textures/items/powder_limestone.png | Bin 0 -> 315 bytes 23 files changed, 703 insertions(+), 573 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/powder_cement.png create mode 100644 src/main/resources/assets/hbm/textures/items/powder_limestone.png diff --git a/changelog b/changelog index 63abe0474..80966d835 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,24 @@ +## Added +* Limestone dust + * Limestone now shreds into limestone dust instead of calcium (yields 4) + * Can be combination cooked into calcium + * Used for making cement +* Cement + * Used in all concretes (only requires 1 per 16 concrete) + * Either made from combining 1 limestone dust with 3 clay (yields 4) or from shredding slag (also yields 4) +* Bedrock ore processor + * Used for separating the new bedrock ore + * Creates ore slop as a byproduct + * Slop can be coked into some rare byproducts or solidified into tar sand + * Vitriol can be coked into iron and sulfuric acid or electrolyzed into sulfuric acid and chlorine +* New bedrock ore processing + * Most bedrock ores now create a single common item that contains different quantities of the 6 main ore types + * Ores can be processed in many different ways with three tiers of byproducts and many optional steps, also making use of machines that the old bedrock ores didn't + * New bedrock ores are now rarer, only spawning in every 10th chunk vs in evbery 3rd + * The old system can be restored via config + ## Changed +* Updated italian localization * Updated boxducts * All boxducts are now way cleaner, only having bolts on intersections, with straight parts only having very light seams * Intersections now have unique textures for each size @@ -21,7 +41,20 @@ * Diodes now use silicon nuggets instead of nether quartz * Aluminium wire's coloring is now consistent with the ingot * Nuclear explosions below a radius of 75 no longer have a gamma flash, therefore a high yield mini nuke should no longer be able to instakill someone wearing full euph armor +* Updated OpenComputers compat +* The solar boiler now has a tooltip showing its contents +* Updated drones + * Drones will now drop when destroyed + * Drones are now generally faster (standard drones are now as fast as express drones used to be) + * Holding a transport drone item now shows transport drone paths, just like how logistics drones work + * Drones should no longer randomly get stuck on waypoints + * Drones will now move upwards to avoid small ledges, this usually happens when drones approach docks from a lower angle + * Logistics drone crates can now be disabled with a redstone signal + * Logistics drone docks are now 5x faster, spawning a new rone every second instead of every 5 seconds + * Drones are now a fair bit cheaper +* Tar sand can now be liquefacted into bitumen directly with a higher yield than the chemplant recipe + * This however is slower, more energy intensive and yields no sand byproduct ## Fixed * Fixed crash caused by PRISM updating unloaded worlds -* Hopefully fixed another crash caused by PRISM (reproduction was unreliable and sporadic, not confirmed) \ No newline at end of file +* Hopefully fixed another crash caused by PRISM (reproduction was unreliable and sporadic, not confirmed) diff --git a/src/main/java/com/hbm/config/WorldConfig.java b/src/main/java/com/hbm/config/WorldConfig.java index f3f3e51c9..c69d5b6f4 100644 --- a/src/main/java/com/hbm/config/WorldConfig.java +++ b/src/main/java/com/hbm/config/WorldConfig.java @@ -33,6 +33,7 @@ public class WorldConfig { public static int bedrockOilSpawn = 200; public static int meteoriteSpawn = 500; + public static boolean newBedrockOres = true; public static int bedrockIronSpawn = 100; public static int bedrockCopperSpawn = 200; public static int bedrockBoraxSpawn = 50; @@ -154,6 +155,7 @@ public class WorldConfig { bedrockOilSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.22_bedrockOilSpawnRate", "Spawns a bedrock oil node every nTH chunk", 200); meteoriteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.23_meteoriteSpawnRate", "Spawns a fallen meteorite every nTH chunk", 200); + newBedrockOres = CommonConfig.createConfigBool(config, CATEGORY_OREGEN, "2.NB_newBedrockOres", "Enables the newer genreric bedrock ores", true); bedrockIronSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B00_bedrockIronWeight", "Spawn weight for iron bedrock ore", 100); bedrockCopperSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B01_bedrockCopperWeight", "Spawn weight for copper bedrock ore", 200); bedrockBoraxSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B02_bedrockBoraxWeight", "Spawn weight for borax bedrock ore", 50); diff --git a/src/main/java/com/hbm/crafting/PowderRecipes.java b/src/main/java/com/hbm/crafting/PowderRecipes.java index 7b08746dd..3a77a04b7 100644 --- a/src/main/java/com/hbm/crafting/PowderRecipes.java +++ b/src/main/java/com/hbm/crafting/PowderRecipes.java @@ -33,6 +33,7 @@ public class PowderRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_semtex_mix, 1), new Object[] { ModItems.solid_fuel, ModItems.ballistite, KNO.dust() }); CraftingManager.addShapelessAuto(new ItemStack(Items.clay_ball, 4), new Object[] { KEY_SAND, ModItems.dust, ModItems.dust, Fluids.WATER.getDict(1_000) }); CraftingManager.addShapelessAuto(new ItemStack(Items.clay_ball, 4), new Object[] { Blocks.clay }); //clay uncrafting because placing and breaking it isn't worth anyone's time + CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_cement, 4), new Object[] { LIMESTONE.dust(), Items.clay_ball, Items.clay_ball, Items.clay_ball }); //Other CraftingManager.addShapelessAuto(new ItemStack(ModItems.ingot_steel_dusted, 1), new Object[] { STEEL.ingot(), COAL.dust() }); @@ -67,6 +68,7 @@ public class PowderRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 2), new Object[] { COAL.dust(), KEY_SAND }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 4), new Object[] { F.dust(), KEY_SAND }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 8), new Object[] { PB.dust(), S.dust(), KEY_SAND }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 12), new Object[] { ModItems.powder_limestone, KEY_SAND }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 12), new Object[] { CA.dust(), KEY_SAND }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 16), new Object[] { BORAX.dust(), KEY_SAND }); diff --git a/src/main/java/com/hbm/crafting/ToolRecipes.java b/src/main/java/com/hbm/crafting/ToolRecipes.java index 28652267a..0c4af1770 100644 --- a/src/main/java/com/hbm/crafting/ToolRecipes.java +++ b/src/main/java/com/hbm/crafting/ToolRecipes.java @@ -131,7 +131,7 @@ public class ToolRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModBlocks.geiger), new Object[] { ModItems.geiger_counter }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.digamma_diagnostic), new Object[] { ModItems.geiger_counter, PO210.billet(), ASBESTOS.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.pollution_detector, 1), new Object[] { "SFS", "SCS", " S ", 'S', STEEL.plate(), 'F', ModItems.filter_coal, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE) }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.ore_density_scanner, 1), new Object[] { "VVV", "CSC", "GGG", " S ", 'V', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER_CHASSIS), 'G', GOLD.plate() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ore_density_scanner, 1), new Object[] { "VVV", "CSC", "GGG", 'V', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER_CHASSIS), 'G', GOLD.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.defuser, 1), new Object[] { " PS", "P P", " P ", 'P', ANY_PLASTIC.ingot(), 'S', STEEL.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.coltan_tool, 1), new Object[] { "ACA", "CXC", "ACA", 'A', ALLOY.ingot(), 'C', CINNABAR.crystal(), 'X', Items.compass }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.reacher, 1), new Object[] { "BIB", "P P", "B B", 'B', W.bolt(), 'I', W.ingot(), 'P', ANY_RUBBER.ingot() }); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index c4035c989..754af9bd5 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -229,6 +229,7 @@ public class OreDictManager { public static final DictFrame VOLCANIC = new DictFrame("Volcanic"); public static final DictFrame HEMATITE = new DictFrame("Hematite"); public static final DictFrame MALACHITE = new DictFrame("Malachite"); + public static final DictFrame LIMESTONE = new DictFrame("Limestone"); public static final DictFrame SLAG = new DictFrame("Slag"); /* * HAZARDS, MISC @@ -427,6 +428,7 @@ public class OreDictManager { VOLCANIC .gem(gem_volcanic) .ore(DictFrame.fromOne(ore_basalt, EnumBasaltOreType.GEM)); HEMATITE .ore(fromOne(stone_resource, EnumStoneType.HEMATITE)); MALACHITE .ore(fromOne(stone_resource, EnumStoneType.MALACHITE)); + LIMESTONE .dust(powder_limestone) .ore(fromOne(stone_resource, EnumStoneType.LIMESTONE)); SLAG .block(block_slag); /* diff --git a/src/main/java/com/hbm/inventory/container/ContainerOreSlopper.java b/src/main/java/com/hbm/inventory/container/ContainerOreSlopper.java index 213fffa90..74d4e94fa 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerOreSlopper.java +++ b/src/main/java/com/hbm/inventory/container/ContainerOreSlopper.java @@ -1,8 +1,12 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotCraftingOutput; +import com.hbm.items.ModItems; +import com.hbm.items.machine.IItemFluidIdentifier; +import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.tileentity.machine.TileEntityMachineOreSlopper; +import api.hbm.energymk2.IBatteryItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -43,10 +47,51 @@ public class ContainerOreSlopper extends Container { this.addSlotToContainer(new Slot(player, i, 8 + i * 18, 180)); } } - + @Override - public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { - return null; + public ItemStack transferStackInSlot(EntityPlayer player, int par2) { + ItemStack var3 = null; + Slot var4 = (Slot) this.inventorySlots.get(par2); + + if(var4 != null && var4.getHasStack()) { + ItemStack var5 = var4.getStack(); + var3 = var5.copy(); + + if(par2 <= 10) { + if(!this.mergeItemStack(var5, 11, this.inventorySlots.size(), true)) { + return null; + } + } else { + + if(var3.getItem() == ModItems.bedrock_ore_base) { + if(!this.mergeItemStack(var5, 2, 3, false)) { + return null; + } + } else if(var3.getItem() instanceof ItemMachineUpgrade) { + if(!this.mergeItemStack(var5, 9, 11, false)) { + return null; + } + } else if(var3.getItem() instanceof IItemFluidIdentifier) { + if(!this.mergeItemStack(var5, 1, 2, false)) { + return null; + } + } else if(var3.getItem() instanceof IBatteryItem || var3.getItem() == ModItems.battery_creative) { + if(!this.mergeItemStack(var5, 0, 1, false)) { + return null; + } + } else { + return null; + } + } + + if(var5.stackSize == 0) { + var4.putStack((ItemStack) null); + } else { + var4.onSlotChanged(); + } + } + + return var3; } @Override diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 3ede78d79..ac01d4007 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -466,6 +466,13 @@ public class AssemblerRecipes extends SerializableRecipe { new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG) }, 300); + makeRecipe(new ComparableStack(ModBlocks.machine_ore_slopper, 1), new AStack[] { + new OreDictStack(STEEL.plateCast(), 6), + new OreDictStack(TI.plate(), 8), + new OreDictStack(CU.pipe(), 3), + new ComparableStack(ModItems.motor, 3), + new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG) + }, 200); makeRecipe(new ComparableStack(ModItems.drillbit, 1, EnumDrillType.STEEL.ordinal()), new AStack[] { new OreDictStack(STEEL.ingot(), 12), new OreDictStack(W.ingot(), 4) diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index ddc9b2e7a..cca303ab6 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -184,12 +184,14 @@ public class ChemplantRecipes extends SerializableRecipe { .outputItems(new ItemStack(ModItems.plate_kevlar, 4))); recipes.add(new ChemRecipe(55, "CONCRETE", 100) .inputItems( + new ComparableStack(ModItems.powder_cement, 1), new ComparableStack(Blocks.gravel, 8), new OreDictStack(KEY_SAND, 8)) .inputFluids(new FluidStack(Fluids.WATER, 2000)) .outputItems(new ItemStack(ModBlocks.concrete_smooth, 16))); recipes.add(new ChemRecipe(56, "CONCRETE_ASBESTOS", 100) .inputItems( + new ComparableStack(ModItems.powder_cement, 1), new ComparableStack(Blocks.gravel, 2), new OreDictStack(KEY_SAND, 2), (GeneralConfig.enableLBSM && GeneralConfig.enableLBSMSimpleChemsitry) ? @@ -199,9 +201,10 @@ public class ChemplantRecipes extends SerializableRecipe { .outputItems(new ItemStack(ModBlocks.concrete_asbestos, 16))); recipes.add(new ChemRecipe(79, "DUCRETE", 150) .inputItems( + new ComparableStack(ModItems.powder_cement, 4), + new ComparableStack(Blocks.gravel, 2), new OreDictStack(KEY_SAND, 8), - new OreDictStack(U238.billet(), 2), - new ComparableStack(Items.clay_ball, 4)) + new OreDictStack(U238.billet(), 2)) .inputFluids(new FluidStack(Fluids.WATER, 2000)) .outputItems(new ItemStack(ModBlocks.ducrete_smooth, 8))); recipes.add(new ChemRecipe(57, "SOLID_FUEL", 200) @@ -409,7 +412,7 @@ public class ChemplantRecipes extends SerializableRecipe { .outputFluids(new FluidStack(1000, Fluids.LPG))); recipes.add(new ChemRecipe(34, "OIL_SAND", 200) .inputItems(new ComparableStack(ModBlocks.ore_oil_sand, 16), new OreDictStack(ANY_TAR.any(), 1)) - .outputItems(new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4)) + .outputItems(new ItemStack(Blocks.sand, 16)) .outputFluids(new FluidStack(1000, Fluids.BITUMEN))); recipes.add(new ChemRecipe(35, "ASPHALT", 100) .inputItems(new ComparableStack(Blocks.gravel, 2), new ComparableStack(Blocks.sand, 6)) diff --git a/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java b/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java index 6acfc9df1..87e1fcc5a 100644 --- a/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java @@ -64,6 +64,8 @@ public class CokerRecipes extends SerializableRecipe { registerRecipe(CALCIUM_SOLUTION, 125, new ItemStack(ModItems.powder_calcium), new FluidStack(SPENTSTEAM, 100)); //only cokable gas to extract sulfur content registerRecipe(SOURGAS, 250, new ItemStack(ModItems.sulfur), new FluidStack(GAS_COKER, 150)); + registerRecipe(SLOP, 1000, new ItemStack(ModItems.powder_limestone), new FluidStack(COLLOID, 250)); + registerRecipe(VITRIOL, 4000, new ItemStack(ModItems.powder_iron), new FluidStack(SULFURIC_ACID, 500)); } private static void registerAuto(FluidType fluid, FluidType type) { diff --git a/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java b/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java index e512e8529..8f4bf4b83 100644 --- a/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java @@ -54,6 +54,7 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(SODALITE.gem(), new Pair(new ItemStack(ModItems.powder_sodium), new FluidStack(Fluids.CHLORINE, 100))); recipes.put(new ComparableStack(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE)), new Pair(new ItemStack(ModItems.ingot_aluminium, 2), new FluidStack(Fluids.REDMUD, 250))); recipes.put(NA.dust(), new Pair(null, new FluidStack(Fluids.SODIUM, 100))); + recipes.put(LIMESTONE.dust(), new Pair(new ItemStack(ModItems.powder_calcium), new FluidStack(Fluids.CARBONDIOXIDE, 50))); recipes.put(KEY_LOG, new Pair(new ItemStack(Items.coal, 1 ,1), new FluidStack(Fluids.WOODOIL, 250))); recipes.put(KEY_SAPLING, new Pair(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.WOOD), new FluidStack(Fluids.WOODOIL, 50))); diff --git a/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java b/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java index b60884f26..256c4d0d0 100644 --- a/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java @@ -26,6 +26,7 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe { public void registerDefaults() { recipes.put(Fluids.WATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.HYDROGEN, 200), new FluidStack(Fluids.OXYGEN, 200))); recipes.put(Fluids.HEAVYWATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.DEUTERIUM, 200), new FluidStack(Fluids.OXYGEN, 200))); + recipes.put(Fluids.VITRIOL, new ElectrolysisRecipe(1_000, new FluidStack(Fluids.SULFURIC_ACID, 500), new FluidStack(Fluids.CHLORINE, 500), new ItemStack(ModItems.powder_iron), new ItemStack(ModItems.ingot_mercury))); recipes.put(Fluids.POTASSIUM_CHLORIDE, new ElectrolysisRecipe(250, new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.NONE, 0), new ItemStack(ModItems.dust))); recipes.put(Fluids.CALCIUM_CHLORIDE, new ElectrolysisRecipe(250, new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.CALCIUM_SOLUTION, 125))); diff --git a/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java b/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java index 3af3808a7..a86df1e6c 100644 --- a/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java @@ -54,6 +54,7 @@ public class LiquefactionRecipes extends SerializableRecipe { recipes.put(new ComparableStack(Blocks.packed_ice), new FluidStack(1000, Fluids.WATER)); recipes.put(new ComparableStack(Items.ender_pearl), new FluidStack(100, Fluids.ENDERJUICE)); recipes.put(new ComparableStack(ModItems.pellet_charged), new FluidStack(4000, Fluids.HELIUM4)); + recipes.put(new ComparableStack(ModBlocks.ore_oil_sand), new FluidStack(100, Fluids.BITUMEN)); recipes.put(new ComparableStack(Items.sugar), new FluidStack(100, Fluids.ETHANOL)); recipes.put(new ComparableStack(ModBlocks.plant_flower, 1, 3), new FluidStack(150, Fluids.ETHANOL)); @@ -67,10 +68,6 @@ public class LiquefactionRecipes extends SerializableRecipe { recipes.put(new ComparableStack(Blocks.tallgrass, 1, 1), new FluidStack(100, Fluids.SEEDSLURRY)); recipes.put(new ComparableStack(Blocks.tallgrass, 1, 2), new FluidStack(100, Fluids.SEEDSLURRY)); recipes.put(new ComparableStack(Blocks.vine), new FluidStack(100, Fluids.SEEDSLURRY)); - - //recipes.put(new ComparableStack(ModItems.solid_fuel_bf), new FluidStack(250, Fluids.BALEFIRE)); - - //TODO: more recipes as the crack oil derivatives are added } public static FluidStack getOutput(ItemStack stack) { diff --git a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index a996eaec5..bee6a3e70 100644 --- a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -98,6 +98,13 @@ public class SILEXRecipes { recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.DEATH.getID()), new SILEXRecipe(1000, 1000, 4) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_impure_osmiridium), 1)) ); + + recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.VITRIOL.getID()), new SILEXRecipe(1000, 1000, EnumWavelengths.IR) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_bromine), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.pill_iodine), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_iron), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.sulfur), 15)) + ); for(int i = 0; i < 5; i++) { diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 32260e21b..b395c861e 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -171,7 +171,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(Blocks.clay, new ItemStack(Items.clay_ball, 4)); ShredderRecipes.setRecipe(Blocks.hardened_clay, new ItemStack(Items.clay_ball, 4)); ShredderRecipes.setRecipe(Blocks.tnt, new ItemStack(Items.gunpowder, Compat.isModLoaded(Compat.MOD_GT6) ? 4 : 5)); - ShredderRecipes.setRecipe(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.LIMESTONE), new ItemStack(ModItems.powder_calcium)); + ShredderRecipes.setRecipe(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.LIMESTONE), new ItemStack(ModItems.powder_limestone, 4)); ShredderRecipes.setRecipe(ModBlocks.stone_gneiss, new ItemStack(ModItems.powder_lithium_tiny, 1)); ShredderRecipes.setRecipe(ModItems.powder_lapis, new ItemStack(ModItems.powder_cobalt_tiny, 1)); ShredderRecipes.setRecipe(ModItems.fragment_neodymium, new ItemStack(ModItems.powder_neodymium_tiny, 1)); @@ -208,6 +208,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(ModBlocks.machine_well, new ItemStack(ModItems.powder_steel, 32)); ShredderRecipes.setRecipe(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), new ItemStack(ModItems.powder_desh_mix)); ShredderRecipes.setRecipe(Blocks.sand, new ItemStack(ModItems.dust, 2)); + ShredderRecipes.setRecipe(ModBlocks.block_slag, new ItemStack(ModItems.powder_cement, 4)); List logs = OreDictionary.getOres("logWood"); List planks = OreDictionary.getOres("plankWood"); diff --git a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java index cba463d6f..fcef009fe 100644 --- a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java @@ -9,6 +9,7 @@ import java.util.Map.Entry; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; +import com.hbm.blocks.ModBlocks; import com.hbm.inventory.FluidStack; import com.hbm.inventory.OreDictManager.DictFrame; import com.hbm.inventory.fluid.FluidType; @@ -69,6 +70,7 @@ public class SolidificationRecipes extends SerializableRecipe { registerRecipe(WATZ, 1000, ModItems.ingot_mud); registerRecipe(REDMUD, 1000, Items.iron_ingot); registerRecipe(SODIUM, 100, ModItems.powder_sodium); + registerRecipe(SLOP, 250, ModBlocks.ore_oil_sand); registerRecipe(OIL, SF_OIL, DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE)); registerRecipe(CRACKOIL, SF_CRACK, DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRACK)); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f58d01323..5abec7129 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -116,6 +116,8 @@ public class ModItems { public static Item coal_infernal; public static Item cinnebar; public static Item powder_ash; + public static Item powder_limestone; + public static Item powder_cement; public static Item niter; public static Item ingot_copper; @@ -2757,6 +2759,8 @@ public class ModItems { coal_infernal = new Item().setUnlocalizedName("coal_infernal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coal_infernal"); cinnebar = new Item().setUnlocalizedName("cinnebar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cinnebar"); powder_ash = new ItemEnumMulti(EnumAshType.class, true, true).setUnlocalizedName("powder_ash").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ash"); + powder_limestone = new Item().setUnlocalizedName("powder_limestone").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_limestone"); + powder_cement = new Item().setUnlocalizedName("powder_cement").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cement"); ingot_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("ingot_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_gh336"); nugget_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("nugget_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_gh336"); @@ -5918,6 +5922,8 @@ public class ModItems { GameRegistry.registerItem(dust_tiny, dust_tiny.getUnlocalizedName()); GameRegistry.registerItem(fallout, fallout.getUnlocalizedName()); GameRegistry.registerItem(powder_ash, powder_ash.getUnlocalizedName()); + GameRegistry.registerItem(powder_limestone, powder_limestone.getUnlocalizedName()); + GameRegistry.registerItem(powder_cement, powder_cement.getUnlocalizedName()); //Powders GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index f8ee016ff..2096fb388 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -152,20 +152,32 @@ public class HbmWorldGen implements IWorldGenerator { DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.malachiteSpawn, 16, 6, 40, ModBlocks.stone_resource, EnumStoneType.MALACHITE.ordinal()); DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.limestoneSpawn, 12, 25, 30, ModBlocks.stone_resource, EnumStoneType.LIMESTONE.ordinal()); - - if(rand.nextInt(3) == 0) { - @SuppressWarnings("unchecked") - WeightedRandomGeneric item = (WeightedRandomGeneric) WeightedRandom.getRandomItem(rand, BedrockOre.weightedOres); - BedrockOreDefinition def = item.get(); - - if(GeneralConfig.enable528 && GeneralConfig.enable528BedrockReplacement) { - BedrockOreDefinition replacement = BedrockOre.replacements.get(def.id); - if(replacement != null) def = replacement; + + if(WorldConfig.newBedrockOres) { + + if(rand.nextInt(10) == 0) { + int randPosX = i + rand.nextInt(2) + 8; + int randPosZ = j + rand.nextInt(2) + 8; + + BedrockOre.generate(world, randPosX, randPosZ, new ItemStack(ModItems.bedrock_ore_base), null, 0xD78A16, 1); + } + + } else { + + if(rand.nextInt(3) == 0) { + @SuppressWarnings("unchecked") + WeightedRandomGeneric item = (WeightedRandomGeneric) WeightedRandom.getRandomItem(rand, BedrockOre.weightedOres); + BedrockOreDefinition def = item.get(); + + if(GeneralConfig.enable528 && GeneralConfig.enable528BedrockReplacement) { + BedrockOreDefinition replacement = BedrockOre.replacements.get(def.id); + if(replacement != null) def = replacement; + } + + int randPosX = i + rand.nextInt(2) + 8; + int randPosZ = j + rand.nextInt(2) + 8; + BedrockOre.generate(world, randPosX, randPosZ, def.stack, def.acid, def.color, def.tier); } - - int randPosX = i + rand.nextInt(2) + 8; - int randPosZ = j + rand.nextInt(2) + 8; - BedrockOre.generate(world, randPosX, randPosZ, def.stack, def.acid, def.color, def.tier); } for(int k = 0; k < WorldConfig.randomSpawn; k++) { diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index a349a3ac8..2c3546964 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -985,14 +985,14 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.radar_screen), new Object[] { "PCP", "SRS", "PCP", 'P', ANY_PLASTIC.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'S', STEEL.plate(), 'R', ModItems.crt_display }); addRecipeAuto(new ItemStack(ModItems.radar_linker), new Object[] { "S", "C", "P", 'S', ModItems.crt_display, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'P', STEEL.plate() }); - addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()), new Object[] { "PPP", "HCH", " B ", 'P', ANY_PLASTIC.ingot(), 'H', STEEL.shell(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'B', ModBlocks.crate_steel }); + addRecipeAuto(new ItemStack(ModItems.drone, 2, EnumDroneType.PATROL.ordinal()), new Object[] { " P ", "HCH", " B ", 'P', ANY_PLASTIC.ingot(), 'H', STEEL.pipe(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'B', STEEL.shell() }); addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()), new Object[] { "E", "D", 'E', Items.ender_pearl, 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()) }); addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()), new Object[] { " P ", "KDK", " P ", 'P', TI.plateWelded(), 'K', Fluids.KEROSENE.getDict(1_000), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()) }); addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()), new Object[] { "E", "D", 'E', Items.ender_pearl, 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()) }); addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()), new Object[] { " P ", "KDK", " P ", 'P', TI.plateWelded(), 'K', Fluids.KEROSENE.getDict(1_000), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()) }); addShapelessAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()), new Object[] { new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()) }); addShapelessAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()), new Object[] { new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()) }); - addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.REQUEST.ordinal()), new Object[] { "E", "D", 'E', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()) }); + addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.REQUEST.ordinal()), new Object[] { "E", "D", 'E', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()) }); addRecipeAuto(new ItemStack(ModItems.drone_linker), new Object[] { "T", "C", 'T', ModBlocks.drone_waypoint, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC) }); addRecipeAuto(new ItemStack(ModBlocks.drone_waypoint, 4), new Object[] { "G", "T", "C", 'G', KEY_GREEN, 'T', Blocks.redstone_torch, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC) }); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 579378084..16c228226 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -2717,6 +2717,7 @@ item.ore_byproduct.b_uranium.name=Kristallines Uranfragment item.ore_centrifuged.name=Zentrifugiertes %serz item.ore_cleaned.name=Gereinigtes %serz item.ore_deepcleaned.name=Tiefengereinigtes %serz +item.ore_density_scanner.name=Bedrockerz-Analysegerät item.ore_enriched.name=Reiches %serz item.ore_nitrated.name=Nitriertes %serz item.ore_nitrocrystalline.name=Nitrokristallines %serz @@ -2880,6 +2881,7 @@ item.powder_bromine.name=Bromstaub item.powder_cadmium.name=Cadmiumstaub item.powder_caesium.name=Caesiumstaub item.powder_calcium.name=Kalziumstaub +item.powder_cement.name=Zement item.powder_cerium.name=Cerstaub item.powder_cerium_tiny.name=Kleiner Haufen Cerstaub item.powder_chlorocalcite.name=Chlorokalzit @@ -2920,6 +2922,7 @@ item.powder_lanthanium_tiny.name=Kleiner Haufen Lanthanstaub item.powder_lapis.name=Lapis Lazuli-Staub item.powder_lead.name=Bleistaub item.powder_lignite.name=Braunkohlestaub +item.powder_limestone.name=Kalksteinstaub item.powder_lithium.name=Lithiumstaub item.powder_lithium_tiny.name=Kleiner Haufen Lithiumstaub item.powder_magic.name=Pulverisierte Verzauberung diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 3c66144ae..97dcf2552 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -770,7 +770,7 @@ container.machineITER=Fusion Reactor container.machineLargeTurbine=Industrial Steam Turbine container.machineLiquefactor=Liquefactor container.machineMixer=Industrial Mixer -container.machineOreSlopper=B.E.P. +container.machineOreSlopper=B.O.P. container.machineRefinery=Oil Refinery container.machineSelenium=Radial Performance Engine container.machineShredder=Shredder @@ -3548,6 +3548,7 @@ item.ore_byproduct.b_uranium.name=Crystalline Uranium Fragment item.ore_centrifuged.name=Centrifuged %s Ore item.ore_cleaned.name=Cleaned %s Ore item.ore_deepcleaned.name=Deep Cleaned %s Ore +item.ore_density_scanner.name=Bedrock Ore Density Scanner item.ore_enriched.name=Enriched %s Ore item.ore_nitrated.name=Nitrated %s Ore item.ore_nitrocrystalline.name=Nitrocrystalline %s Ore @@ -3758,6 +3759,7 @@ item.powder_bromine.name=Bromine Powder item.powder_cadmium.name=Cadmium Powder item.powder_caesium.name=Caesium Powder item.powder_calcium.name=Calcium Powder +item.powder_cement.name=Cement item.powder_cerium.name=Cerium Powder item.powder_cerium_tiny.name=Tiny Pile of Cerium Powder item.powder_chlorocalcite.name=Chlorocalcite @@ -3800,6 +3802,7 @@ item.powder_lanthanium_tiny.name=Tiny Pile of Lanthanium Powder item.powder_lapis.name=Lapis Lazuli Powder item.powder_lead.name=Lead Powder item.powder_lignite.name=Lignite Powder +item.powder_limestone.name=Limestone Powder item.powder_lithium.name=Lithium Powder item.powder_lithium_tiny.name=Tiny Pile of Lithium Powder item.powder_magic.name=Pulverized Enchantment diff --git a/src/main/resources/assets/hbm/models/machines/ore_slopper.obj b/src/main/resources/assets/hbm/models/machines/ore_slopper.obj index a49ae6e1c..6af1aea03 100644 --- a/src/main/resources/assets/hbm/models/machines/ore_slopper.obj +++ b/src/main/resources/assets/hbm/models/machines/ore_slopper.obj @@ -3159,6 +3159,8 @@ vt -0.000000 0.410256 vt 0.341463 -0.000000 vt -0.000000 0.000000 vt 0.341463 -0.000000 +vt 0.000000 0.102564 +vt 0.000000 0.000000 vt 0.390244 0.410256 vt 0.341463 0.102564 vt 0.390244 0.102564 @@ -3582,7 +3584,6 @@ vt 0.914634 0.705128 vt 0.804878 0.705128 vt 0.804878 0.807692 vt 0.341463 0.410256 -vt -0.000000 -0.000000 vt 0.341463 0.410256 vt 0.353659 0.448718 vt 0.439024 0.461538 @@ -3799,547 +3800,547 @@ s off f 613/1067/72 612/1068/72 611/1069/72 f 616/1070/73 617/1071/73 615/1072/73 f 614/1073/74 616/1070/74 612/1074/74 -f 611/1069/75 617/1075/75 613/1067/75 -f 613/1076/76 618/1077/76 614/1078/76 -f 612/1079/77 615/1080/77 611/1081/77 -f 647/1082/72 662/1083/72 646/1084/72 -f 647/1085/72 664/1086/72 663/1087/72 -f 649/1088/72 664/1086/72 648/1089/72 -f 650/1090/72 665/1091/72 649/1092/72 -f 635/1093/72 666/1094/72 650/1095/72 -f 636/1096/72 651/1097/72 635/1098/72 -f 637/1099/72 652/1100/72 636/1101/72 -f 638/1102/72 653/1103/72 637/1104/72 -f 639/1105/72 654/1106/72 638/1107/72 -f 639/1108/72 656/1109/72 655/1110/72 -f 640/1111/72 657/1112/72 656/1109/72 -f 641/1113/72 658/1114/72 657/1112/72 -f 642/1115/72 659/1116/72 658/1114/72 -f 643/1117/72 660/1118/72 659/1116/72 -f 645/1119/72 660/1118/72 644/1120/72 -f 645/1121/72 662/1083/72 661/1122/72 -f 679/1123/73 694/1124/73 678/1125/73 -f 680/1126/73 695/1127/73 679/1123/73 -f 681/1128/73 696/1129/73 680/1126/73 -f 681/1128/73 698/1130/73 697/1131/73 -f 682/1132/73 683/1133/73 698/1134/73 -f 668/1135/73 683/1136/73 667/1137/73 -f 668/1135/73 685/1138/73 684/1139/73 -f 669/1140/73 686/1141/73 685/1142/73 -f 670/1143/73 687/1144/73 686/1145/73 -f 671/1146/73 688/1147/73 687/1148/73 -f 673/1149/73 688/1150/73 672/1151/73 -f 674/1152/73 689/1153/73 673/1149/73 -f 674/1152/73 691/1154/73 690/1155/73 -f 676/1156/73 691/1157/73 675/1158/73 -f 677/1159/73 692/1160/73 676/1156/73 -f 677/1159/73 694/1161/73 693/1162/73 -f 699/1163/73 703/1164/73 707/1165/73 -f 755/1166/74 760/1167/74 756/1168/74 -f 719/1169/76 726/1170/76 722/1171/76 -f 717/1172/76 722/1171/76 718/1173/76 -f 716/1174/77 720/1175/77 715/1176/77 -f 718/1173/74 721/1177/74 716/1178/74 -f 715/1176/75 719/1169/75 717/1172/75 -f 766/1179/73 725/1180/73 726/1170/73 -f 721/1181/77 724/1182/77 720/1175/77 -f 722/1171/78 725/1183/78 721/1177/78 -f 720/1175/79 723/1184/79 719/1169/79 -f 733/1185/73 738/1186/73 737/1187/73 -f 732/1188/73 735/1189/73 731/1190/73 -f 727/1191/75 731/1190/75 729/1192/75 -f 729/1192/76 734/1193/76 730/1194/76 -f 731/1190/73 738/1195/73 734/1193/73 -f 730/1194/74 733/1185/74 728/1196/74 -f 735/1197/77 742/1198/77 738/1195/77 -f 736/1199/74 739/1200/74 735/1189/74 -f 738/1186/75 741/1201/75 737/1187/75 -f 745/1202/80 741/1203/80 742/1204/80 -f 745/1202/73 744/1205/73 743/1206/73 -f 742/1204/81 746/1207/81 745/1202/81 -f 740/1208/82 746/1207/82 739/1209/82 -f 747/1210/72 757/1211/72 748/1212/72 -f 753/1213/83 751/1214/83 752/1215/83 -f 748/1212/72 758/1216/72 750/1217/72 -f 748/1218/74 754/1219/74 753/1220/74 -f 747/1221/75 751/1214/75 749/1222/75 -f 749/1222/76 754/1219/76 750/1217/76 -f 749/1222/72 756/1223/72 747/1210/72 -f 750/1217/72 755/1224/72 749/1222/72 -f 759/1225/72 761/1226/72 760/1167/72 -f 758/1227/77 759/1225/77 755/1228/77 -f 756/1229/76 761/1226/76 757/1230/76 -f 757/1231/75 762/1232/75 758/1233/75 -f 766/1234/79 769/1235/79 764/1236/79 -f 765/1237/73 726/1170/73 723/1238/73 -f 763/1239/73 723/1238/73 724/1240/73 -f 764/1241/73 724/1240/73 725/1180/73 -f 769/1235/73 767/1242/73 768/1243/73 -f 763/1244/78 767/1242/78 765/1245/78 -f 765/1246/77 770/1247/77 766/1248/77 -f 764/1249/76 768/1243/76 763/1250/76 -f 772/1251/77 776/1252/77 771/1253/77 -f 774/1254/74 777/1255/74 772/1251/74 -f 771/1256/75 775/1257/75 773/1258/75 -f 773/1258/76 778/1259/76 774/1254/76 -f 780/1260/77 784/1261/77 779/1262/77 -f 782/1263/74 785/1264/74 780/1260/74 -f 779/1265/75 783/1266/75 781/1267/75 -f 781/1267/76 786/1268/76 782/1263/76 -f 788/1269/77 792/1270/77 787/1271/77 -f 790/1272/74 793/1273/74 788/1269/74 -f 787/1274/75 791/1275/75 789/1276/75 -f 789/1276/76 794/1277/76 790/1272/76 -f 796/1278/77 800/1279/77 795/1280/77 -f 798/1281/74 801/1282/74 796/1278/74 -f 795/1283/75 799/1284/75 797/1285/75 -f 797/1285/76 802/1286/76 798/1281/76 -f 830/1287/73 631/1288/73 630/1289/73 -f 631/1290/73 832/1291/73 632/1292/73 -f 832/1291/73 633/1293/73 632/1294/73 -f 833/1295/73 634/1296/73 633/1297/73 -f 834/1298/73 619/1299/73 634/1300/73 -f 819/1301/73 620/1302/73 619/1303/73 -f 820/1304/73 621/1305/73 620/1306/73 -f 821/1307/73 622/1308/73 621/1309/73 -f 822/1310/73 623/1311/73 622/1312/73 -f 623/1313/73 824/1314/73 624/1315/73 -f 624/1316/73 825/1317/73 625/1318/73 -f 625/1319/73 826/1320/73 626/1321/73 -f 626/1322/73 827/1323/73 627/1324/73 -f 627/1325/73 828/1326/73 628/1327/73 -f 828/1326/73 629/1328/73 628/1329/73 -f 629/1330/73 830/1287/73 630/1331/73 -f 837/1332/72 836/1333/72 835/1334/72 -f 841/1335/73 839/1336/73 840/1337/73 -f 838/1338/74 841/1335/74 836/1333/74 -f 835/1339/75 839/1336/75 837/1340/75 -f 837/1341/76 842/1342/76 838/1343/76 -f 836/1344/77 840/1337/77 835/1345/77 -f 845/1346/72 844/1347/72 843/1348/72 -f 849/1349/73 847/1350/73 848/1351/73 -f 846/1352/74 849/1349/74 844/1347/74 -f 843/1353/75 847/1350/75 845/1354/75 -f 845/1355/76 850/1356/76 846/1357/76 -f 844/1358/77 848/1351/77 843/1359/77 -f 852/1360/77 856/1361/77 851/1362/77 -f 854/1363/74 857/1364/74 852/1360/74 -f 851/1365/75 855/1366/75 853/1367/75 -f 853/1367/76 858/1368/76 854/1363/76 -f 860/1369/77 864/1370/77 859/1371/77 -f 862/1372/74 865/1373/74 860/1369/74 -f 859/1374/75 863/1375/75 861/1376/75 -f 861/1376/76 866/1377/76 862/1372/76 -f 900/1378/77 904/1379/77 899/1380/77 -f 902/1381/74 905/1382/74 900/1378/74 -f 899/1383/75 903/1384/75 901/1385/75 -f 901/1385/76 906/1386/76 902/1381/76 -f 908/1387/77 912/1388/77 907/1389/77 -f 910/1390/74 913/1391/74 908/1387/74 -f 907/1392/75 911/1393/75 909/1394/75 -f 909/1394/76 914/1395/76 910/1390/76 -f 925/1396/76 928/1397/76 924/1398/76 -f 919/1399/74 926/1400/74 922/1401/74 -f 918/1402/72 921/1403/72 916/1404/72 -f 915/1405/73 919/1406/73 917/1407/73 -f 917/1408/76 922/1401/76 918/1409/76 -f 916/1410/77 920/1411/77 915/1412/77 -f 921/1413/74 924/1398/74 920/1411/74 -f 922/1414/74 925/1415/74 921/1403/74 -f 920/1416/74 923/1417/74 919/1406/74 -f 929/1418/74 927/1419/74 928/1397/74 -f 926/1420/73 929/1418/73 925/1415/73 -f 924/1421/72 927/1419/72 923/1417/72 -f 923/1422/77 930/1423/77 926/1400/77 -f 932/1424/74 933/1425/74 931/1426/74 -f 936/1427/74 937/1428/74 935/1429/74 -f 940/1430/74 941/1431/74 939/1432/74 -f 944/1433/74 945/1434/74 943/1435/74 -f 948/1436/74 949/1437/74 947/1438/74 -f 958/1439/75 959/1440/75 955/1441/75 -f 952/1442/72 958/1443/72 954/1444/72 -f 953/1445/73 956/1446/73 951/1447/73 -f 954/1448/76 955/1441/76 953/1449/76 -f 951/1450/77 957/1451/77 952/1452/77 -f 960/1453/76 965/1454/76 961/1455/76 -f 956/1456/75 961/1455/75 957/1451/75 -f 957/1457/75 962/1458/75 958/1443/75 -f 955/1459/75 960/1460/75 956/1446/75 -f 966/1461/75 964/1462/75 963/1463/75 -f 961/1464/73 966/1461/73 962/1458/73 -f 959/1465/72 964/1462/72 960/1460/72 -f 962/1466/77 963/1463/77 959/1440/77 -f 970/1467/84 968/1468/84 967/1469/84 -f 977/1470/76 974/1471/76 973/1472/76 -f 976/1473/77 971/1474/77 972/1475/77 -f 978/1476/74 972/1475/74 974/1471/74 -f 975/1477/75 973/1472/75 971/1478/75 -f 985/1479/76 982/1480/76 981/1481/76 -f 984/1482/77 979/1483/77 980/1484/77 -f 986/1485/74 980/1484/74 982/1480/74 -f 983/1486/75 981/1481/75 979/1487/75 -f 989/1488/72 988/1489/72 987/1490/72 -f 992/1491/73 993/1492/73 991/1493/73 -f 990/1494/75 992/1491/75 988/1495/75 -f 988/1489/76 991/1493/76 987/1490/76 -f 987/1496/74 993/1492/74 989/1497/74 -f 613/1067/72 614/1498/72 612/1068/72 -f 616/1070/73 618/1077/73 617/1071/73 -f 614/1073/74 618/1077/74 616/1070/74 -f 611/1069/75 615/1499/75 617/1075/75 -f 613/1076/76 617/1071/76 618/1077/76 -f 612/1079/77 616/1500/77 615/1080/77 -f 647/1082/72 663/1087/72 662/1083/72 -f 647/1085/72 648/1501/72 664/1086/72 -f 649/1088/72 665/1091/72 664/1086/72 -f 650/1090/72 666/1094/72 665/1091/72 -f 635/1093/72 651/1502/72 666/1094/72 -f 636/1096/72 652/1100/72 651/1097/72 -f 637/1099/72 653/1103/72 652/1100/72 -f 638/1102/72 654/1106/72 653/1103/72 -f 639/1105/72 655/1110/72 654/1106/72 -f 639/1108/72 640/1503/72 656/1109/72 -f 640/1111/72 641/1504/72 657/1112/72 -f 641/1113/72 642/1505/72 658/1114/72 -f 642/1115/72 643/1506/72 659/1116/72 -f 643/1117/72 644/1507/72 660/1118/72 -f 645/1119/72 661/1122/72 660/1118/72 -f 645/1121/72 646/1508/72 662/1083/72 -f 679/1123/73 695/1509/73 694/1124/73 -f 680/1126/73 696/1510/73 695/1127/73 -f 681/1128/73 697/1511/73 696/1129/73 -f 681/1128/73 682/1132/73 698/1130/73 -f 682/1132/73 667/1512/73 683/1133/73 -f 668/1135/73 684/1513/73 683/1136/73 -f 668/1135/73 669/1140/73 685/1138/73 -f 669/1140/73 670/1143/73 686/1141/73 -f 670/1143/73 671/1146/73 687/1144/73 -f 671/1146/73 672/1151/73 688/1147/73 -f 673/1149/73 689/1514/73 688/1150/73 -f 674/1152/73 690/1515/73 689/1153/73 -f 674/1152/73 675/1158/73 691/1154/73 -f 676/1156/73 692/1516/73 691/1157/73 -f 677/1159/73 693/1517/73 692/1160/73 -f 677/1159/73 678/1125/73 694/1161/73 -f 699/1163/73 700/1518/73 701/1519/73 -f 701/1519/73 702/1520/73 703/1164/73 -f 703/1164/73 704/1521/73 707/1165/73 -f 704/1521/73 705/1522/73 707/1165/73 -f 705/1522/73 706/1523/73 707/1165/73 -f 707/1165/73 708/1524/73 709/1525/73 -f 709/1525/73 710/1526/73 707/1165/73 -f 710/1526/73 711/1527/73 707/1165/73 -f 711/1527/73 712/1528/73 713/1529/73 -f 713/1529/73 714/1530/73 699/1163/73 -f 699/1163/73 701/1519/73 703/1164/73 -f 711/1527/73 713/1529/73 707/1165/73 -f 713/1529/73 699/1163/73 707/1165/73 -f 755/1166/74 759/1225/74 760/1167/74 -f 719/1169/76 723/1238/76 726/1170/76 -f 717/1172/76 719/1169/76 722/1171/76 -f 716/1174/77 721/1181/77 720/1175/77 -f 718/1173/74 722/1171/74 721/1177/74 -f 715/1176/75 720/1175/75 719/1169/75 -f 766/1179/73 764/1241/73 725/1180/73 -f 721/1181/77 725/1531/77 724/1182/77 -f 722/1171/78 726/1532/78 725/1183/78 -f 720/1175/79 724/1533/79 723/1184/79 -f 733/1185/73 734/1193/73 738/1186/73 -f 732/1188/73 736/1199/73 735/1189/73 -f 727/1191/75 732/1188/75 731/1190/75 -f 729/1192/76 731/1190/76 734/1193/76 -f 731/1190/73 735/1197/73 738/1195/73 -f 730/1194/74 734/1193/74 733/1185/74 -f 735/1197/77 739/1534/77 742/1198/77 -f 736/1199/74 740/1535/74 739/1200/74 -f 738/1186/75 742/1536/75 741/1201/75 -f 745/1202/80 743/1206/80 741/1203/80 -f 745/1202/73 746/1207/73 744/1205/73 -f 742/1204/81 739/1209/81 746/1207/81 -f 740/1208/82 744/1205/82 746/1207/82 -f 747/1210/72 756/1223/72 757/1211/72 -f 753/1213/83 754/1219/83 751/1214/83 -f 748/1212/72 757/1211/72 758/1216/72 -f 748/1218/74 750/1217/74 754/1219/74 -f 747/1221/75 752/1537/75 751/1214/75 -f 749/1222/76 751/1214/76 754/1219/76 -f 749/1222/72 755/1224/72 756/1223/72 -f 750/1217/72 758/1216/72 755/1224/72 -f 759/1225/72 762/1232/72 761/1226/72 -f 758/1227/77 762/1232/77 759/1225/77 -f 756/1229/76 760/1167/76 761/1226/76 -f 757/1231/75 761/1226/75 762/1232/75 -f 766/1234/79 770/1247/79 769/1235/79 -f 765/1237/73 766/1179/73 726/1170/73 -f 763/1239/73 765/1237/73 723/1238/73 -f 764/1241/73 763/1239/73 724/1240/73 -f 769/1235/73 770/1247/73 767/1242/73 -f 763/1244/78 768/1243/78 767/1242/78 -f 765/1246/77 767/1242/77 770/1247/77 -f 764/1249/76 769/1235/76 768/1243/76 -f 772/1251/77 777/1255/77 776/1252/77 -f 774/1254/74 778/1259/74 777/1255/74 -f 771/1256/75 776/1538/75 775/1257/75 -f 773/1258/76 775/1257/76 778/1259/76 -f 780/1260/77 785/1264/77 784/1261/77 -f 782/1263/74 786/1268/74 785/1264/74 -f 779/1265/75 784/1539/75 783/1266/75 -f 781/1267/76 783/1266/76 786/1268/76 -f 788/1269/77 793/1273/77 792/1270/77 -f 790/1272/74 794/1277/74 793/1273/74 -f 787/1274/75 792/1540/75 791/1275/75 -f 789/1276/76 791/1275/76 794/1277/76 -f 796/1278/77 801/1282/77 800/1279/77 -f 798/1281/74 802/1286/74 801/1282/74 -f 795/1283/75 800/1541/75 799/1284/75 -f 797/1285/76 799/1284/76 802/1286/76 -f 830/1287/73 831/1542/73 631/1288/73 -f 631/1290/73 831/1542/73 832/1291/73 -f 832/1291/73 833/1295/73 633/1293/73 -f 833/1295/73 834/1298/73 634/1296/73 -f 834/1298/73 819/1543/73 619/1299/73 -f 819/1301/73 820/1304/73 620/1302/73 -f 820/1304/73 821/1307/73 621/1305/73 -f 821/1307/73 822/1310/73 622/1308/73 -f 822/1310/73 823/1544/73 623/1311/73 -f 623/1313/73 823/1544/73 824/1314/73 -f 624/1316/73 824/1314/73 825/1317/73 -f 625/1319/73 825/1317/73 826/1320/73 -f 626/1322/73 826/1320/73 827/1323/73 -f 627/1325/73 827/1323/73 828/1326/73 -f 828/1326/73 829/1545/73 629/1328/73 -f 629/1330/73 829/1545/73 830/1287/73 -f 837/1332/72 838/1338/72 836/1333/72 -f 841/1335/73 842/1342/73 839/1336/73 -f 838/1338/74 842/1342/74 841/1335/74 -f 835/1339/75 840/1337/75 839/1336/75 -f 837/1341/76 839/1336/76 842/1342/76 -f 836/1344/77 841/1335/77 840/1337/77 -f 845/1346/72 846/1352/72 844/1347/72 -f 849/1349/73 850/1356/73 847/1350/73 -f 846/1352/74 850/1356/74 849/1349/74 -f 843/1353/75 848/1351/75 847/1350/75 -f 845/1355/76 847/1350/76 850/1356/76 -f 844/1358/77 849/1349/77 848/1351/77 -f 852/1360/77 857/1364/77 856/1361/77 -f 854/1363/74 858/1368/74 857/1364/74 -f 851/1365/75 856/1546/75 855/1366/75 -f 853/1367/76 855/1366/76 858/1368/76 -f 860/1369/77 865/1373/77 864/1370/77 -f 862/1372/74 866/1377/74 865/1373/74 -f 859/1374/75 864/1547/75 863/1375/75 -f 861/1376/76 863/1375/76 866/1377/76 -f 900/1378/77 905/1382/77 904/1379/77 -f 902/1381/74 906/1386/74 905/1382/74 -f 899/1383/75 904/1548/75 903/1384/75 -f 901/1385/76 903/1384/76 906/1386/76 -f 908/1387/77 913/1391/77 912/1388/77 -f 910/1390/74 914/1395/74 913/1391/74 -f 907/1392/75 912/1549/75 911/1393/75 -f 909/1394/76 911/1393/76 914/1395/76 -f 925/1396/76 929/1418/76 928/1397/76 -f 919/1399/74 923/1422/74 926/1400/74 -f 918/1402/72 922/1414/72 921/1403/72 -f 915/1405/73 920/1416/73 919/1406/73 -f 917/1408/76 919/1399/76 922/1401/76 -f 916/1410/77 921/1413/77 920/1411/77 -f 921/1413/74 925/1396/74 924/1398/74 -f 922/1414/74 926/1420/74 925/1415/74 -f 920/1416/74 924/1421/74 923/1417/74 -f 929/1418/74 930/1423/74 927/1419/74 -f 926/1420/73 930/1423/73 929/1418/73 -f 924/1421/72 928/1397/72 927/1419/72 -f 923/1422/77 927/1419/77 930/1423/77 -f 932/1424/74 934/1550/74 933/1425/74 -f 936/1427/74 938/1551/74 937/1428/74 -f 940/1430/74 942/1552/74 941/1431/74 -f 944/1433/74 946/1553/74 945/1434/74 -f 948/1436/74 950/1554/74 949/1437/74 -f 958/1439/75 962/1466/75 959/1440/75 -f 952/1442/72 957/1457/72 958/1443/72 -f 953/1445/73 955/1459/73 956/1446/73 -f 954/1448/76 958/1439/76 955/1441/76 -f 951/1450/77 956/1456/77 957/1451/77 -f 960/1453/76 964/1462/76 965/1454/76 -f 956/1456/75 960/1453/75 961/1455/75 -f 957/1457/75 961/1464/75 962/1458/75 -f 955/1459/75 959/1465/75 960/1460/75 -f 966/1461/75 965/1454/75 964/1462/75 -f 961/1464/73 965/1454/73 966/1461/73 -f 959/1465/72 963/1463/72 964/1462/72 -f 962/1466/77 966/1461/77 963/1463/77 -f 970/1467/84 969/1555/84 968/1468/84 -f 977/1470/76 978/1476/76 974/1471/76 -f 976/1473/77 975/1556/77 971/1474/77 -f 978/1476/74 976/1473/74 972/1475/74 -f 975/1477/75 977/1470/75 973/1472/75 -f 985/1479/76 986/1485/76 982/1480/76 -f 984/1482/77 983/1557/77 979/1483/77 -f 986/1485/74 984/1482/74 980/1484/74 -f 983/1486/75 985/1479/75 981/1481/75 -f 989/1488/72 990/1558/72 988/1489/72 -f 992/1491/73 994/1559/73 993/1492/73 -f 990/1494/75 994/1559/75 992/1491/75 -f 988/1489/76 992/1491/76 991/1493/76 -f 987/1496/74 991/1493/74 993/1492/74 +f 611/1075/75 617/1076/75 613/1077/75 +f 613/1078/76 618/1079/76 614/1080/76 +f 612/1081/77 615/1082/77 611/1083/77 +f 647/1084/72 662/1085/72 646/1086/72 +f 647/1087/72 664/1088/72 663/1089/72 +f 649/1090/72 664/1088/72 648/1091/72 +f 650/1092/72 665/1093/72 649/1094/72 +f 635/1095/72 666/1096/72 650/1097/72 +f 636/1098/72 651/1099/72 635/1100/72 +f 637/1101/72 652/1102/72 636/1103/72 +f 638/1104/72 653/1105/72 637/1106/72 +f 639/1107/72 654/1108/72 638/1109/72 +f 639/1110/72 656/1111/72 655/1112/72 +f 640/1113/72 657/1114/72 656/1111/72 +f 641/1115/72 658/1116/72 657/1114/72 +f 642/1117/72 659/1118/72 658/1116/72 +f 643/1119/72 660/1120/72 659/1118/72 +f 645/1121/72 660/1120/72 644/1122/72 +f 645/1123/72 662/1085/72 661/1124/72 +f 679/1125/73 694/1126/73 678/1127/73 +f 680/1128/73 695/1129/73 679/1125/73 +f 681/1130/73 696/1131/73 680/1128/73 +f 681/1130/73 698/1132/73 697/1133/73 +f 682/1134/73 683/1135/73 698/1136/73 +f 668/1137/73 683/1138/73 667/1139/73 +f 668/1137/73 685/1140/73 684/1141/73 +f 669/1142/73 686/1143/73 685/1144/73 +f 670/1145/73 687/1146/73 686/1147/73 +f 671/1148/73 688/1149/73 687/1150/73 +f 673/1151/73 688/1152/73 672/1153/73 +f 674/1154/73 689/1155/73 673/1151/73 +f 674/1154/73 691/1156/73 690/1157/73 +f 676/1158/73 691/1159/73 675/1160/73 +f 677/1161/73 692/1162/73 676/1158/73 +f 677/1161/73 694/1163/73 693/1164/73 +f 699/1165/73 703/1166/73 707/1167/73 +f 755/1168/74 760/1169/74 756/1170/74 +f 719/1171/76 726/1172/76 722/1173/76 +f 717/1174/76 722/1173/76 718/1175/76 +f 716/1176/77 720/1177/77 715/1178/77 +f 718/1175/74 721/1179/74 716/1180/74 +f 715/1178/75 719/1171/75 717/1174/75 +f 766/1181/73 725/1182/73 726/1172/73 +f 721/1183/77 724/1184/77 720/1177/77 +f 722/1173/78 725/1185/78 721/1179/78 +f 720/1177/79 723/1186/79 719/1171/79 +f 733/1187/73 738/1188/73 737/1189/73 +f 732/1190/73 735/1191/73 731/1192/73 +f 727/1193/75 731/1192/75 729/1194/75 +f 729/1194/76 734/1195/76 730/1196/76 +f 731/1192/73 738/1197/73 734/1195/73 +f 730/1196/74 733/1187/74 728/1198/74 +f 735/1199/77 742/1200/77 738/1197/77 +f 736/1201/74 739/1202/74 735/1191/74 +f 738/1188/75 741/1203/75 737/1189/75 +f 745/1204/80 741/1205/80 742/1206/80 +f 745/1204/73 744/1207/73 743/1208/73 +f 742/1206/81 746/1209/81 745/1204/81 +f 740/1210/82 746/1209/82 739/1211/82 +f 747/1212/72 757/1213/72 748/1214/72 +f 753/1215/83 751/1216/83 752/1217/83 +f 748/1214/72 758/1218/72 750/1219/72 +f 748/1220/74 754/1221/74 753/1222/74 +f 747/1223/75 751/1216/75 749/1224/75 +f 749/1224/76 754/1221/76 750/1219/76 +f 749/1224/72 756/1225/72 747/1212/72 +f 750/1219/72 755/1226/72 749/1224/72 +f 759/1227/72 761/1228/72 760/1169/72 +f 758/1229/77 759/1227/77 755/1230/77 +f 756/1231/76 761/1228/76 757/1232/76 +f 757/1233/75 762/1234/75 758/1235/75 +f 766/1236/79 769/1237/79 764/1238/79 +f 765/1239/73 726/1172/73 723/1240/73 +f 763/1241/73 723/1240/73 724/1242/73 +f 764/1243/73 724/1242/73 725/1182/73 +f 769/1237/73 767/1244/73 768/1245/73 +f 763/1246/78 767/1244/78 765/1247/78 +f 765/1248/77 770/1249/77 766/1250/77 +f 764/1251/76 768/1245/76 763/1252/76 +f 772/1253/77 776/1254/77 771/1255/77 +f 774/1256/74 777/1257/74 772/1253/74 +f 771/1258/75 775/1259/75 773/1260/75 +f 773/1260/76 778/1261/76 774/1256/76 +f 780/1262/77 784/1263/77 779/1264/77 +f 782/1265/74 785/1266/74 780/1262/74 +f 779/1267/75 783/1268/75 781/1269/75 +f 781/1269/76 786/1270/76 782/1265/76 +f 788/1271/77 792/1272/77 787/1273/77 +f 790/1274/74 793/1275/74 788/1271/74 +f 787/1276/75 791/1277/75 789/1278/75 +f 789/1278/76 794/1279/76 790/1274/76 +f 796/1280/77 800/1281/77 795/1282/77 +f 798/1283/74 801/1284/74 796/1280/74 +f 795/1285/75 799/1286/75 797/1287/75 +f 797/1287/76 802/1288/76 798/1283/76 +f 830/1289/73 631/1290/73 630/1291/73 +f 631/1292/73 832/1293/73 632/1294/73 +f 832/1293/73 633/1295/73 632/1296/73 +f 833/1297/73 634/1298/73 633/1299/73 +f 834/1300/73 619/1301/73 634/1302/73 +f 819/1303/73 620/1304/73 619/1305/73 +f 820/1306/73 621/1307/73 620/1308/73 +f 821/1309/73 622/1310/73 621/1311/73 +f 822/1312/73 623/1313/73 622/1314/73 +f 623/1315/73 824/1316/73 624/1317/73 +f 624/1318/73 825/1319/73 625/1320/73 +f 625/1321/73 826/1322/73 626/1323/73 +f 626/1324/73 827/1325/73 627/1326/73 +f 627/1327/73 828/1328/73 628/1329/73 +f 828/1328/73 629/1330/73 628/1331/73 +f 629/1332/73 830/1289/73 630/1333/73 +f 837/1334/72 836/1335/72 835/1336/72 +f 841/1337/73 839/1338/73 840/1339/73 +f 838/1340/74 841/1337/74 836/1335/74 +f 835/1341/75 839/1338/75 837/1342/75 +f 837/1343/76 842/1344/76 838/1345/76 +f 836/1346/77 840/1339/77 835/1347/77 +f 845/1348/72 844/1349/72 843/1350/72 +f 849/1351/73 847/1352/73 848/1353/73 +f 846/1354/74 849/1351/74 844/1349/74 +f 843/1355/75 847/1352/75 845/1356/75 +f 845/1357/76 850/1358/76 846/1359/76 +f 844/1360/77 848/1353/77 843/1361/77 +f 852/1362/77 856/1363/77 851/1364/77 +f 854/1365/74 857/1366/74 852/1362/74 +f 851/1367/75 855/1368/75 853/1369/75 +f 853/1369/76 858/1370/76 854/1365/76 +f 860/1371/77 864/1372/77 859/1373/77 +f 862/1374/74 865/1375/74 860/1371/74 +f 859/1376/75 863/1377/75 861/1378/75 +f 861/1378/76 866/1379/76 862/1374/76 +f 900/1380/77 904/1381/77 899/1382/77 +f 902/1383/74 905/1384/74 900/1380/74 +f 899/1385/75 903/1386/75 901/1387/75 +f 901/1387/76 906/1388/76 902/1383/76 +f 908/1389/77 912/1390/77 907/1391/77 +f 910/1392/74 913/1393/74 908/1389/74 +f 907/1394/75 911/1395/75 909/1396/75 +f 909/1396/76 914/1397/76 910/1392/76 +f 925/1398/76 928/1399/76 924/1400/76 +f 919/1401/74 926/1402/74 922/1403/74 +f 918/1404/72 921/1405/72 916/1406/72 +f 915/1407/73 919/1408/73 917/1409/73 +f 917/1410/76 922/1403/76 918/1411/76 +f 916/1412/77 920/1413/77 915/1414/77 +f 921/1415/74 924/1400/74 920/1413/74 +f 922/1416/74 925/1417/74 921/1405/74 +f 920/1418/74 923/1419/74 919/1408/74 +f 929/1420/74 927/1421/74 928/1399/74 +f 926/1422/73 929/1420/73 925/1417/73 +f 924/1423/72 927/1421/72 923/1419/72 +f 923/1424/77 930/1425/77 926/1402/77 +f 932/1426/74 933/1427/74 931/1428/74 +f 936/1429/74 937/1430/74 935/1431/74 +f 940/1432/74 941/1433/74 939/1434/74 +f 944/1435/74 945/1436/74 943/1437/74 +f 948/1438/74 949/1439/74 947/1440/74 +f 958/1441/75 959/1442/75 955/1443/75 +f 952/1444/72 958/1445/72 954/1446/72 +f 953/1447/73 956/1448/73 951/1449/73 +f 954/1450/76 955/1443/76 953/1451/76 +f 951/1452/77 957/1453/77 952/1454/77 +f 960/1455/76 965/1456/76 961/1457/76 +f 956/1458/75 961/1457/75 957/1453/75 +f 957/1459/75 962/1460/75 958/1445/75 +f 955/1461/75 960/1462/75 956/1448/75 +f 966/1463/75 964/1464/75 963/1465/75 +f 961/1466/73 966/1463/73 962/1460/73 +f 959/1467/72 964/1464/72 960/1462/72 +f 962/1468/77 963/1465/77 959/1442/77 +f 970/1469/84 968/1470/84 967/1471/84 +f 977/1472/76 974/1473/76 973/1474/76 +f 976/1475/77 971/1476/77 972/1477/77 +f 978/1478/74 972/1477/74 974/1473/74 +f 975/1479/75 973/1474/75 971/1480/75 +f 985/1481/76 982/1482/76 981/1483/76 +f 984/1484/77 979/1485/77 980/1486/77 +f 986/1487/74 980/1486/74 982/1482/74 +f 983/1488/75 981/1483/75 979/1489/75 +f 989/1490/72 988/1491/72 987/1492/72 +f 992/1493/73 993/1494/73 991/1495/73 +f 990/1496/75 992/1493/75 988/1497/75 +f 988/1491/76 991/1495/76 987/1492/76 +f 987/1498/74 993/1494/74 989/1499/74 +f 613/1067/72 614/1500/72 612/1068/72 +f 616/1070/73 618/1079/73 617/1071/73 +f 614/1073/74 618/1079/74 616/1070/74 +f 611/1075/75 615/1082/75 617/1076/75 +f 613/1078/76 617/1071/76 618/1079/76 +f 612/1081/77 616/1501/77 615/1082/77 +f 647/1084/72 663/1089/72 662/1085/72 +f 647/1087/72 648/1502/72 664/1088/72 +f 649/1090/72 665/1093/72 664/1088/72 +f 650/1092/72 666/1096/72 665/1093/72 +f 635/1095/72 651/1503/72 666/1096/72 +f 636/1098/72 652/1102/72 651/1099/72 +f 637/1101/72 653/1105/72 652/1102/72 +f 638/1104/72 654/1108/72 653/1105/72 +f 639/1107/72 655/1112/72 654/1108/72 +f 639/1110/72 640/1504/72 656/1111/72 +f 640/1113/72 641/1505/72 657/1114/72 +f 641/1115/72 642/1506/72 658/1116/72 +f 642/1117/72 643/1507/72 659/1118/72 +f 643/1119/72 644/1508/72 660/1120/72 +f 645/1121/72 661/1124/72 660/1120/72 +f 645/1123/72 646/1509/72 662/1085/72 +f 679/1125/73 695/1510/73 694/1126/73 +f 680/1128/73 696/1511/73 695/1129/73 +f 681/1130/73 697/1512/73 696/1131/73 +f 681/1130/73 682/1134/73 698/1132/73 +f 682/1134/73 667/1513/73 683/1135/73 +f 668/1137/73 684/1514/73 683/1138/73 +f 668/1137/73 669/1142/73 685/1140/73 +f 669/1142/73 670/1145/73 686/1143/73 +f 670/1145/73 671/1148/73 687/1146/73 +f 671/1148/73 672/1153/73 688/1149/73 +f 673/1151/73 689/1515/73 688/1152/73 +f 674/1154/73 690/1516/73 689/1155/73 +f 674/1154/73 675/1160/73 691/1156/73 +f 676/1158/73 692/1517/73 691/1159/73 +f 677/1161/73 693/1518/73 692/1162/73 +f 677/1161/73 678/1127/73 694/1163/73 +f 699/1165/73 700/1519/73 701/1520/73 +f 701/1520/73 702/1521/73 703/1166/73 +f 703/1166/73 704/1522/73 707/1167/73 +f 704/1522/73 705/1523/73 707/1167/73 +f 705/1523/73 706/1524/73 707/1167/73 +f 707/1167/73 708/1525/73 709/1526/73 +f 709/1526/73 710/1527/73 707/1167/73 +f 710/1527/73 711/1528/73 707/1167/73 +f 711/1528/73 712/1529/73 713/1530/73 +f 713/1530/73 714/1531/73 699/1165/73 +f 699/1165/73 701/1520/73 703/1166/73 +f 711/1528/73 713/1530/73 707/1167/73 +f 713/1530/73 699/1165/73 707/1167/73 +f 755/1168/74 759/1227/74 760/1169/74 +f 719/1171/76 723/1240/76 726/1172/76 +f 717/1174/76 719/1171/76 722/1173/76 +f 716/1176/77 721/1183/77 720/1177/77 +f 718/1175/74 722/1173/74 721/1179/74 +f 715/1178/75 720/1177/75 719/1171/75 +f 766/1181/73 764/1243/73 725/1182/73 +f 721/1183/77 725/1532/77 724/1184/77 +f 722/1173/78 726/1533/78 725/1185/78 +f 720/1177/79 724/1534/79 723/1186/79 +f 733/1187/73 734/1195/73 738/1188/73 +f 732/1190/73 736/1201/73 735/1191/73 +f 727/1193/75 732/1190/75 731/1192/75 +f 729/1194/76 731/1192/76 734/1195/76 +f 731/1192/73 735/1199/73 738/1197/73 +f 730/1196/74 734/1195/74 733/1187/74 +f 735/1199/77 739/1535/77 742/1200/77 +f 736/1201/74 740/1536/74 739/1202/74 +f 738/1188/75 742/1537/75 741/1203/75 +f 745/1204/80 743/1208/80 741/1205/80 +f 745/1204/73 746/1209/73 744/1207/73 +f 742/1206/81 739/1211/81 746/1209/81 +f 740/1210/82 744/1207/82 746/1209/82 +f 747/1212/72 756/1225/72 757/1213/72 +f 753/1215/83 754/1221/83 751/1216/83 +f 748/1214/72 757/1213/72 758/1218/72 +f 748/1220/74 750/1219/74 754/1221/74 +f 747/1223/75 752/1538/75 751/1216/75 +f 749/1224/76 751/1216/76 754/1221/76 +f 749/1224/72 755/1226/72 756/1225/72 +f 750/1219/72 758/1218/72 755/1226/72 +f 759/1227/72 762/1234/72 761/1228/72 +f 758/1229/77 762/1234/77 759/1227/77 +f 756/1231/76 760/1169/76 761/1228/76 +f 757/1233/75 761/1228/75 762/1234/75 +f 766/1236/79 770/1249/79 769/1237/79 +f 765/1239/73 766/1181/73 726/1172/73 +f 763/1241/73 765/1239/73 723/1240/73 +f 764/1243/73 763/1241/73 724/1242/73 +f 769/1237/73 770/1249/73 767/1244/73 +f 763/1246/78 768/1245/78 767/1244/78 +f 765/1248/77 767/1244/77 770/1249/77 +f 764/1251/76 769/1237/76 768/1245/76 +f 772/1253/77 777/1257/77 776/1254/77 +f 774/1256/74 778/1261/74 777/1257/74 +f 771/1258/75 776/1539/75 775/1259/75 +f 773/1260/76 775/1259/76 778/1261/76 +f 780/1262/77 785/1266/77 784/1263/77 +f 782/1265/74 786/1270/74 785/1266/74 +f 779/1267/75 784/1540/75 783/1268/75 +f 781/1269/76 783/1268/76 786/1270/76 +f 788/1271/77 793/1275/77 792/1272/77 +f 790/1274/74 794/1279/74 793/1275/74 +f 787/1276/75 792/1541/75 791/1277/75 +f 789/1278/76 791/1277/76 794/1279/76 +f 796/1280/77 801/1284/77 800/1281/77 +f 798/1283/74 802/1288/74 801/1284/74 +f 795/1285/75 800/1542/75 799/1286/75 +f 797/1287/76 799/1286/76 802/1288/76 +f 830/1289/73 831/1543/73 631/1290/73 +f 631/1292/73 831/1543/73 832/1293/73 +f 832/1293/73 833/1297/73 633/1295/73 +f 833/1297/73 834/1300/73 634/1298/73 +f 834/1300/73 819/1544/73 619/1301/73 +f 819/1303/73 820/1306/73 620/1304/73 +f 820/1306/73 821/1309/73 621/1307/73 +f 821/1309/73 822/1312/73 622/1310/73 +f 822/1312/73 823/1545/73 623/1313/73 +f 623/1315/73 823/1545/73 824/1316/73 +f 624/1318/73 824/1316/73 825/1319/73 +f 625/1321/73 825/1319/73 826/1322/73 +f 626/1324/73 826/1322/73 827/1325/73 +f 627/1327/73 827/1325/73 828/1328/73 +f 828/1328/73 829/1546/73 629/1330/73 +f 629/1332/73 829/1546/73 830/1289/73 +f 837/1334/72 838/1340/72 836/1335/72 +f 841/1337/73 842/1344/73 839/1338/73 +f 838/1340/74 842/1344/74 841/1337/74 +f 835/1341/75 840/1339/75 839/1338/75 +f 837/1343/76 839/1338/76 842/1344/76 +f 836/1346/77 841/1337/77 840/1339/77 +f 845/1348/72 846/1354/72 844/1349/72 +f 849/1351/73 850/1358/73 847/1352/73 +f 846/1354/74 850/1358/74 849/1351/74 +f 843/1355/75 848/1353/75 847/1352/75 +f 845/1357/76 847/1352/76 850/1358/76 +f 844/1360/77 849/1351/77 848/1353/77 +f 852/1362/77 857/1366/77 856/1363/77 +f 854/1365/74 858/1370/74 857/1366/74 +f 851/1367/75 856/1547/75 855/1368/75 +f 853/1369/76 855/1368/76 858/1370/76 +f 860/1371/77 865/1375/77 864/1372/77 +f 862/1374/74 866/1379/74 865/1375/74 +f 859/1376/75 864/1548/75 863/1377/75 +f 861/1378/76 863/1377/76 866/1379/76 +f 900/1380/77 905/1384/77 904/1381/77 +f 902/1383/74 906/1388/74 905/1384/74 +f 899/1385/75 904/1549/75 903/1386/75 +f 901/1387/76 903/1386/76 906/1388/76 +f 908/1389/77 913/1393/77 912/1390/77 +f 910/1392/74 914/1397/74 913/1393/74 +f 907/1394/75 912/1550/75 911/1395/75 +f 909/1396/76 911/1395/76 914/1397/76 +f 925/1398/76 929/1420/76 928/1399/76 +f 919/1401/74 923/1424/74 926/1402/74 +f 918/1404/72 922/1416/72 921/1405/72 +f 915/1407/73 920/1418/73 919/1408/73 +f 917/1410/76 919/1401/76 922/1403/76 +f 916/1412/77 921/1415/77 920/1413/77 +f 921/1415/74 925/1398/74 924/1400/74 +f 922/1416/74 926/1422/74 925/1417/74 +f 920/1418/74 924/1423/74 923/1419/74 +f 929/1420/74 930/1425/74 927/1421/74 +f 926/1422/73 930/1425/73 929/1420/73 +f 924/1423/72 928/1399/72 927/1421/72 +f 923/1424/77 927/1421/77 930/1425/77 +f 932/1426/74 934/1551/74 933/1427/74 +f 936/1429/74 938/1552/74 937/1430/74 +f 940/1432/74 942/1553/74 941/1433/74 +f 944/1435/74 946/1554/74 945/1436/74 +f 948/1438/74 950/1555/74 949/1439/74 +f 958/1441/75 962/1468/75 959/1442/75 +f 952/1444/72 957/1459/72 958/1445/72 +f 953/1447/73 955/1461/73 956/1448/73 +f 954/1450/76 958/1441/76 955/1443/76 +f 951/1452/77 956/1458/77 957/1453/77 +f 960/1455/76 964/1464/76 965/1456/76 +f 956/1458/75 960/1455/75 961/1457/75 +f 957/1459/75 961/1466/75 962/1460/75 +f 955/1461/75 959/1467/75 960/1462/75 +f 966/1463/75 965/1456/75 964/1464/75 +f 961/1466/73 965/1456/73 966/1463/73 +f 959/1467/72 963/1465/72 964/1464/72 +f 962/1468/77 966/1463/77 963/1465/77 +f 970/1469/84 969/1556/84 968/1470/84 +f 977/1472/76 978/1478/76 974/1473/76 +f 976/1475/77 975/1557/77 971/1476/77 +f 978/1478/74 976/1475/74 972/1477/74 +f 975/1479/75 977/1472/75 973/1474/75 +f 985/1481/76 986/1487/76 982/1482/76 +f 984/1484/77 983/1558/77 979/1485/77 +f 986/1487/74 984/1484/74 980/1486/74 +f 983/1488/75 985/1481/75 981/1483/75 +f 989/1490/72 990/1559/72 988/1491/72 +f 992/1493/73 994/1560/73 993/1494/73 +f 990/1496/75 994/1560/75 992/1493/75 +f 988/1491/76 992/1493/76 991/1495/76 +f 987/1498/74 991/1495/74 993/1494/74 s 1 -f 633/1560/85 648/1561/86 632/1562/86 -f 626/1563/87 641/1564/88 625/1565/88 -f 634/1566/89 649/1567/85 633/1560/85 -f 627/1568/77 642/1569/87 626/1563/87 -f 620/1570/90 635/1571/76 619/1572/76 -f 619/1573/76 650/1574/89 634/1566/89 -f 628/1575/91 643/1576/77 627/1568/77 -f 621/1577/92 636/1578/90 620/1570/90 -f 629/1579/93 644/1580/91 628/1575/91 -f 622/1581/94 637/1582/92 621/1577/92 -f 630/1583/95 645/1584/93 629/1579/93 -f 623/1585/75 638/1586/94 622/1581/94 -f 631/1587/74 646/1588/95 630/1583/95 -f 624/1589/96 639/1590/75 623/1585/75 -f 632/1562/86 647/1591/74 631/1587/74 -f 625/1565/88 640/1592/96 624/1589/96 -f 661/1122/93 676/1156/91 660/1118/91 -f 654/1106/94 669/1140/92 653/1103/92 -f 662/1083/95 677/1159/93 661/1122/93 -f 655/1110/75 670/1143/94 654/1106/94 -f 663/1087/74 678/1125/95 662/1083/95 -f 656/1109/96 671/1146/75 655/1110/75 -f 664/1086/86 679/1123/74 663/1087/74 -f 657/1112/88 672/1151/96 656/1109/96 -f 665/1091/85 680/1126/86 664/1086/86 -f 658/1114/87 673/1149/88 657/1112/88 -f 666/1094/89 681/1128/85 665/1091/85 -f 659/1116/77 674/1152/87 658/1114/87 -f 652/1100/90 667/1137/76 651/1097/76 -f 651/1502/76 682/1132/89 666/1094/89 -f 660/1118/91 675/1158/77 659/1116/77 -f 653/1103/92 668/1135/90 652/1100/90 -f 696/1593/96 711/1594/75 695/1595/75 -f 689/1596/85 704/1597/86 688/1598/86 -f 697/1599/88 712/1600/96 696/1593/96 -f 690/1601/89 705/1602/85 689/1596/85 -f 698/1603/87 713/1604/88 697/1599/88 -f 691/1605/76 706/1606/89 690/1601/89 -f 684/1607/91 699/1608/77 683/1609/77 -f 683/1610/77 714/1611/87 698/1603/87 -f 692/1612/90 707/1613/76 691/1614/76 -f 685/1615/93 700/1616/91 684/1607/91 -f 693/1617/92 708/1618/90 692/1612/90 -f 686/1619/95 701/1620/93 685/1615/93 -f 694/1621/94 709/1622/92 693/1617/92 -f 687/1623/74 702/1624/95 686/1619/95 -f 695/1595/75 710/1625/94 694/1621/94 -f 688/1598/86 703/1626/74 687/1623/74 -f 813/1627/93 828/1326/91 812/1628/91 -f 806/1629/94 821/1307/92 805/1630/92 -f 814/1631/95 829/1545/93 813/1627/93 -f 807/1632/75 822/1310/94 806/1629/94 -f 815/1633/74 830/1287/95 814/1631/95 -f 808/1634/96 823/1544/75 807/1632/75 -f 816/1635/86 831/1542/74 815/1633/74 -f 809/1636/88 824/1314/96 808/1634/96 -f 817/1637/85 832/1291/86 816/1635/86 -f 810/1638/87 825/1317/88 809/1636/88 -f 818/1639/89 833/1295/85 817/1637/85 -f 811/1640/77 826/1320/87 810/1638/87 -f 804/1641/90 819/1301/76 803/1642/76 -f 803/1643/76 834/1298/89 818/1639/89 -f 812/1628/91 827/1323/77 811/1640/77 -f 805/1630/92 820/1304/90 804/1641/90 -f 874/1644/97 881/1645/74 873/1646/74 -f 872/1647/98 879/1648/72 871/1649/72 -f 870/1650/99 877/1651/75 869/1652/75 -f 868/1653/100 875/1654/73 867/1655/73 -f 867/1655/73 882/1656/97 874/1644/97 -f 873/1646/74 880/1657/98 872/1647/98 -f 871/1658/72 878/1659/99 870/1650/99 -f 869/1652/75 876/1660/100 868/1653/100 -f 890/1661/97 897/1662/74 889/1663/74 -f 888/1664/98 895/1665/72 887/1666/72 -f 886/1667/99 893/1668/75 885/1669/75 -f 884/1670/100 891/1671/73 883/1672/73 -f 883/1672/73 898/1673/97 890/1661/97 -f 889/1663/74 896/1674/98 888/1664/98 -f 887/1675/72 894/1676/99 886/1667/99 -f 885/1669/75 892/1677/100 884/1670/100 -f 633/1560/85 649/1567/85 648/1561/86 -f 626/1563/87 642/1569/87 641/1564/88 -f 634/1566/89 650/1574/89 649/1567/85 -f 627/1568/77 643/1576/77 642/1569/87 -f 620/1570/90 636/1578/90 635/1571/76 -f 619/1573/76 635/1678/76 650/1574/89 -f 628/1575/91 644/1580/91 643/1576/77 -f 621/1577/92 637/1582/92 636/1578/90 -f 629/1579/93 645/1584/93 644/1580/91 -f 622/1581/94 638/1586/94 637/1582/92 -f 630/1583/95 646/1588/95 645/1584/93 -f 623/1585/75 639/1590/75 638/1586/94 -f 631/1587/74 647/1591/74 646/1588/95 -f 624/1589/96 640/1592/96 639/1590/75 -f 632/1562/86 648/1561/86 647/1591/74 -f 625/1565/88 641/1564/88 640/1592/96 -f 661/1122/93 677/1159/93 676/1156/91 -f 654/1106/94 670/1143/94 669/1140/92 -f 662/1083/95 678/1125/95 677/1159/93 -f 655/1110/75 671/1146/75 670/1143/94 -f 663/1087/74 679/1123/74 678/1125/95 -f 656/1109/96 672/1151/96 671/1146/75 -f 664/1086/86 680/1126/86 679/1123/74 -f 657/1112/88 673/1149/88 672/1151/96 -f 665/1091/85 681/1128/85 680/1126/86 -f 658/1114/87 674/1152/87 673/1149/88 -f 666/1094/89 682/1132/89 681/1128/85 -f 659/1116/77 675/1158/77 674/1152/87 -f 652/1100/90 668/1135/90 667/1137/76 -f 651/1502/76 667/1512/76 682/1132/89 -f 660/1118/91 676/1156/91 675/1158/77 -f 653/1103/92 669/1140/92 668/1135/90 -f 696/1593/96 712/1600/96 711/1594/75 -f 689/1596/85 705/1602/85 704/1597/86 -f 697/1599/88 713/1604/88 712/1600/96 -f 690/1601/89 706/1606/89 705/1602/85 -f 698/1603/87 714/1611/87 713/1604/88 -f 691/1605/76 707/1679/76 706/1606/89 -f 684/1607/91 700/1616/91 699/1608/77 -f 683/1610/77 699/1680/77 714/1611/87 -f 692/1612/90 708/1618/90 707/1613/76 -f 685/1615/93 701/1620/93 700/1616/91 -f 693/1617/92 709/1622/92 708/1618/90 -f 686/1619/95 702/1624/95 701/1620/93 -f 694/1621/94 710/1625/94 709/1622/92 -f 687/1623/74 703/1626/74 702/1624/95 -f 695/1595/75 711/1594/75 710/1625/94 -f 688/1598/86 704/1597/86 703/1626/74 -f 813/1627/93 829/1545/93 828/1326/91 -f 806/1629/94 822/1310/94 821/1307/92 -f 814/1631/95 830/1287/95 829/1545/93 -f 807/1632/75 823/1544/75 822/1310/94 -f 815/1633/74 831/1542/74 830/1287/95 -f 808/1634/96 824/1314/96 823/1544/75 -f 816/1635/86 832/1291/86 831/1542/74 -f 809/1636/88 825/1317/88 824/1314/96 -f 817/1637/85 833/1295/85 832/1291/86 -f 810/1638/87 826/1320/87 825/1317/88 -f 818/1639/89 834/1298/89 833/1295/85 -f 811/1640/77 827/1323/77 826/1320/87 -f 804/1641/90 820/1304/90 819/1301/76 -f 803/1643/76 819/1543/76 834/1298/89 -f 812/1628/91 828/1326/91 827/1323/77 -f 805/1630/92 821/1307/92 820/1304/90 -f 874/1644/97 882/1656/97 881/1645/74 -f 872/1647/98 880/1657/98 879/1648/72 -f 870/1650/99 878/1659/99 877/1651/75 -f 868/1653/100 876/1660/100 875/1654/73 -f 867/1655/73 875/1654/73 882/1656/97 -f 873/1646/74 881/1645/74 880/1657/98 -f 871/1658/72 879/1681/72 878/1659/99 -f 869/1652/75 877/1651/75 876/1660/100 -f 890/1661/97 898/1673/97 897/1662/74 -f 888/1664/98 896/1674/98 895/1665/72 -f 886/1667/99 894/1676/99 893/1668/75 -f 884/1670/100 892/1677/100 891/1671/73 -f 883/1672/73 891/1671/73 898/1673/97 -f 889/1663/74 897/1662/74 896/1674/98 -f 887/1675/72 895/1682/72 894/1676/99 -f 885/1669/75 893/1668/75 892/1677/100 +f 633/1561/85 648/1562/86 632/1563/86 +f 626/1564/87 641/1565/88 625/1566/88 +f 634/1567/89 649/1568/85 633/1561/85 +f 627/1569/77 642/1570/87 626/1564/87 +f 620/1571/90 635/1572/76 619/1573/76 +f 619/1574/76 650/1575/89 634/1567/89 +f 628/1576/91 643/1577/77 627/1569/77 +f 621/1578/92 636/1579/90 620/1571/90 +f 629/1580/93 644/1581/91 628/1576/91 +f 622/1582/94 637/1583/92 621/1578/92 +f 630/1584/95 645/1585/93 629/1580/93 +f 623/1586/75 638/1587/94 622/1582/94 +f 631/1588/74 646/1589/95 630/1584/95 +f 624/1590/96 639/1591/75 623/1586/75 +f 632/1563/86 647/1592/74 631/1588/74 +f 625/1566/88 640/1593/96 624/1590/96 +f 661/1124/93 676/1158/91 660/1120/91 +f 654/1108/94 669/1142/92 653/1105/92 +f 662/1085/95 677/1161/93 661/1124/93 +f 655/1112/75 670/1145/94 654/1108/94 +f 663/1089/74 678/1127/95 662/1085/95 +f 656/1111/96 671/1148/75 655/1112/75 +f 664/1088/86 679/1125/74 663/1089/74 +f 657/1114/88 672/1153/96 656/1111/96 +f 665/1093/85 680/1128/86 664/1088/86 +f 658/1116/87 673/1151/88 657/1114/88 +f 666/1096/89 681/1130/85 665/1093/85 +f 659/1118/77 674/1154/87 658/1116/87 +f 652/1102/90 667/1139/76 651/1099/76 +f 651/1503/76 682/1134/89 666/1096/89 +f 660/1120/91 675/1160/77 659/1118/77 +f 653/1105/92 668/1137/90 652/1102/90 +f 696/1594/96 711/1595/75 695/1596/75 +f 689/1597/85 704/1598/86 688/1599/86 +f 697/1600/88 712/1601/96 696/1594/96 +f 690/1602/89 705/1603/85 689/1597/85 +f 698/1604/87 713/1605/88 697/1600/88 +f 691/1606/76 706/1607/89 690/1602/89 +f 684/1608/91 699/1609/77 683/1610/77 +f 683/1611/77 714/1612/87 698/1604/87 +f 692/1613/90 707/1614/76 691/1615/76 +f 685/1616/93 700/1617/91 684/1608/91 +f 693/1618/92 708/1619/90 692/1613/90 +f 686/1620/95 701/1621/93 685/1616/93 +f 694/1622/94 709/1623/92 693/1618/92 +f 687/1624/74 702/1625/95 686/1620/95 +f 695/1596/75 710/1626/94 694/1622/94 +f 688/1599/86 703/1627/74 687/1624/74 +f 813/1628/93 828/1328/91 812/1629/91 +f 806/1630/94 821/1309/92 805/1631/92 +f 814/1632/95 829/1546/93 813/1628/93 +f 807/1633/75 822/1312/94 806/1630/94 +f 815/1634/74 830/1289/95 814/1632/95 +f 808/1635/96 823/1545/75 807/1633/75 +f 816/1636/86 831/1543/74 815/1634/74 +f 809/1637/88 824/1316/96 808/1635/96 +f 817/1638/85 832/1293/86 816/1636/86 +f 810/1639/87 825/1319/88 809/1637/88 +f 818/1640/89 833/1297/85 817/1638/85 +f 811/1641/77 826/1322/87 810/1639/87 +f 804/1642/90 819/1303/76 803/1643/76 +f 803/1644/76 834/1300/89 818/1640/89 +f 812/1629/91 827/1325/77 811/1641/77 +f 805/1631/92 820/1306/90 804/1642/90 +f 874/1645/97 881/1646/74 873/1647/74 +f 872/1648/98 879/1649/72 871/1650/72 +f 870/1651/99 877/1652/75 869/1653/75 +f 868/1654/100 875/1655/73 867/1656/73 +f 867/1656/73 882/1657/97 874/1645/97 +f 873/1647/74 880/1658/98 872/1648/98 +f 871/1659/72 878/1660/99 870/1651/99 +f 869/1653/75 876/1661/100 868/1654/100 +f 890/1662/97 897/1663/74 889/1664/74 +f 888/1665/98 895/1666/72 887/1667/72 +f 886/1668/99 893/1669/75 885/1670/75 +f 884/1671/100 891/1672/73 883/1673/73 +f 883/1673/73 898/1674/97 890/1662/97 +f 889/1664/74 896/1675/98 888/1665/98 +f 887/1676/72 894/1677/99 886/1668/99 +f 885/1670/75 892/1678/100 884/1671/100 +f 633/1561/85 649/1568/85 648/1562/86 +f 626/1564/87 642/1570/87 641/1565/88 +f 634/1567/89 650/1575/89 649/1568/85 +f 627/1569/77 643/1577/77 642/1570/87 +f 620/1571/90 636/1579/90 635/1572/76 +f 619/1574/76 635/1679/76 650/1575/89 +f 628/1576/91 644/1581/91 643/1577/77 +f 621/1578/92 637/1583/92 636/1579/90 +f 629/1580/93 645/1585/93 644/1581/91 +f 622/1582/94 638/1587/94 637/1583/92 +f 630/1584/95 646/1589/95 645/1585/93 +f 623/1586/75 639/1591/75 638/1587/94 +f 631/1588/74 647/1592/74 646/1589/95 +f 624/1590/96 640/1593/96 639/1591/75 +f 632/1563/86 648/1562/86 647/1592/74 +f 625/1566/88 641/1565/88 640/1593/96 +f 661/1124/93 677/1161/93 676/1158/91 +f 654/1108/94 670/1145/94 669/1142/92 +f 662/1085/95 678/1127/95 677/1161/93 +f 655/1112/75 671/1148/75 670/1145/94 +f 663/1089/74 679/1125/74 678/1127/95 +f 656/1111/96 672/1153/96 671/1148/75 +f 664/1088/86 680/1128/86 679/1125/74 +f 657/1114/88 673/1151/88 672/1153/96 +f 665/1093/85 681/1130/85 680/1128/86 +f 658/1116/87 674/1154/87 673/1151/88 +f 666/1096/89 682/1134/89 681/1130/85 +f 659/1118/77 675/1160/77 674/1154/87 +f 652/1102/90 668/1137/90 667/1139/76 +f 651/1503/76 667/1513/76 682/1134/89 +f 660/1120/91 676/1158/91 675/1160/77 +f 653/1105/92 669/1142/92 668/1137/90 +f 696/1594/96 712/1601/96 711/1595/75 +f 689/1597/85 705/1603/85 704/1598/86 +f 697/1600/88 713/1605/88 712/1601/96 +f 690/1602/89 706/1607/89 705/1603/85 +f 698/1604/87 714/1612/87 713/1605/88 +f 691/1606/76 707/1680/76 706/1607/89 +f 684/1608/91 700/1617/91 699/1609/77 +f 683/1611/77 699/1681/77 714/1612/87 +f 692/1613/90 708/1619/90 707/1614/76 +f 685/1616/93 701/1621/93 700/1617/91 +f 693/1618/92 709/1623/92 708/1619/90 +f 686/1620/95 702/1625/95 701/1621/93 +f 694/1622/94 710/1626/94 709/1623/92 +f 687/1624/74 703/1627/74 702/1625/95 +f 695/1596/75 711/1595/75 710/1626/94 +f 688/1599/86 704/1598/86 703/1627/74 +f 813/1628/93 829/1546/93 828/1328/91 +f 806/1630/94 822/1312/94 821/1309/92 +f 814/1632/95 830/1289/95 829/1546/93 +f 807/1633/75 823/1545/75 822/1312/94 +f 815/1634/74 831/1543/74 830/1289/95 +f 808/1635/96 824/1316/96 823/1545/75 +f 816/1636/86 832/1293/86 831/1543/74 +f 809/1637/88 825/1319/88 824/1316/96 +f 817/1638/85 833/1297/85 832/1293/86 +f 810/1639/87 826/1322/87 825/1319/88 +f 818/1640/89 834/1300/89 833/1297/85 +f 811/1641/77 827/1325/77 826/1322/87 +f 804/1642/90 820/1306/90 819/1303/76 +f 803/1644/76 819/1544/76 834/1300/89 +f 812/1629/91 828/1328/91 827/1325/77 +f 805/1631/92 821/1309/92 820/1306/90 +f 874/1645/97 882/1657/97 881/1646/74 +f 872/1648/98 880/1658/98 879/1649/72 +f 870/1651/99 878/1660/99 877/1652/75 +f 868/1654/100 876/1661/100 875/1655/73 +f 867/1656/73 875/1655/73 882/1657/97 +f 873/1647/74 881/1646/74 880/1658/98 +f 871/1659/72 879/1682/72 878/1660/99 +f 869/1653/75 877/1652/75 876/1661/100 +f 890/1662/97 898/1674/97 897/1663/74 +f 888/1665/98 896/1675/98 895/1666/72 +f 886/1668/99 894/1677/99 893/1669/75 +f 884/1671/100 892/1678/100 891/1672/73 +f 883/1673/73 891/1672/73 898/1674/97 +f 889/1664/74 897/1663/74 896/1675/98 +f 887/1676/72 895/1683/72 894/1677/99 +f 885/1670/75 893/1669/75 892/1678/100 diff --git a/src/main/resources/assets/hbm/textures/items/powder_cement.png b/src/main/resources/assets/hbm/textures/items/powder_cement.png new file mode 100644 index 0000000000000000000000000000000000000000..a919c453f08f77aa19b50446caf020c0c2c7b050 GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf&PYjn$Ngj3xATuKR)~D^Q(Ebz#_DB#HFm1!r?R|!u^+F4 zls0vqDEoRm_MoAgfiXjl=F(@`%z`)D5*Y*?Lob%zjh@_mP|nQwOYQvm{A%xb%#0Zr z1Q{8Q6|xA<^}F=WSXgk+cZ1DL&oXC7DzaSZ&dsuDzV~}N$Eql`Q{|^ODJ;Emhaq9! zbNAcZ%Ad^p1K_2&7dH!t{q cUHg^gGh?gr(U-?1fnHt^fc4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/powder_limestone.png b/src/main/resources/assets/hbm/textures/items/powder_limestone.png new file mode 100644 index 0000000000000000000000000000000000000000..7f7e59feba07cf3605b46f668af50aa1a810a679 GIT binary patch literal 315 zcmV-B0mS}^P)kQa{stco z4Mmyr_WFUW1;A*n%`PTb!oBm{-CiSWv6^JN2KUYbP?R|U$J3d8wVTRjNj5QTT18Rj z$V$*V&+&AoD0BAJj?N93MsX$PNwOH8Kv{`d3!NJPg3;F}ynBzeHp}7!vKE*|{eVrQ zczk*Wn86`IY%;w~tLWSie(hg;sEcP1T3D`VIq|g>{z=ITy>z~@z5yA