2919 Commits

Author SHA1 Message Date
Ghostkeeper
ffc439852f
Merge branch '3.1' 2017-12-01 15:00:34 +01:00
Lipu Fei
a425a1c51b Fix legacy profile loading
CURA-4075
2017-12-01 14:57:59 +01:00
ChrisTerBeke
7cc953d8e7
Merge pull request #2880 from fieldOfView/fix_machinesettings_diameter_no_materials
Hide material diameter when the machine has no materials
2017-12-01 14:56:36 +01:00
Ghostkeeper
2236e0016d
Merge branch '3.1' 2017-12-01 14:41:41 +01:00
Diego Prado Gesto
21d61ce21e Fix an error that makes Cura crash when introducing commas in the
textfields in the ImageReader panel. Now it's possible to use commas xor
dots for separating decimal values.
2017-12-01 14:26:53 +01:00
Andreea Scorojitu
0fe51589ac Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-12-01 13:29:05 +01:00
Andreea Scorojitu
5202c8584c Update_ChangeLog_3.1_CURA-4656 2017-12-01 13:26:38 +01:00
Diego Prado Gesto
e7ac2e37b4 Fix an error when closing USB connection. This error raised several
times in the crash reports in the stats.
2017-12-01 13:17:36 +01:00
Lipu Fei
7b4cb11240 Fix legacy profile upgrade
CURA-4075

Only for single-extrusion machines just like before.
2017-12-01 11:20:52 +01:00
Lipu Fei
7de43e71e0 Fix legacy profile upgrade
CURA-4075

