Merge conflic solved

[cura.git] / Cura / util / profile.py

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 0b903e882e805bf097377a28b6ea99da3989a858..7f999961ba59ec91aff4b1190a0c9438f00b7cdb 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -64,10 +64,10 @@ profileDefaultSettings = {
        'bridge_material_amount': '100',\r
        'raft_margin': '5',\r
        'raft_base_material_amount': '100',\r
-       'raft_interface_material_amount': '100',\r
-       'bottom_thickness': '0.0',\r
+       'raft_interface_material_amount': '100',
+       'bottom_thickness': '0.3',\r
        'add_start_end_gcode': 'True',\r
-       'gcode_extension': 'gcode',\r
+       'gcode_extension': 'gcode',
 }\r
 preferencesDefaultSettings = {\r
        'wizardDone': 'False',\r
@@ -184,7 +184,7 @@ def putPreference(name, value):
                globalPreferenceParser.read(getPreferencePath())\r
        if not globalPreferenceParser.has_section('preference'):\r
                globalPreferenceParser.add_section('preference')\r
-       globalPreferenceParser.set('preference', name, str(value).encode("utf-8"))\r
+       globalPreferenceParser.set('preference', name, unicode(value).encode("utf-8"))\r
        globalPreferenceParser.write(open(getPreferencePath(), 'w'))\r
 \r
 #########################################################\r