Commit graph

12854 commits

Author SHA1 Message Date
Jaime van Kessel
2a4a42a186 Merge branch 'feature_alternate_carving' of github.com:Ultimaker/Cura 2016-11-18 15:14:21 +01:00
Tim Kuipers
8dbe018a5b
JSON removal: removed the gap filling option 'skin' (CURA-2306) 2016-11-18 15:06:44 +01:00
Tim Kuipers
cc7b2a4901
JSON feat: perimeter_gaps as it was in e57ca0aa53 (CURA-2306) 2016-11-18 15:06:44 +01:00
Jaime van Kessel
298710532b Merge branch 'feature_fan_speed_0' of github.com:Ultimaker/Cura 2016-11-18 10:44:09 +01:00
Jaime van Kessel
850fcac9c2 Build plate extruder now hides itself if the adhesion type is none
CURA-759
2016-11-18 10:41:07 +01:00
Jaime van Kessel
d0bae5acd7 Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura 2016-11-18 10:35:06 +01:00
Thomas Karl Pietrowski
9f468b8fcf Correcting German translation
Contributes to CURA-2862
2016-11-18 10:28:44 +01:00
Tim Kuipers
7bba0eb930 JSON: feat: alternate_carve_order (CURA-2992) 2016-11-17 19:54:38 +01:00
Filip Goc
77cb5d8a5a Tweak Machine Name
JellyBOX -> IMADE3D JellyBOX
2016-11-17 13:28:17 -05:00
Tim Kuipers
891eda203e JSOn fix: start each layer near switching bay (CURA-1112) 2016-11-17 14:57:46 +01:00
Ghostkeeper
4da9b99ff8
Disable print sequence for all multi-extrusion machines
Also for ORD and whatever else we have. It is now more inherent in the setting and it gives a better indication of why the setting is disabled when you hover the 'i' in the setting visibility screen.
2016-11-17 12:43:14 +01:00
Jaime van Kessel
053ea6ad52 Bumped the used API version up by one
CURA-1263
2016-11-17 11:44:44 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +01:00
Ghostkeeper
79e8fc210a
Remove commented code
Contributes to issue CURA-2767.
2016-11-17 10:24:19 +01:00
Ghostkeeper
d448ed7e08
Code style: Brackets on new line
Contributes to issue CURA-2767.
2016-11-17 09:59:14 +01:00
Ghostkeeper
8879021d53
Make left build plate clips static disallowed areas
It turns out that even though it far exceeds the tolerances, the build plate clips have such high variation that the left clips also hit the nozzle sometimes.

