From: Steven Abadie Date: Sun, 21 Sep 2014 17:05:04 +0000 (-0600) Subject: Replaced Robot stl with Open Hardware Keychain. X-Git-Tag: 14.09-1.18~132 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0b5d7e1ad72921b0585be13d80684babf736fafb;p=cura.git Replaced Robot stl with Open Hardware Keychain. --- diff --git a/Cura/gui/app.py b/Cura/gui/app.py index 33996fa8..afcd832d 100644 --- a/Cura/gui/app.py +++ b/Cura/gui/app.py @@ -125,7 +125,7 @@ class CuraApp(wx.App): profile.loadPreferences(os.path.join(otherCuraInstalls[-1], 'preferences.ini')) profile.loadProfile(os.path.join(otherCuraInstalls[-1], 'current_profile.ini')) #Check if we need to copy our examples - exampleFile = os.path.normpath(os.path.join(resources.resourceBasePath, 'example', 'UltimakerRobot_support.stl')) + exampleFile = os.path.normpath(os.path.join(resources.resourceBasePath, 'example', 'OpenHardwareKeychain.stl')) self.loadFiles = [exampleFile] if self.splash is not None: diff --git a/Cura/util/profile.py b/Cura/util/profile.py index c41cd843..f4c17676 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -466,7 +466,7 @@ setting('postSwitchExtruder.gcode', """;Switch between the current extruder and setting('startMode', 'Simple', ['Simple', 'Normal'], 'preference', 'hidden') setting('oneAtATime', 'True', bool, 'preference', 'hidden') -setting('lastFile', os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'resources', 'example', 'UltimakerRobot_support.stl')), str, 'preference', 'hidden') +setting('lastFile', os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'resources', 'example', 'OpenHardwareKeychain.stl')), str, 'preference', 'hidden') setting('save_profile', 'False', bool, 'preference', 'hidden').setLabel(_("Save profile on slice"), _("When slicing save the profile as [stl_file]_profile.ini next to the model.")) setting('filament_cost_kg', '0', float, 'preference', 'hidden').setLabel(_("Cost (price/kg)"), _("Cost of your filament per kg, to estimate the cost of the final print.")) setting('filament_cost_meter', '0', float, 'preference', 'hidden').setLabel(_("Cost (price/m)"), _("Cost of your filament per meter, to estimate the cost of the final print.")) diff --git a/resources/example/Attribution.txt b/resources/example/Attribution.txt index 6a83754f..df4588dd 100644 --- a/resources/example/Attribution.txt +++ b/resources/example/Attribution.txt @@ -4,3 +4,6 @@ The below models are shared under the CC BY-SA 3.0 license (http://creativecommo * UltimakerHandle.stl: Ultimaker handle by Silvius http://www.thingiverse.com/thing:22819 + +* OpenHardwareKeychain.stl: Open Hardware Keychain by kevinkline4124 + http://www.thingiverse.com/thing:21596