592 Commits

Author SHA1 Message Date
Tim Kuipers
11f7f521c9 Merge branch '2.1' 2015-12-08 16:15:43 +01:00
Tamara Hogenhout
9388fd9e55 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2015-12-08 13:45:28 +01:00
Tamara Hogenhout
70b221b33a Proof of concept to test the global-only functionalities
Contributes to #CURA-460458
2015-12-08 13:44:59 +01:00
Tim Kuipers
4932ef819c JSON fix: Min Volume Before Coasting doesn't include Coasting Volume anymore (CURA-528) 2015-12-08 13:30:12 +01:00
Tim Kuipers
a4e824464c JSON bugfix: coasting_min_volume had an inherit_function and the inherit property (CURA-550) 2015-12-08 10:47:09 +01:00
Tim Kuipers
71c8393f8c JSON bugfix: default brim width (CURA-550) 2015-12-08 10:13:23 +01:00
Tim Kuipers
26a7fc7bdc JSON: made brim_line_count default match brim_width_default for 0.4 nozzles (CURA-550) 2015-12-08 09:50:34 +01:00
Tim Kuipers
8a853e5b05 JSON bugfix: infill_density ==> infill_sparse_density (CURA-550) 2015-12-08 09:48:01 +01:00
Tim Kuipers
6ef68ca5c1 JSON: made coasting_min_volume depend on coasting_volume (CURA-550) 2015-12-08 09:47:20 +01:00
Tim Kuipers
67bbb5478e JSON: (bugfix) introduced brim_width (CURA-550) 2015-12-08 09:38:21 +01:00
Tim Kuipers
e69bdd4fe5 JSON: introduced brim_width (CURA-550) 2015-12-07 18:11:48 +01:00
Tim Kuipers
b86a219315 JSON: fix: coasting min volume should be at least as high as coasting volume (CURA-528) 2015-12-07 18:05:00 +01:00
Arjen Hiemstra
c854221d4f Update default profiles with values as supplied by Paul 2015-12-04 17:12:27 +01:00
Arjen Hiemstra
48a3e06fd6 Update default profiles with values as supplied by Paul 2015-12-04 17:09:05 +01:00
Arjen Hiemstra
fd4943b18a Fix variant selection dropdown in sidebar so it actually selects a variant 2015-12-04 16:46:45 +01:00
Arjen Hiemstra
92ff7e9360 Fix variant selection dropdown in sidebar so it actually selects a variant 2015-12-04 16:46:12 +01:00
Tim Kuipers
0f54e1e712 JSON: better retraction_count_max 2015-12-04 11:22:58 +01:00
Ghostkeeper
e0ebff91ed Remove period from setting label
The 'Use towers' setting had a period behind the name. It shouldn't have.
2015-12-04 11:12:37 +01:00
Tim Kuipers
ca49226e18 JSON: better retraction_count_max 2015-12-04 11:04:42 +01:00
Tim Kuipers
531033c53b JSON: removed coasting dichotomy between move and retract (CURA-486) 2015-12-03 17:54:18 +01:00
Tim Kuipers
840bf5d504 JSON: changed temp-flow graph to comply approx with the graph for silver PLA on the UM2 (CURA-299) 2015-12-02 17:46:22 +01:00
Tim Kuipers
758aa31ae6 changed temp-flow graph to comply approx with the graph for silver PLA on the UM2 (CURA-299) 2015-12-02 17:37:37 +01:00
fieldOfView
4edc258df0 "min_value" should be a string, fixes CURA-521 2015-12-02 15:26:06 +01:00
Tim Kuipers
976abd5df8 JSON: support extruder nr for roof/layer_0 children of support_extruder_nr and introduced new support_infill_extruder_nr (CURA-366)
The engine now retrieves support_infill_extruder_nr instead of support_extruder_nr
2015-12-01 16:06:19 +01:00
Tim Kuipers
b2b477fda8 JSON: support infill name change and label and description (CURA-366) 2015-12-01 16:04:52 +01:00
Tim Kuipers
09f75dea15 JSON: small fix descriptions machine settings (CURA-365) 2015-12-01 14:42:38 +01:00
Tim Kuipers
bf701640b9 JSON: lil: * ==> ° 2015-12-01 14:39:07 +01:00
Tim Kuipers
4c668c9a1e JSON: bugfix: retraction limitation didnt have min_value defs (CURA-414) 2015-12-01 13:46:07 +01:00
Tim Kuipers
b245fe732b JSON: bugfix/feat: introduced missing Dual Extrusion Overlap 2015-11-26 17:03:58 +01:00
Tim Kuipers
f044f96910 JSON: bugfix: skin_outline_count label 2015-11-26 16:43:05 +01:00
Tim Kuipers
914062a0bd JSON: prime tower visible by default 2015-11-26 12:26:17 +01:00
Tim Kuipers
abc95f6d8c JSON: better retraction count max 2015-11-26 12:09:16 +01:00
Tim Kuipers
e53a5b0928 JSON: bugfix: enable_prime_tower worked inversedly 2015-11-26 12:08:58 +01:00
Tim Kuipers
97ca5cf95a Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-11-25 10:07:45 +01:00
Tim Kuipers
f31105c2bd lil 2015-11-24 15:43:43 +01:00
ckielstra
5c73da1054 A few more spelling fixes.
CURA-206
2015-11-24 14:57:24 +01:00
Tamara Hogenhout
a87680f354 fixes the worst typo's for the 2.1 release
Consistensy/teminology will be picked up by SMS or a translations agency which SMS hires.

