12129 Commits

Author SHA1 Message Date
Ghostkeeper
c63ef6fed6
Remove unused variables
The machine_name variable is later redefined.

Contributes to issue CURA-4243.
2017-11-28 16:58:04 +01:00
Dinow
21c1272e45 Update cura.po for 3.1 2017-11-28 23:50:38 +08:00
Ghostkeeper
381d9bf3f1
Log which file caused it to go wrong
Contributes to issue CURA-4243.
2017-11-28 16:15:20 +01:00
ChrisTerBeke
ce88b9ee67
Merge pull request #2692 from Ultimaker/reload_qml
Added reload qml action
2017-11-28 15:50:47 +01:00
ChrisTerBeke
263230f9d2 Merge branch '3.1' 2017-11-28 15:45:57 +01:00
Ghostkeeper
56d6664c8c
Guard against materials not having a definition
The empty container has no definition.

Contributes to issue CURA-4243.
2017-11-28 15:33:21 +01:00
ChrisTerBeke
f41759e1dc Fix binding extruder manager in machine actions view - CURA-4568 2017-11-28 15:20:05 +01:00
ChrisTerBeke
b961c37ead Fix generating view for machine action - CURA-4568 2017-11-28 15:18: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
Lipu Fei
fa1d1ee3ad Fix layer height slider auto switching
CURA-4617
2017-11-28 14:35:44 +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
Ghostkeeper
eb3981b4e0
Let _fetchInstanceContainers return containers split by loaded or not
It must now return two dictionaries: One for the profiles that have been completely loaded and one for the profiles that are only metadata. We could probably improve on these a little bit, since all of these (except the material model) will now load all available quality profiles. I'll see if it is necessary to optimise that.

Contributes to issue CURA-4243.
2017-11-28 14:26:14 +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
cfbb553182 Use new QML element creator for output device view - CURA-4568 2017-11-28 14:16:58 +01:00
ChrisTerBeke
e6b3773d8e
Merge pull request #2797 from Ultimaker/feature_firmware_retract_setting
Add setting to determine whether to use firmware retraction
2017-11-28 13:45:38 +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
ChrisTerBeke
cf187215dd Add experimental settings for adaptive layer heights - CURA-4524 2017-11-28 11:44:20 +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
9db8bff924 Merge pull request #2838 from fieldOfView/fix_crashhandler_crash
Fix error when CrashHandler is opened before opengl is initialised
2017-11-28 10:38:23 +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
ChrisTerBeke
ec281dc1d5
Merge pull request #2861 from Builder3D/master
Removed the "Not supported" materials Builder Premium
2017-11-28 09:55:46 +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
Buco
af0b949a6f Changed Setting version
Setting version to 4
2017-11-28 09:28:25 +01:00
Buco
6caa434dc2 Add Quality Profiles
Added extra Quality profiles for BVOH, PET, Innoflex60 and PVA
2017-11-28 09:07:34 +01:00
Buco
228c373133
Merge pull request #1 from Ultimaker/master
Update from original
2017-11-28 08:32:39 +01:00
Thomas Karl Pietrowski
0e95063f8f
desktop.in: Ultimaker Cura everywhere! 2017-11-28 00:45:01 +01:00
Ruben D
0c4db90b7b
Add button to disable sending info directly
Convenient and easy.
2017-11-28 00:20:43 +01:00
Ruben D
ab64cb5749
Add print head shape
Fixes #2808.
2017-11-27 23:10:58 +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
e6e8353ea8
Merge pull request #2838 from fieldOfView/fix_crashhandler_crash
Fix error when CrashHandler is opened before opengl is initialised
2017-11-27 17:18:38 +01:00
ChrisTerBeke
a072af5585 Merge branch '3.1' 2017-11-27 17:17:02 +01:00
ChrisTerBeke
b74ebc57b4 Fix per extruder setting value depending on extruder count - CURA-4627 2017-11-27 17:00:57 +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
ChrisTerBeke
26b9fc3163 Only create extruder stack for single extrusion machine when not yet existing - CURA-4482 2017-11-27 16:55:01 +01:00
ChrisTerBeke
8cfaa44580 Fix resolving global stack definition when switching variant - CURA-4620 2017-11-27 16:40:23 +01:00
Ghostkeeper
e5427eded6
Refactor _getBasicMaterials to only handle metadata
Otherwise the full profile of all materials and all their definitions gets loaded.

Contributes to issue CURA-4243.
2017-11-27 15:38:11 +01:00
ChrisTerBeke
9e6704a162 Fix extruder stack machine definition link for per extruder settings resolvement - CURA-4627 2017-11-27 15:14:32 +01:00