Commit graph

15486 commits

Author SHA1 Message Date
Jaime van Kessel
8c2cd510d8 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-23 12:45:41 +02:00
Ghostkeeper
49e3c23d14
Brackets on new line
As per our code style.
2018-08-22 16:53:27 +02:00
alekseisasin
0d293ddced
Merge pull request #4251 from Ultimaker/CURA-5645_no_write_gcode_to_recent_files
CURA-5645 Do not add saved gcodes to recent files list
2018-08-22 16:28:58 +02:00
alekseisasin
ff38ee2bed
Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog
CURA-5649 Do not show gcode.gz as an option in save file dialog
2018-08-22 14:12:08 +02:00
Lipu Fei
29180740de Fix missed names 2018-08-22 13:36:17 +02:00
Lipu Fei
94ce9205c3 Remove pytest cache 2018-08-22 13:30:59 +02:00
Lipu Fei
af64d91587 Fix stack handling in project loading
CURA-5663
2018-08-21 16:07:17 +02:00
Jaime van Kessel
5a13b86a3f Changed style for context button
CL-894
2018-08-21 14:55:18 +02:00
Cherubim
f35005c8ba
Brackets on new line
As per our code style.
2018-08-21 14:24:07 +02:00
Jaime van Kessel
dc85568973 Printer tiles in sidepanel can now be collapsed even if no job is active
CL-893
2018-08-21 13:52:09 +02:00
Lipu Fei
10e474ad27 Add draft shield distance into the prime tower position fomulas
CURA-5644
2018-08-21 13:38:56 +02:00
Jaime van Kessel
6a08b63f21 Ensure that extruder configurations are correctly sorted
CL-894
2018-08-21 13:32:22 +02:00
Aleksei S
4635c8117d Add changed_settings(retraction_combing) to Version Upgrade Cura3.4
CURA-5505
2018-08-21 11:49:13 +02:00
Remco Burema
ca25638c07 .ufp should also not show up in recent files since it's a gcode format 2018-08-21 11:01:35 +02:00
Jaime van Kessel
03a7833180 Fixed qml warnings (reading from undefined properties)
CL-893 && CL-894
2018-08-21 10:14:12 +02:00
Lipu Fei
1468ac1d59 Check if dict has key before accessing in BuildVolume 2018-08-20 13:20:52 +02:00
alekseisasin
4b5cc59508
Merge pull request #4144 from smartavionics/mb-add-combing-mode-within-infill
Added the "Within Infill" combing option that functions identically to the original "Not in Skin" option.
2018-08-20 12:50:41 +02:00
Lipu Fei
edc4e2824d
Merge pull request #4237 from Ultimaker/fix_unit_tests
Fix unit tests
2018-08-20 10:32:38 +02:00
Jaime van Kessel
1fa3b60f94 Added rough outline of the redesigned cluster controlItem
CL-893
2018-08-17 16:10:23 +02:00
Jaime van Kessel
b074d2bdf3 Added translations for the strings
CL-894
2018-08-17 13:41:23 +02:00
Ghostkeeper
6740c2bee9
Fix offset of initial layer height
It would detect the height of the raft by looking at what the first Z coordinate is that it encounters on layer 0. This Z coordinate also includes the initial layer height though. If you pause lower than the initial layer height (but higher than 0), you'd expect to pause in the initial layer.
2018-08-17 11:24:39 +02:00
Ghostkeeper
9f190590b1
Only change camera range if camera range is valid
This was a debugging test to see if this fixed an issue. It turned out to not be the issue in question, but this is still a defensive coding thing that would be good to have.
2018-08-17 10:56:46 +02:00
Ghostkeeper
284f90f3ff
Fix camera position before adding a printer
Don't use the diagonal size then, because that returns 0.
2018-08-17 10:56:46 +02:00
Lipu Fei
1079a9be2c Do not add saved gcodes to recent files list 2018-08-17 10:53:30 +02:00
Jaime van Kessel
eb7d42a7f8 Added delete button to cluster queue
CL-894
2018-08-17 10:49:44 +02:00
Jaime van Kessel
db1d90ed9b Added delete function
This is needed at a later stage to delete print jobs from queue by the cluster

