Tim Kuipers
c20a2a0a17
JSON language fix: clarify difference between Union Overlapping Volumes and Remove Mesh Intersection (CURA-2992)
2016-11-22 12:23:00 +01:00
Ghostkeeper
ad95d57f48
Merge branch 'feature_precool'
2016-11-21 17:35:32 +01:00
Tim Kuipers
baa481ed68
JSON fix: better description alternate_carve_order (CURA-2992)
2016-11-21 17:03:15 +01:00
Jaime van Kessel
381589a927
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-21 13:42:48 +01:00
Jaime van Kessel
d09c2d2fa5
No longer cast ObjectId to int
...
Fixes CURA-148
2016-11-21 13:42:08 +01:00
Ghostkeeper
50609bfe7e
Make support line distance only give warning if actually less than line width
...
Otherwise you get a warning with the default settings.
2016-11-21 13:28:40 +01:00
Jaime van Kessel
9057174691
Resolve is now updated from the base property
...
The resolve doesn't update always update well for single extrusion machines, so the wrong value gets used.
There is however, no need for a resolve with a single extrusion machine, so we can disable the resolve for those alltogether.
CURA-2939
2016-11-21 11:10:23 +01:00
Jaime van Kessel
a9169a4d6b
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-18 15:19:33 +01:00
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 e57ca0aa53def8342cfc18971cafbe4b39caffec (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
Tim Kuipers
7bba0eb930
JSON: feat: alternate_carve_order (CURA-2992)
2016-11-17 19:54:38 +01: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
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
Ghostkeeper
ff14174724
Revert "JSON spelling fix: draft ==> draught (CURA-759)"
...
This reverts commit 16828d98d482bb92c7b37857da2d36073e1304e5.
2016-11-16 17:15:37 +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
Tim Kuipers
707b38431b
JSON fix: double text in combing mode (CURA-2959)
2016-11-15 13:19:34 +01:00
Ghostkeeper
d8610d5e4a
Merge branch 'all_legacy_machines'
2016-11-15 10:14:52 +01: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
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
Ghostkeeper
ee9caa80a8
Remove dual-extrusion disallowed areas
...
The idea is that these are now computed through combining the disallowed areas of the two extruders (though that doesn't quite work yet).
Contributes to issue CURA-2625.
2016-11-11 17:15:09 +01:00
Ghostkeeper
066ccc4e51
Remove superfluous disabling of prime location settings
...
These are already disabled in the definitions of fdmprinter and fdmextruder. It doesn't need to be disabled again.
Contributes to issue CURA-2625.
2016-11-11 17:10:23 +01:00
Tim Kuipers
fb92e50262
JSON fix: fixed all start/end gcode references to settings and non-existent variables
2016-11-11 16:28:43 +01:00
fieldOfView
a70e4c8120
Fixed blurSettings
...
UM.MainWindow does not derive from QML Item, so it does not have a forceActiveFocus() method.
CURA-2835
2016-11-11 10:22:17 +01:00
Tim Kuipers
e40abb5d37
feat: cool_fan_speed_0 (CURA-2182)
2016-11-10 16:42:09 +01:00
Tim Kuipers
98bbeae055
lil: rounding error
2016-11-10 13:47:09 +01:00
Tim Kuipers
b86d8b4815
removed default setting
2016-11-10 13:47:09 +01:00
Tim Kuipers
967e5c5776
fix: makerbot output file format: x3g
2016-11-10 13:47:09 +01:00
Tim Kuipers
bba74328f1
fix: Deltabot manufacturer
2016-11-10 13:47:09 +01:00
Jaime van Kessel
fdbbda07be
Merge pull request #1122 from fieldOfView/fix_qml_errors
...
Fix qml errors
2016-11-09 13:44:42 +01:00
Ghostkeeper
35d714efb3
Merge branch 'feature_retract_at_layer_change'
2016-11-09 13:38:30 +01:00
fieldOfView
189e3e30d9
Fix error about casting undefined to QString
2016-11-09 13:25:04 +01:00
fieldOfView
35a3bdc924
Fix qml error about stopCamera when no printer is connected
2016-11-09 13:18:15 +01:00
Ghostkeeper
a34c3954ce
Merge branch 'feature_multiply_options' of https://github.com/fieldOfView/Cura into fieldOfView-feature_multiply_options
2016-11-09 10:24:17 +01:00
fieldOfView
eeff3b65ec
Change wording from "duplicate" to "multiply"
2016-11-09 09:27:44 +01:00
Ghostkeeper
59fb0bc739
Merge branch 'feature_extruder_temp_layer_0'
2016-11-08 14:46:15 +01:00