Only for single-extrusion machines just like before.
2017-12-01 11:06:14 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1' 2017-11-30 16:57:01 +01:00
ChrisTerBeke
47c1c1a8bf
Merge pull request #2883 from fieldOfView/fix_machinesettings_gcode_flavor_materials
[regression] Fix material container for extruder when changing gcode flavor
2017-11-30 16:30:13 +01:00
ChrisTerBeke
d76081ae1d Only restore global profile based on extruders that are actually in use when loading legacy project file 2017-11-30 16:24:46 +01:00
ChrisTerBeke
3abf067d25 Fix loading .curaproject files with stack setups from earlier versions - CURA-4646 2017-11-30 15:24:51 +01:00
fieldOfView
4b0ff6e5f4 Prevent start & end gcode snippets being double encoded 2017-11-30 15:16:09 +01:00
fieldOfView
e8a7237391 Fix updating material container for extruder when changing gcode flavor
Since single extrusion printers have a single extruder stack now, material container needs to be set on the extruder stack instead of the global stack
2017-11-30 11:46:06 +01:00
Diego Prado Gesto
b425672ad0 CURA-4643 Allow using the ESC/ENTER keys for reject or accept the
user agreement
2017-11-30 09:31:07 +01:00
fieldOfView
d5d75aca19 Hide material diameter when the machine has no materials
eg Ultimaker 2 when using UltiGcode
2017-11-29 22:46:17 +01:00
Lipu Fei
e1167ee68f Fix disableKeyButtons in UserAgreement dialog
CURA-4643
2017-11-29 14:33:19 +01:00
Lipu Fei
4586e3dd55
Merge pull request #2375 from Ghostkeeper/optimise_sending_slice_job
Optimise sending slice job
2017-11-29 14:13:37 +01:00
Aleksei Sasin
0b9f7c85c8 Skip keyboard clicks for authentication dialog
CURA-4643
Please enter the commit message for your changes. Lines starting
2017-11-29 14:07:23 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types
Improved mesh type UX (Per Model Settings)
2017-11-29 13:24:38 +01:00
ChrisTerBeke
263230f9d2 Merge branch '3.1' 2017-11-28 15:45:57 +01:00
ChrisTerBeke
f41759e1dc Fix binding extruder manager in machine actions view - CURA-4568 2017-11-28 15:20:05 +01:00
ChrisTerBeke
eeeefcc47a Update UM3 discovery dialog creation to new method - CURA-4568 2017-11-28 15:06:53 +01:00
ChrisTerBeke
9a7fa67da7 Cleanup plugin browser dialog creation - CURA-4568 2017-11-28 15:02:17 +01:00
ChrisTerBeke
bd5e4f9a51 Cleanup cluster output device component creation - CURA-4568 2017-11-28 14:59:55 +01:00
ChrisTerBeke
b40ba0cfc7 Update network cluster output device print view component creation - CURA-4568 2017-11-28 14:58:53 +01:00
ChrisTerBeke
11f50f1cd3 Update machine action and image reader dialogs with new component creation method - CURA-4568 2017-11-28 14:55:35 +01:00
ChrisTerBeke
1d68bcc218 Cleanup usb printer output device manager qml component creation - CURA-4568 2017-11-28 14:31:21 +01:00
ChrisTerBeke
055e4792b0 Cleanup for change log dialog - CURA-4568 2017-11-28 14:27:51 +01:00
ChrisTerBeke
dd43bcee77 Small cleanups for new component creation method - CURA-4568 2017-11-28 14:27:05 +01:00
ChrisTerBeke
e3f1144d97 Update creating QML component in plugin browser - CURA-4568 2017-11-28 14:25:09 +01:00
ChrisTerBeke
74eb4958af Fixes for printer output device views - CURA-4568 2017-11-28 14:21:47 +01:00
ChrisTerBeke
0f944c094d
Merge pull request #2869 from Ultimaker/gcode_flavors
Gcode flavors
2017-11-28 13:30:23 +01:00
Aleksei S
6e171be0b9 After changing the settings refresh simulation max path number
CURA-4632
2017-11-28 13:08:25 +01:00
ChrisTerBeke
f5332ac9ba
Merge pull request #2753 from nickthetait/master
Cleanup/merge old changelog file
2017-11-28 12:51:19 +01:00
Diego Prado Gesto
8054bc3d7d CURA-4552 Change names as indicated in the review and making Marlin the
default flavor. Also fix the case in which the read flavor was not in
the dict.
2017-11-28 11:47:34 +01:00
Lipu Fei
7d01e3388f Merge remote-tracking branch 'upstream/3.1' 2017-11-28 11:36:03 +01:00
Lipu Fei
6db06ea713 Fix project loading for single-extrusion machines
CURA-4617
2017-11-28 11:17:17 +01:00
ChrisTerBeke
68cd9df65f Merge branch '3.1' 2017-11-28 10:36:11 +01:00
ChrisTerBeke
7b30e9a6fc
Merge pull request #2856 from Ultimaker/simulation_view_gradient_changes
Adapt gradient in Simulation view for better visualization of feedrates
2017-11-28 10:34:10 +01:00
Diego Prado Gesto
49537b64f7 CURA-4482 Fix error in SolidView when the support angle stack doesn't
exist. This error was sent twice through the CrashHandler and it is in Metabase.
2017-11-28 09:39:57 +01:00
ChrisTerBeke
67d6b6ab6f Merge branch '3.1' 2017-11-27 17:36:41 +01:00
ChrisTerBeke
0e2f60f18b Fix toggling UM2 upgrades on extruder 0 - CURA-4626 2017-11-27 17:35:57 +01:00
ChrisTerBeke
a072af5585 Merge branch '3.1' 2017-11-27 17:17:02 +01:00
Diego Prado Gesto
cab2e14728 CURA-4552 Add flavors to GCodeReader. The preRead looks for the flavor
in the GCode and then the right flavor handler is responsible for
reading the code. At this moment just the Griffin and RepRap flavors are
taken into account.
2017-11-27 16:56:26 +01:00
Lipu Fei
33a06e13a9 Remove legacy if check in project loading
CURA-4617
2017-11-27 14:27:11 +01:00
Lipu Fei
49cac860a8 Fix project loading
CURA-4617
2017-11-27 14:17:13 +01:00
Ghostkeeper
17a25f98a4
Merge branch '3.1' 2017-11-27 13:58:52 +01:00