From d40f4a928877b322136429abd515875b99c151c4 Mon Sep 17 00:00:00 2001 From: Eberhard Rensch Date: Sun, 28 Aug 2016 11:54:13 +0200 Subject: [PATCH] Bump Version to 2.6.4 Just bump the version number and (c) year for a rebuild of the binary distribution --- src/Pleasant3D.xcodeproj/project.pbxproj | 8 +- .../XIBs/en.lproj/PreferencesGeneral.xib | 12 +- .../XIBs/en.lproj/PreferencesMachines.xib | 41 +- .../XIBs/fr.lproj/PreferencesGeneral.xib | 12 +- .../XIBs/fr.lproj/PreferencesMachines.xib | 2248 +++-------------- src/Resources/etc/en.lproj/Credits.rtf | 33 +- 6 files changed, 400 insertions(+), 1954 deletions(-) diff --git a/src/Pleasant3D.xcodeproj/project.pbxproj b/src/Pleasant3D.xcodeproj/project.pbxproj index 3bdada2..1355d9b 100644 --- a/src/Pleasant3D.xcodeproj/project.pbxproj +++ b/src/Pleasant3D.xcodeproj/project.pbxproj @@ -1564,8 +1564,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_BUILD_NUMBER = 19; - APPLICATION_VERSION = 2.6.3; + APPLICATION_BUILD_NUMBER = 20; + APPLICATION_VERSION = 2.6.4; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; @@ -1590,8 +1590,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_BUILD_NUMBER = 19; - APPLICATION_VERSION = 2.6.3; + APPLICATION_BUILD_NUMBER = 20; + APPLICATION_VERSION = 2.6.4; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/src/Resources/XIBs/en.lproj/PreferencesGeneral.xib b/src/Resources/XIBs/en.lproj/PreferencesGeneral.xib index eb7059c..0f3383b 100644 --- a/src/Resources/XIBs/en.lproj/PreferencesGeneral.xib +++ b/src/Resources/XIBs/en.lproj/PreferencesGeneral.xib @@ -1,8 +1,8 @@ - - + + - - + + @@ -11,7 +11,7 @@ - + @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/src/Resources/XIBs/en.lproj/PreferencesMachines.xib b/src/Resources/XIBs/en.lproj/PreferencesMachines.xib index b05d9ea..e1a90a9 100644 --- a/src/Resources/XIBs/en.lproj/PreferencesMachines.xib +++ b/src/Resources/XIBs/en.lproj/PreferencesMachines.xib @@ -1,8 +1,9 @@ - - + + - - + + + @@ -12,7 +13,7 @@ - + @@ -43,7 +44,7 @@ - + @@ -81,17 +82,17 @@ openMachiningQueue: - + - - - - + openMachiningQueue: - + - openMachiningQueue: + + + + @@ -118,7 +119,7 @@ - + @@ -239,12 +240,12 @@ status 2nd line - + - + @@ -282,7 +283,7 @@ status 2nd line - + @@ -346,9 +347,9 @@ status 2nd line - + - + - \ No newline at end of file + diff --git a/src/Resources/XIBs/fr.lproj/PreferencesGeneral.xib b/src/Resources/XIBs/fr.lproj/PreferencesGeneral.xib index e3e3176..5226d60 100644 --- a/src/Resources/XIBs/fr.lproj/PreferencesGeneral.xib +++ b/src/Resources/XIBs/fr.lproj/PreferencesGeneral.xib @@ -1,8 +1,8 @@ - - + + - - + + @@ -11,7 +11,7 @@ - + @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/src/Resources/XIBs/fr.lproj/PreferencesMachines.xib b/src/Resources/XIBs/fr.lproj/PreferencesMachines.xib index dc59a07..54a12a9 100644 --- a/src/Resources/XIBs/fr.lproj/PreferencesMachines.xib +++ b/src/Resources/XIBs/fr.lproj/PreferencesMachines.xib @@ -1,1903 +1,347 @@ - - - 1050 - 12D78 - 3084 - 1187.37 - 626.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 3084 - - - YES - NSArrayController - NSBox - NSButton - NSButtonCell - NSCollectionView - NSCollectionViewItem - NSCustomObject - NSCustomView - NSImageCell - NSImageView - NSMenu - NSMenuItem - NSPopUpButton - NSPopUpButtonCell - NSScrollView - NSScroller - NSTextField - NSTextFieldCell - NSView - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - PreferencesMachinesViewController - - - FirstResponder - - - NSApplication - - - - 268 - - YES - - - 290 - {{220, 16}, {222, 26}} - - - YES - - -2076180416 - 2048 - - LucidaGrande - 13 - 1044 - - - 109199360 - 129 - - - 400 - 75 - - - <binding> - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - OtherViews - - YES - - - - - 1 - YES - YES - 2 - - NO - - - - 292 - {{65, 22}, {155, 17}} - - - - YES - - 68157504 - 272630784 - Imprimante par défaut : - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - - - - 276 - - YES - - - 2304 - - YES - - - 274 - {183, 300} - - - - {0, 0} - {0, 0} - 0 - 1 - - YES - - 6 - System - controlBackgroundColor - - - - YES - -1 - 0 - - - {{1, 1}, {183, 300}} - - - - - - 4 - - - - -2147483392 - {{234, 1}, {15, 143}} - - - - NO - - _doScroller: - 1 - 0.89655172824859619 - - - - -2147483392 - {{1, 144}, {233, 15}} - - - - NO - 1 - - _doScroller: - 0.63157892227172852 - - - {{20, 68}, {185, 302}} - - - - 133682 - - - - 0.25 - 4 - 1 - - - - 292 - {{64, 47}, {141, 23}} - - - - YES - - -1543503872 - 134217728 - - - - -2038153216 - 162 - - - 400 - 75 - - NO - - - - 18 - - YES - - - 274 - - YES - - - 270 - {{103, 289}, {223, 17}} - - - - YES - - 68157504 - 272630784 - Nom - - LucidaGrande-Bold - 13 - 16 - - - - - - NO - - - - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{18, 226}, {80, 80}} - - - - YES - - 134217728 - 33554432 - - NSImage - NSApplicationIcon - - 0 - 0 - 0 - NO - - NO - YES - - - - 268 - {{100, 253}, {212, 32}} - - - - YES - - 67108864 - 134217728 - Ouvrir la file d'attente ... - - - -2038284288 - 129 - - - 200 - 25 - - NO - - - - 268 - {{100, 218}, {212, 32}} - - - - YES - - 67108864 - 134217728 - Options… - - - -2038284288 - 129 - - - 200 - 25 - - NO - - - - 268 - {{14, 199}, {87, 14}} - - - - YES - - 68157504 - 71304192 - Emplacement : - - LucidaGrande-Bold - 11 - 16 - - - - - 3 - MC40NQA - - - NO - - - - 268 - {{48, 177}, {53, 14}} - - - - YES - - 68157504 - 71304192 - Type : - - - - - - NO - - - - 268 - {{57, 155}, {44, 14}} - - - - YES - - 68157504 - 71304192 - Statut : - - - - - - NO - - - - 270 - {{103, 199}, {223, 14}} - - - - YES - - 68157504 - 4195328 - location - - LucidaGrande - 11 - 16 - - - - - 3 - MAA - - 2 - - - - NO - - - - 270 - {{103, 177}, {223, 14}} - - - - YES - - 68157504 - 4195328 - kind - - - - - 3 - MAA - - - - NO - - - - 270 - {{103, 136}, {223, 33}} - - - - YES - - 67108864 - 4194304 - c3RhdHVzCnN0YXR1cyAybmQgbGluZQ - - - - - 3 - MAA - - - - NO - - - - 274 - {{18, 14}, {305, 114}} - - - - NSView - - - {{1, 1}, {341, 326}} - - - - - - {{210, 44}, {343, 328}} - - - - {0, 0} - - 67108864 - 0 - Box - - LucidaGrande - 11 - 3100 - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 1 - 0 - 0 - NO - - - - 292 - {{20, 47}, {23, 23}} - - - - YES - - -2080374784 - 134217728 - Gradient Button - - - -2033958912 - 162 - - NSImage - NSAddTemplate - - - - 400 - 75 - - NO - - - - 292 - {{42, 47}, {23, 23}} - - - - YES - - -2080374784 - 134217728 - Gradient Button - - - -2033958912 - 162 - - NSImage - NSRemoveTemplate - - - - 400 - 75 - - NO - - - {570, 390} - - - - NSView - - - - YES - machineName - driver.driverImagePath - location - locationString - driver.driverName - driver.statusString - deviceName - device.deviceName - - YES - - YES - YES - YES - YES - YES - - - - - 256 - - YES - - - 36 - - YES - - - 274 - - YES - - - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{1, 1}, {36, 36}} - - - YES - - 134217728 - 33554432 - - 0 - 0 - 0 - NO - - NO - YES - - - - 268 - {{42, 20}, {130, 17}} - - - YES - - 67108928 - 272631808 - Name - - - - - - NO - - - - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{45, 6}, {10, 10}} - - - YES - - 134217728 - 33816576 - - NSImage - RedLight - - 0 - 0 - 0 - NO - - NO - YES - - - - 268 - {{60, 4}, {112, 14}} - - YES - - 67108928 - 272762880 - Status - - - - - 3 - MC4zNQA - - - NO - - - {180, 37} - - - - - {180, 37} - - - {0, 0} - - 67108864 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 0 - 4 - 0 - NO - - 1 - MC42NjUzNjYzMTU3IDAuNzQwNTE0MTczOSAwLjkzNDc4MjYwODcAA - - - - {180, 37} - - - - - - YES - - - view - - - - 7 - - - - removeMachine: - - - - 165 - - - - addMachine: - - - - 166 - - - - machinesController - - - - 171 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 30 - - - - contentArray: configuredMachines.configuredMachines - - - - - - contentArray: configuredMachines.configuredMachines - contentArray - configuredMachines.configuredMachines - 2 - - - 29 - - - - itemPrototype - - - - 37 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 42 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 158 - - - - view - - - - 38 - - - - value: representedObject.localMachineName - - - - - - value: representedObject.localMachineName - value - representedObject.localMachineName - 2 - - - 174 - - - - valuePath: representedObject.driver.driverImagePath - - - - - - valuePath: representedObject.driver.driverImagePath - valuePath - representedObject.driver.driverImagePath - 2 - - - 55 - - - - value: representedObject.driver.statusLightImage - - - - - - value: representedObject.driver.statusLightImage - value - representedObject.driver.statusLightImage - 2 - - - 59 - - - - value: representedObject.driver.statusString - - - - - - value: representedObject.driver.statusString - value - representedObject.driver.statusString - - NSNullPlaceholder - Offline - - 2 - - - 133 - - - - contentValues: arrangedObjects.localMachineName - - - - - - contentValues: arrangedObjects.localMachineName - contentValues - arrangedObjects.localMachineName - 2 - - - 175 - - - - selectedIndex: defaultMachineSelectedIndex - - - - - - selectedIndex: defaultMachineSelectedIndex - selectedIndex - defaultMachineSelectedIndex - - 2 - - - 176 - - - - value: selection.printerName - - - - - - value: selection.printerName - value - selection.printerName - 2 - - - 92 - - - - valuePath: selection.driver.driverImagePath - - - - - - valuePath: selection.driver.driverImagePath - valuePath - selection.driver.driverImagePath - 2 - - - 93 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 116 - - - - argument: selectedObjects - - - - - - argument: selectedObjects - argument - selectedObjects - - NSSelectorName - openMachiningQueue: - - 2 - - - 169 - - - - target: configuredMachines - - - - - - target: configuredMachines - target - configuredMachines - - NSSelectorName - openMachiningQueue: - - - 2 - - - 170 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 117 - - - - argument: selection - - - - - - argument: selection - argument - selection - - NSSelectorName - showMachineOptions: - - 2 - - - 167 - - - - target: self - - - - - - target: self - target - self - - NSSelectorName - showMachineOptions: - - - 2 - - - 168 - - - - value: selection.locationString - - - - - - value: selection.locationString - value - selection.locationString - 2 - - - 95 - - - - value: selection.driver.driverName - - - - - - value: selection.driver.driverName - value - selection.driver.driverName - 2 - - - 96 - - - - value: selection.driver.statusString - - - - - - value: selection.driver.statusString - value - selection.driver.statusString - 2 - - - 135 - - - - transparent: selected - - - - - - transparent: selected - transparent - selected - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 160 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - YES - - - - - - - - - - Printer Preferences - - - 16 - - - YES - - - - - - 17 - - - - - 18 - - - YES - - - - - - 19 - - - - - 22 - - - Machines - - - 31 - - - YES - - - - - - - - 32 - - - - - 33 - - - - - 34 - - - - - 35 - - - - - 36 - - - YES - - - - MachinePrototypeItem - - - 60 - - - YES - - - - - - - - - - - - - - - - 61 - - - YES - - - - - - 62 - - - - - 63 - - - YES - - - - - - 64 - - - - - 65 - - - YES - - - - - - 66 - - - YES - - - - - - 67 - - - YES - - - - - - 70 - - - - - 71 - - - YES - - - - - - 72 - - - - - 73 - - - YES - - - - - - 74 - - - - - 75 - - - YES - - - - - - 76 - - - - - 77 - - - YES - - - - - - 78 - - - - - 79 - - - YES - - - - - - 80 - - - - - 81 - - - YES - - - - - - 82 - - - - - 83 - - - YES - - - - - - 84 - - - - - 85 - - - YES - - - - - - 86 - - - - - 87 - - - YES - - - - - - 88 - - - - - 89 - - - YES - - - - - - 90 - - - - - 91 - - - - - 156 - - - YES - - - - - - - - - 43 - - - YES - - - - - - 44 - - - - - 39 - - - YES - - - - - - 40 - - - - - 45 - - - YES - - - - - - 46 - - - - - 47 - - - YES - - - - - - 48 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 1.IBPluginDependency - 156.IBPluginDependency - 16.IBPluginDependency - 17.IBPluginDependency - 18.IBPluginDependency - 19.IBPluginDependency - 22.IBPluginDependency - 31.IBPluginDependency - 32.IBPluginDependency - 33.IBPluginDependency - 34.IBPluginDependency - 35.IBPluginDependency - 36.IBPluginDependency - 39.IBPluginDependency - 40.IBPluginDependency - 43.IBPluginDependency - 44.IBPluginDependency - 45.IBPluginDependency - 46.IBPluginDependency - 47.IBPluginDependency - 48.IBPluginDependency - 60.IBPluginDependency - 61.IBPluginDependency - 62.IBPluginDependency - 63.IBPluginDependency - 64.IBPluginDependency - 65.IBPluginDependency - 66.IBPluginDependency - 67.IBPluginDependency - 70.IBPluginDependency - 71.IBPluginDependency - 72.IBPluginDependency - 73.IBPluginDependency - 74.IBPluginDependency - 75.IBPluginDependency - 76.IBPluginDependency - 77.IBPluginDependency - 78.IBPluginDependency - 79.IBPluginDependency - 80.IBPluginDependency - 81.IBPluginDependency - 82.IBPluginDependency - 83.IBPluginDependency - 84.IBPluginDependency - 85.IBPluginDependency - 86.IBPluginDependency - 87.IBPluginDependency - 88.IBPluginDependency - 89.IBPluginDependency - 90.IBPluginDependency - 91.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 176 - - - - YES - - PreferencesMachinesViewController - NSViewController - - YES - - YES - addMachine: - addMachineAddPressed: - addMachineCancelPressed: - removeMachine: - showMachineOptions: - - - YES - id - id - id - id - id - - - - YES - - YES - addMachine: - addMachineAddPressed: - addMachineCancelPressed: - removeMachine: - showMachineOptions: - - - YES - - addMachine: - id - - - addMachineAddPressed: - id - - - addMachineCancelPressed: - id - - - removeMachine: - id - - - showMachineOptions: - id - - - - - YES - - YES - addMachineSheet - machinesController - - - YES - NSWindow - NSArrayController - - - - YES - - YES - addMachineSheet - machinesController - - - YES - - addMachineSheet - NSWindow - - - machinesController - NSArrayController - - - - - IBProjectSource - ./Classes/PreferencesMachinesViewController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSAddTemplate - NSApplicationIcon - NSMenuCheckmark - NSMenuMixedState - NSRemoveTemplate - RedLight - - - YES - {8, 8} - {128, 128} - {11, 11} - {10, 3} - {8, 8} - {16, 16} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + status +status 2nd line + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + machineName + driver.driverImagePath + location + locationString + driver.driverName + driver.statusString + deviceName + device.deviceName + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Offline + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + diff --git a/src/Resources/etc/en.lproj/Credits.rtf b/src/Resources/etc/en.lproj/Credits.rtf index 3d2caac..f1a541a 100644 --- a/src/Resources/etc/en.lproj/Credits.rtf +++ b/src/Resources/etc/en.lproj/Credits.rtf @@ -1,53 +1,54 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1265 +{\rtf1\ansi\ansicpg1252\cocoartf1492\cocoasubrtf100 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\paperw12240\paperh15840\vieww9000\viewh8400\viewkind0 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +{\*\expandedcolortbl;\csgenericrgb\c100000\c100000\c100000;} +\vieww9000\viewh8400\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 -\f0\b\fs24 \cf0 Copyright \'a9 2009-2013 Pleasant Software\ +\f0\b\fs24 \cf0 Copyright \'a9 2009-2016 Pleasant Software\ Offenburg/Germany\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "http://www.pleasantsoftware.com"}}{\fldrslt \b0 \cf0 http://www.pleasantsoftware.com}} \b0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 \b \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "http://www.pleasantsoftware.com/developer/pleasant3d/"}}{\fldrslt \cf0 Please donate!}}\ \ Pleasant 3D (Open Source)\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/zaggo/Pleasant3D"}}{\fldrslt \b0 \cf0 https://github.com/zaggo/Pleasant3D}} \b0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 \b \cf0 \ Original Coding:\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 \b0 \cf0 Eberhard Rensch \b \ \ Additional Coding:\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc\partightenfactor0 \b0 \cf0 Lawrence Johnston\ Cyril Chapellier (CKAB)\ Maryla (miwucs) [Additional Slic3r support]\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc\partightenfactor0 \b \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 \cf0 Localization (French) :\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc\partightenfactor0 \b0 \cf0 Cyril Chapellier / CKAB \b \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 \cf0 \ 3D Machining Blog:\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "http://www.pleasantsoftware.com/developer/3d"}}{\fldrslt \b0 \cf0 http://www.pleasantsoftware.com/developer/3d}}} \ No newline at end of file