Updated base code to v1.8.5
Merge branch 'officialWP'
Merged in v1.8.5 - hopefully sucessfully///
Conflicts:
	CHANGELOG
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	org.pepsoft.worldpainter.properties
	org/pepsoft/minecraft/Constants.java
	org/pepsoft/worldpainter/App.java
	org/pepsoft/worldpainter/BiomeListCellRenderer.java
	org/pepsoft/worldpainter/Configuration.java
	org/pepsoft/worldpainter/Dimension.java
	org/pepsoft/worldpainter/DimensionPropertiesDialog.java
	org/pepsoft/worldpainter/DimensionPropertiesEditor.form
	org/pepsoft/worldpainter/DimensionPropertiesEditor.java
	org/pepsoft/worldpainter/DimensionSnapshot.java
	org/pepsoft/worldpainter/ExportProgressDialog.java
	org/pepsoft/worldpainter/ExportWorldDialog.form
	org/pepsoft/worldpainter/ExportWorldDialog.java
	org/pepsoft/worldpainter/FillDialog.form
	org/pepsoft/worldpainter/FillDialog.java
	org/pepsoft/worldpainter/HeightMapTileFactory.java
	org/pepsoft/worldpainter/ImportHeightMapDialog.form
	org/pepsoft/worldpainter/ImportHeightMapDialog.java
	org/pepsoft/worldpainter/Main.java
	org/pepsoft/worldpainter/MixedMaterial.java
	org/pepsoft/worldpainter/MixedMaterialSelector.java
	org/pepsoft/worldpainter/NewWorldDialog.java
	org/pepsoft/worldpainter/Palette.java
	org/pepsoft/worldpainter/PaletteManager.java
	org/pepsoft/worldpainter/PreferencesDialog.java
	org/pepsoft/worldpainter/RODelegatingDimension.java
	org/pepsoft/worldpainter/Tile.java
	org/pepsoft/worldpainter/TileFactoryFactory.java
	org/pepsoft/worldpainter/TileRenderer.java
	org/pepsoft/worldpainter/World2.java
	org/pepsoft/worldpainter/WorldFactory.java
	org/pepsoft/worldpainter/biomeschemes/BiomeSchemeManager.java
	org/pepsoft/worldpainter/biomeschemes/CustomBiomeDialog.form
	org/pepsoft/worldpainter/biomeschemes/CustomBiomeDialog.java
	org/pepsoft/worldpainter/biomeschemes/CustomBiomeManager.java
	org/pepsoft/worldpainter/biomeschemes/Minecraft1_3LargeBiomeScheme.java
	org/pepsoft/worldpainter/biomeschemes/Minecraft1_6BiomeScheme.java
	org/pepsoft/worldpainter/biomeschemes/Minecraft1_6LargeBiomeScheme.java
	org/pepsoft/worldpainter/exporting/BedrockWallChunk.java
	org/pepsoft/worldpainter/exporting/MinecraftWorldImpl.java
	org/pepsoft/worldpainter/exporting/WorldExporter.java
	org/pepsoft/worldpainter/exporting/WorldPainterChunkFactory.java
	org/pepsoft/worldpainter/gardenofeden/PathNode.java
	org/pepsoft/worldpainter/heightMaps/CombiningHeightMap.java
	org/pepsoft/worldpainter/heightMaps/MaximisingHeightMap.java
	org/pepsoft/worldpainter/heightMaps/NoiseHeightMap.java
	org/pepsoft/worldpainter/heightMaps/ProductHeightMap.java
	org/pepsoft/worldpainter/heightMaps/SumHeightMap.java
	org/pepsoft/worldpainter/importing/MapImporter.java
	org/pepsoft/worldpainter/layers/CombinedLayer.java
	org/pepsoft/worldpainter/layers/CustomLayer.java
	org/pepsoft/worldpainter/layers/Layer.java
	org/pepsoft/worldpainter/layers/bo2/Bo2LayerExporter.java
	org/pepsoft/worldpainter/layers/bo2/CustomObjectDialog.form
	org/pepsoft/worldpainter/layers/bo2/CustomObjectDialog.java
	org/pepsoft/worldpainter/layers/bo2/EditObjectAttributes.form
	org/pepsoft/worldpainter/layers/bo2/EditObjectAttributes.java
	org/pepsoft/worldpainter/layers/bo2/Schematic.java
	org/pepsoft/worldpainter/layers/combined/CombinedLayerDialog.java
	org/pepsoft/worldpainter/layers/exporters/FrostExporter.java
	org/pepsoft/worldpainter/layers/exporters/WPObjectExporter.java
	org/pepsoft/worldpainter/layers/groundcover/GroundCoverDialog.form
	org/pepsoft/worldpainter/layers/groundcover/GroundCoverDialog.java
	org/pepsoft/worldpainter/layers/groundcover/GroundCoverLayer.java
	org/pepsoft/worldpainter/layers/groundcover/GroundCoverLayerExporter.java
	org/pepsoft/worldpainter/layers/renderers/BiomeRenderer.java
	org/pepsoft/worldpainter/layers/tunnel/TunnelLayer.java
	org/pepsoft/worldpainter/layers/tunnel/TunnelLayerDialog.form
	org/pepsoft/worldpainter/layers/tunnel/TunnelLayerDialog.java
	org/pepsoft/worldpainter/layers/tunnel/TunnelLayerExporter.java
	org/pepsoft/worldpainter/merging/WorldMerger.java
	org/pepsoft/worldpainter/objects/WPObject.java
	org/pepsoft/worldpainter/operations/BiomePaint.java
	org/pepsoft/worldpainter/operations/CombinedLayerPaint.java
	org/pepsoft/worldpainter/operations/Flatten.java
	org/pepsoft/worldpainter/operations/Flood.java
	org/pepsoft/worldpainter/operations/LayerPaint.java
	org/pepsoft/worldpainter/operations/MouseOrTabletOperation.java
	org/pepsoft/worldpainter/operations/Smooth.java
	org/pepsoft/worldpainter/operations/Sponge.java
	org/pepsoft/worldpainter/operations/TerrainPaint.java
	org/pepsoft/worldpainter/panels/BrushOptions.java
	org/pepsoft/worldpainter/resources/strings.properties
	org/pepsoft/worldpainter/themes/SimpleTheme.java
	org/pepsoft/worldpainter/themes/SimpleThemeEditor.form
	org/pepsoft/worldpainter/themes/SimpleThemeEditor.java
	org/pepsoft/worldpainter/themes/TerrainRangesTableModel.java
	org/pepsoft/worldpainter/themes/Theme.java
	org/pepsoft/worldpainter/threedeeview/ThreeDeeFrame.java
	org/pepsoft/worldpainter/threedeeview/ThreeDeeView.java
	org/pepsoft/worldpainter/threedeeview/Tile3DRenderer.java
	org/pepsoft/worldpainter/tools/BiomesViewerFrame.java
	org/pepsoft/worldpainter/tools/DumpImageInfo.java
	org/pepsoft/worldpainter/tools/TileFactoryPreviewer.java
	org/pepsoft/worldpainter/tools/WorldMorph.java
	org/pepsoft/worldpainter/viewer/tiled/Test.java