CL-894
2018-08-17 10:38:46 +02:00
Jaime van Kessel
c968e54750 Moved duplicated code to own function
CL-894
2018-08-17 10:38:23 +02:00
Jaime van Kessel
d4aaa73928 Codestyle fixes
CL-894
2018-08-17 10:34:14 +02:00
Lipu Fei
013032279d Better handling of no quality group in CuraStackBuilder 2018-08-17 10:00:28 +02:00
Ghostkeeper
31e283110f
Check first if preferred quality exists
Fixes #3784.
2018-08-17 09:31:33 +02:00
Jaime van Kessel
01b9ba03d4 Added extruder icon
CL-894
2018-08-16 16:24:14 +02:00
Jaime van Kessel
5bee561c9c Removed the static placeholders for monitor info
CL-894
2018-08-16 15:54:35 +02:00
Jaime van Kessel
0fe0e4ac54 Ensure that the order of the cluster queue is correctly show in monitor tab
CL-894
2018-08-16 15:23:16 +02:00
Lipu Fei
f42dc24d95 Do not show gcode.gz as an option in save file dialog
CURA-5649
2018-08-16 15:16:32 +02:00
Jaime van Kessel
af4b7c38c7 Removed stray debug print
CL-894
2018-08-16 15:04:52 +02:00
Jaime van Kessel
ef00550df6 Added send to top context item
CL-894
2018-08-16 15:04:00 +02:00
Jack Ha
376b6a53c9 Capital Letters In Setting Name. CURA-5623 2018-08-16 13:47:32 +02:00
Jack Ha
f1c8eda532 Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-16 13:45:51 +02:00
Jack Ha
44eb372cb8 Merge branch 'patch-1' 2018-08-16 13:45:33 +02:00
Jack Ha
6c1d380602 Renamed snap_distance to minimum_polygon_circumference and changed the description a bit. CURA-5623 2018-08-16 13:45:27 +02:00
Jaime van Kessel
28dc918e03 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-16 13:28:57 +02:00
Jaime van Kessel
7a4c9adc3f
Merge pull request #4238 from Ultimaker/CL-980_gcode_preview_not_visible_with_um3
Send UFP to Ultimakers provided the firmware version is sufficient.
2018-08-16 13:11:08 +02:00
Simon Edwards
e1e9c60016 Send UFP to Ultimakers provided the firmware version is sufficient.
CL-980
2018-08-15 13:56:51 +02:00
Diego Prado Gesto
3d9c7f7eb5
Merge pull request #4216 from Ultimaker/feature_adjust_zoom_to_printer_size
Adjust maximum zoom to printer size
2018-08-15 13:19:46 +02:00
Lipu Fei
c20274e356 Move constant instance containers to a separate file
This way we separate the class/type definitions and the actual
constants.
2018-08-15 11:04:09 +02:00
Ghostkeeper
f1a7b23a5c
Adjust default position of camera based on diagonal size 2018-08-15 09:52:39 +02:00
Ghostkeeper
da39e842f1
Move getting diagonal size out to separate function 2018-08-15 09:25:24 +02:00
Diego Prado Gesto
3a7fff42b5 Fix code style.
Contributes to CURA-5628.
2018-08-15 09:14:37 +02:00
Diego Prado Gesto
ebb0317276 Merge branch 'master' into fix_unit_tests 2018-08-14 17:23:23 +02:00
Diego Prado Gesto
230dac1b9f
Merge pull request #4236 from Ultimaker/UM3extended_variant_fix
Fix UM3extended 0.25 variant file
2018-08-14 17:17:50 +02:00