2882 Commits

Author SHA1 Message Date
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
Jaime van Kessel
0613b1e4b7 Creating components is now done with the prefab function
CURA-4568
2017-11-27 13:00:49 +01:00
Lipu Fei
828fff5ee5 Fix quality check in project loading
CURA-4617
2017-11-27 12:04:21 +01:00
Lipu Fei
46c6c6aa9b Fix quality profile in project loading
CURA-4617
2017-11-27 11:19:40 +01:00
Lipu Fei
4a4f01f9eb Fix resetting not supported profiles for project loading
CURA-4617
2017-11-27 10:52:29 +01:00
ChrisTerBeke
8082c092e5 Fix setting extruder definition in user changes container 2017-11-27 09:54:10 +01:00
Diego Prado Gesto
fa00a17c78 Make UI changes in the Simulation View for adapting the color gradient
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
2017-11-26 21:21:18 +01:00
Diego Prado Gesto
d0c1569da6 Merge branch 'fieldOfView-feature_simulation_ux_tweaks' 2017-11-24 15:48:39 +01:00
Ghostkeeper
147cbdf592
Clarify translations of 'unknown'
For some languages, the gender matters.

Contributes to issue CURA-4601.
2017-11-24 13:16:14 +01:00
Diego Prado Gesto
1ea9379913 CURA-4609 Fix qml rectangle background in feedrate color scheme. 2017-11-24 13:02:11 +01:00
Diego Prado Gesto
bf1ecba641 Add the layer thickness back to the color options in Simulation View 2017-11-24 10:54:20 +01:00
Diego Prado Gesto
c8c2129b7e CURA-4552 Minor changes 2017-11-24 10:51:34 +01:00
ChrisTerBeke
46a575b84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:31:30 +01:00
ChrisTerBeke
7d1db1b165 Merge branch '3.1' 2017-11-24 10:31:22 +01:00
Diego Prado Gesto
7bb82cf56f CURA-4605 Fix render issues when importing a GCode that has empty
layers. Also fix gaps between raft and the model.
2017-11-23 16:47:34 +01:00
Lipu Fei
6b3e130349 Fix edge cases with ultimaker2 and whatever other machines that may get affected
CURA-4617
2017-11-23 16:28:36 +01:00
Diego Prado Gesto
f0dca021d8 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-23 15:42:02 +01:00
Diego Prado Gesto
2c6b2b869e CURA-4605 Fix render issues when there are empty layers.
Fix layer gap when raft is enabled.
2017-11-23 15:39:22 +01:00
Lipu Fei
ef37f0d8c7 Fix project loading to reset quality if it doesn't exist
CURA-4617
2017-11-23 15:35:33 +01:00
Mark
49705492ce Merge branch '3.1' 2017-11-23 14:37:31 +01:00
Jack Ha
5703f954d4 CURA-4552 fix support for relative extrusion 2017-11-23 14:13:18 +01:00
Lipu Fei
033cc4fbc7 Fix quality update in project loading
CURA-4613
2017-11-23 14:12:41 +01:00
Lipu Fei
1db448d7d8 Use the correct quality container for global stacks loaded from project files
CURA-4613
2017-11-23 13:04:06 +01:00