23916 Commits

Author SHA1 Message Date
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
4f8ac05851 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-12-01 13:46:17 +01:00
Tim Kuipers
4c668c9a1e JSON: bugfix: retraction limitation didnt have min_value defs (CURA-414) 2015-12-01 13:46:07 +01:00
Arjen Hiemstra
aefed915e2 Remove debug code
Fixes CURA-518
2015-12-01 13:03:41 +01:00
Jaime van Kessel
562cd2b8fa Update README.md
Added the barbarian tool
2015-12-01 11:16:15 +01:00
Arjen Hiemstra
949fd199a8 Fix the last code style issue 2015-11-30 11:56:08 +01:00
Arjen Hiemstra
9267b517d6 Fix coding style issues 2015-11-27 16:53:32 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00
Tim Kuipers
b245fe732b JSON: bugfix/feat: introduced missing Dual Extrusion Overlap 2015-11-26 17:03:58 +01:00
Tim Kuipers
938ac7a08b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-11-26 16:43:15 +01:00
Tim Kuipers
f044f96910 JSON: bugfix: skin_outline_count label 2015-11-26 16:43:05 +01:00
daid
9302a36391 Small codestyle fix. 2015-11-26 15:29:32 +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
Tamara Hogenhout
1a4a396abd Makes it the same size as most other dialogs
Also makes it more readable

Contributes to #CURA-279
2015-11-19 16:03:15 +01:00
Tamara Hogenhout
c690095103 Adds naming changes to the changelog
fixes #CURA-279
2015-11-19 15:43:20 +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
Tim Kuipers
8060ab02f9 lil bugfix in parsing startGcode 2015-11-17 10:27:25 +01:00
Arjen Hiemstra
5231073827 Display the version number in the splash screen 2015-11-17 10:11:41 +01:00
awhiemstra
d39e8b7613 Merge pull request #490 from markwal/master
Add back placeholder expansion for start/end gcode
2015-11-16 15:09:58 +01:00
Arjen Hiemstra
3e2797d727 Properly raise DeviceBusyError in RemovableDriveOutputDevice
Contributes to CURA-448
2015-11-16 12:20:03 +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
15747dedec Update Per Object Settings tool with changes made in 15.10 2015-11-13 11:32:43 +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
Arjen Hiemstra
b7471d6b1d Remove unused import in StartSliceJob
Contributes to CURA-358
2015-11-11 11:00:28 +01:00
Ghostkeeper
b4591c49ce Merge pull request #533 from fieldOfView/adjust_initial_view
Adjust initial view to be slightly from the side
2015-11-11 10:52:18 +01:00
Tim Kuipers
4ef0dc822e JSON: expanded machine_head_with_fans_polygon so that it is a more safe estimate. 2015-11-11 09:43:06 +01:00
Tamara Hogenhout
ce08ab2b9a conforming to code style
Fixes #CURA-327
2015-11-10 17:02:33 +01:00
Tamara Hogenhout
c746c24e2b fix typo's..
Contributes to #CURA-256
Contributes to #429
2015-11-10 16:45:42 +01:00
fieldOfView
860a3dccdc Adjust initial view to be slightly from the side 2015-11-10 14:28:43 +01:00
Tamara Hogenhout
9320fc1af5 uses a different method to check whether a machine name excists
contributes to #CURA-325
2015-11-09 18:01:35 +01:00
Tamara Hogenhout
2987da6dcf Sets the languageComboBox to the default language
Fixes #CURA-327
2015-11-09 16:54:56 +01:00
Arjen Hiemstra
288ad0c201 Remove per-group settings for now
This drops Layer height as a setting that can be changed per-object but
makes per-object settings work correctly.

Contributes to CURA-255
2015-11-06 17:56:51 +01:00
Arjen Hiemstra
f75b6bb046 Make sure to send all settings when an object overrides the profile
Contributes to CURA-255
2015-11-06 17:55:36 +01:00