Contributes to issue CURA-2625.
2016-11-17 09:48:29 +01:00
fieldOfView
3da5e9de4e Add a "clear filter" button 2016-11-16 23:21:20 +01:00
Filip Goc
f5bf94c44d move platform mesh down 0.3mm
apparently, it was just a bit too high, which made the bulild plate
look foggy.
2016-11-16 11:28:28 -05:00
Filip Goc
60577ea0d3 comment out ornamentals in starting gcode
it worked before, but it’s better to be safe
2016-11-16 11:27:27 -05:00
Ghostkeeper
ff14174724 Revert "JSON spelling fix: draft ==> draught (CURA-759)"
This reverts commit 16828d98d4.
2016-11-16 17:15:37 +01:00
Jaime van Kessel
a39d682476 Renamed Load workspace to open Workspace
CURA-1263
2016-11-16 16:07:18 +01:00
Tim Kuipers
7100c84136 JSON feat: cubic subdivision settings (CURA-2602) 2016-11-16 15:27:58 +01:00
Tim Kuipers
97cbdb0b81 fix: nozzle cooldown speed modifier cannot be larger than the nozzle heatup speed (CURA-1932) 2016-11-15 17:56:34 +01:00
Jack Ha
3acddddc7c Solve populating Support Extruder Combobox at first time start, adjusted spacings. CURA-2767 2016-11-15 17:09:19 +01:00
Jack Ha
d34c79249b Changed recommended sidebar options, seems to work. CURA-2767 2016-11-15 16:40:04 +01:00
fieldOfView
1c92b9ee0e Don't update expandedCategories preference while filtering settings 2016-11-15 16:25:39 +01:00
Tim Kuipers
707b38431b JSON fix: double text in combing mode (CURA-2959) 2016-11-15 13:19:34 +01:00
fieldOfView
7fafcef40b Allow making settings visible from the sidebar 2016-11-15 11:09:58 +01:00
Ghostkeeper
d8610d5e4a
Merge branch 'all_legacy_machines' 2016-11-15 10:14:52 +01:00
Victor Larchenko
b63f4e0bee T562: Text box expanded and all settings visible while filtering
# Conflicts:
#	resources/qml/Settings/SettingView.qml
2016-11-15 10:12:40 +01:00
fieldOfView
e450d10ddb Apply styling to filter field 2016-11-15 10:07:37 +01:00
fieldOfView
479056efef Always show categories when filtering 2016-11-15 10:07:37 +01:00
fieldOfView
f7854225fa Restore expanded categories when clearing filter 2016-11-15 10:07:36 +01:00
Victor Larchenko
829f8893e2 T562: Added searching of settings
# Conflicts:
#	resources/qml/Settings/SettingView.qml
2016-11-15 10:07:36 +01:00
Filip Goc
006e5bf585 small typographic fix 2016-11-14 12:10:48 -05:00
Filip Goc
8d3c0a7e73 Fixed mistake in end gcode script
The bed assembly was homing instead of going forward a little bit -
which makes the print more accessible when finished. Fixed.
2016-11-14 11:55:58 -05:00
Ghostkeeper
e9ced745fa
Undo compensation for nozzle offset on right clips
These clips were offset in the measurements because of the problem with the right nozzle not lifting high enough. This undoes that change.

Contributes to issue CURA-2625.
2016-11-14 17:00:09 +01:00
Ghostkeeper
17ade396d7
Move right two clips to head disallowed areas
It turns out that the right nozzle, if lifted, can still hit the clips in very rare cases. But the left nozzle, if the right nozzle is down, will not hit the clips. So the right clips are now part of the static areas just like the switching bay and camera, but the left clips are not.

Contributes to issue CURA-2625.
2016-11-14 16:36:47 +01:00
Tim Kuipers
e78c8c8d8b setting: material_initial_print_temperature, material_final_print_temperature (CURA-1932) 2016-11-14 15:58:17 +01:00
Ghostkeeper
ef60181232
Change dimensions of Ultimaker 3 and reset nozzle origins
The left nozzle is at the origin again now. And the right nozzle is at an offset of 18mm of that.

Contributes to issue CURA-2625.
2016-11-14 15:51:40 +01:00
Tim Kuipers
16828d98d4 JSON spelling fix: draft ==> draught (CURA-759) 2016-11-14 12:50:49 +01:00
Tim Kuipers
337cd127dc JSOn feat: adhesion_type none (CURA-759) 2016-11-14 12:02:33 +01:00
Tim Kuipers
1cc323eddd changed machine name to Robo 3D R1 2016-11-14 11:37:54 +01:00
Tim Kuipers
ed1670caef connected extruder trains to punchtec connect xl 2016-11-14 11:37:01 +01:00
Tim Kuipers
11f6494baf capitalized Punchtech Connect XL 2016-11-14 11:35:37 +01:00
Tim Kuipers
52ab376616 removed duplicate Pruse i3 2016-11-14 11:34:49 +01:00
Ghostkeeper
0eb1044eaf Merge branch 'add_jellybox_printer' of https://github.com/IMADE3D/Cura into IMADE3D-add_jellybox_printer 2016-11-14 10:48:55 +01:00
Tim Kuipers
6f3b8a7fa1 renamed ORD to RoVa3D 2016-11-14 10:30:59 +01:00
Ghostkeeper
f615d6b0a8 Merge branch 'fix_blur_settings' of https://github.com/fieldOfView/Cura into fieldOfView-fix_blur_settings 2016-11-14 09:32:58 +01:00
Filip Goc
644fb0ca00 add JellyBOX build plate mesh 2016-11-13 11:34:24 -05:00