Fixes #CURA-206
2015-11-23 14:29:07 +01:00
Arjen Hiemstra
09ea598d28 Merge branch '15.10'
* 15.10:
  Update translations with the 15.10 versions
  Disable languages we have no updated translations for
  Display the version number in the splash screen
  Properly raise DeviceBusyError in RemovableDriveOutputDevice
2015-11-17 14:25:23 +01:00
Tim Kuipers
94ee3882ad JSON: PR fix: material_print_temp_prepend and material_bed_temp_prepend weren't in the json file 2015-11-17 12:04:16 +01:00
Arjen Hiemstra
7c3c3da89e Update translations with the 15.10 versions
Also drop languages we have no updated files for
2015-11-17 11:55:39 +01:00
Arjen Hiemstra
c277102ebc Disable languages we have no updated translations for 2015-11-17 11:52:46 +01:00
Tim Kuipers
c493b64cb8 JSON: description of new material_print_temp_wait and material_bed_temp_wait 2015-11-17 10:45:56 +01:00
Arjen Hiemstra
5231073827 Display the version number in the splash screen 2015-11-17 10:11:41 +01:00
Mark Walker
4a3db419ec Add back placeholder expansion for start/end gcode
See issue Ultimaker/CuraEngine#240

The intent of this change it to allow token replacement in start/end
gcode similar to the old Cura. Tokens are of the form
{material_bed_temperature} where the name is any setting name that is
passed to the engine.

Control the backend's generation of temperature commands via new
settings material_bed_temp_prepend and material_print_temp_prepend based
on whether there are temperature tokens in the printer profile's start
gcode.

This change will generate the same temperature gcode as FffGcodeWriter
at the head, if none of the temperature tokens are present in the
machine profile. Otherwise, they're suppressed via the prepend settings.

Also, set fdmprinter.json so that all that inherit from it default to
having the gcode temperature prepend also wait for temperature. Profiles
can override these settings: material_bed_temp_wait and
material_print_temp_wait

This PR intends to change both Cura and CuraEngine.  However, it is safe
to sequence with the Cura change first which will do token replacement
(if present), but will fail to supress the temperature prepends.
2015-11-16 02:22:47 -08:00
Tim Kuipers
107beb9798 default speeds different for travel_speed (CURA-439) 2015-11-13 15:38:44 +01:00
Tim Kuipers
8ca6b87e17 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-11-13 15:28:27 +01:00
Tim Kuipers
bddd74f816 default speeds different from print_speed (CURA-439) 2015-11-13 15:28:17 +01:00
Arjen Hiemstra
751f58fb02 Merge branch '15.10'
* 15.10: (39 commits)
  Remove unused import in StartSliceJob
  conforming to code style
  fix typo's..
  Adjust initial view to be slightly from the side
  uses a different method to check whether a machine name excists
  Sets the languageComboBox to the default language
  Remove per-group settings for now
  Make sure to send all settings when an object overrides the profile
  Properly emit writeStarted in RemovableDriveOutputDevice
  Add xy_offset setting to list of settings that trigger a disallowed area update
  Properly trigger a reslice when the active instance is changed
  Wizardpages without hack
  Only hides the window when there are no more pages
  Only add layer data node after all processing
  Also account for "xy_offset" setting for the disallowed areas
  JSON: workaround for stutter in spiralize vase: set travel speed to printing speed
  Adds a color for the error-messages
  Shows an error message when a user tries to add a printer with a name that already excists.
  JSON: support bottom stair step height defaults changed so that the bottom distance to the model isn't violated too much
  Try to use Protobuf CPP implementation if it is available
  ...
2015-11-13 11:31:29 +01:00
Tim Kuipers
b724970959 JSON: changed default of Auto temp to false 2015-11-12 12:07:40 +01:00
Tim Kuipers
a13de5a489 JSON: made retraction prime amount have mm3 unit (CURA-415) 2015-11-11 16:38:02 +01:00