Diego Prado Gesto
d72e08a3ba
Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2
2018-01-24 16:05:28 +01:00
Diego Prado Gesto
e38cf957bb
CURA-4839 Avoid creating unique names for the extruder instance
...
containers if the strategy is upgrade existing
2018-01-24 16:04:11 +01:00
ChrisTerBeke
d1f2d6f45d
Fix checking material_used per extruder for analytics - CURA-4858
2018-01-24 14:02:44 +01:00
ChrisTerBeke
c471991044
Update plugin browser version to 4 as network rewrite has another set of breaking changes
2018-01-24 13:30:08 +01:00
ChrisTerBeke
b41d8eb0dd
Merge branch '3.2'
2018-01-24 13:29:30 +01:00
ChrisTerBeke
9488c39f68
Update plugin browser version as we have breaking changes in Cura 3.2
2018-01-24 11:07:13 +01:00
Ian Paschal
dcb1ac5deb
Plugin browswer updates
...
- Partial refactor
- Preparation for merge with plugins in preferences
2018-01-23 16:20:19 +01:00
Ghostkeeper
f88df7e5cd
Remove overzealous log entry
...
This was in the happy path and gets executed for every material profile in every material file, which is hundreds of times. Better not.
Found during development of CURA-4797.
2018-01-23 15:45:12 +01:00
Jack Ha
b0d0b75662
Merge branch '3.2'
2018-01-23 14:25:11 +01:00
Diego Prado Gesto
7a84712fc9
CURA-4854 Revert some changes in 619a8cc
that make that issue not working
2018-01-23 12:13:26 +01:00
Jack Ha
1efc92ddbe
CURA-4853 evaluate layer view compatibility mode in init, therefore not binding some signals and fixing the bug
2018-01-23 11:46:59 +01:00
Aleksei S
54dc63a596
Add missing changes
...
CURA-3710
2018-01-23 11:24:27 +01:00
Lipu Fei
b14fdb1d0d
Merge remote-tracking branch 'origin/3.2'
2018-01-23 11:20:49 +01:00
Lipu Fei
1c605a5108
Fix different strategies for machine and quality in project loading
...
CURA-4839
2018-01-23 10:58:43 +01:00
Lipu Fei
3fb9877a30
Add call_on_qt_thread to fix project loading crashing on rendering
...
CURA-4839
See comments...
2018-01-22 17:22:27 +01:00
ChrisTerBeke
2eef282b40
Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2
2018-01-22 17:18:19 +01:00
ChrisTerBeke
129f9cc16c
Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835
2018-01-22 17:18:09 +01:00
Jaime van Kessel
1f8d7dfacb
Merge branch 'master' of github.com:Ultimaker/Cura
2018-01-22 15:48:07 +01:00
Jaime van Kessel
dcfab2f923
Failed state in printjobs is now handled correctly
2018-01-22 15:47:37 +01:00
Diego Prado Gesto
26d77778c1
Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2
2018-01-22 15:40:59 +01:00
Ghostkeeper
292556b4b3
Merge branch '3.2'
2018-01-22 15:38:23 +01:00
Ghostkeeper
50ccf101d8
Don't write Octoprint keys to workspace projects
...
They should not be shared since they are private keys, so let's protect the user from accidentally sharing it via a project file.
2018-01-22 15:37:51 +01:00
Diego Prado Gesto
619a8ccce5
CURA-4839 Fix single extrusing for overrite the extruder stack.
2018-01-22 15:04:24 +01:00
Ian Paschal
f27dc4473e
Possible to remove plugins
...
Note that this required adding an `uninstallPlugin()` method to the `PluginRegistry` class of Uranium.
2018-01-22 14:25:34 +01:00
Diego Prado Gesto
e2bc14cc58
Change layer thickness colormap to parula-like ( https://es.mathworks.com/help/matlab/ref/parula.html )
2018-01-22 13:41:37 +01:00
Diego Prado Gesto
20da35ec5c
Check when the containers are empty instead of None. Contributes to CURA-4845
2018-01-22 13:12:22 +01:00
Ian Paschal
628314af9e
Basic style ready for PR
...
- Temporarily removed remove/disable button as it's non-functional for now
2018-01-22 13:00:22 +01:00
Jack Ha
4c474c9619
Merge branch '3.2'
2018-01-22 12:58:16 +01:00
Jack Ha
8d8fa0269a
CURA-4821 loading gcode will now delete all existing models from all build plates and delete existing layer data to be processed
2018-01-22 12:57:50 +01:00
Ghostkeeper
ec0fca30a4
Merge branch '3.2'
2018-01-22 12:48:54 +01:00
Jack Ha
93dbf93ee0
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2
2018-01-22 11:07:50 +01:00
Jack Ha
ba29d64592
CURA-4821 Fix one at a time slicing for builtiplexer
2018-01-22 11:07:38 +01:00
Diego Prado Gesto
fe6019988c
CURA-4839 Create variable before asignment
2018-01-22 10:53:52 +01:00
Diego Prado Gesto
0328050548
Change layer thickness colormap to parula-like ( https://es.mathworks.com/help/matlab/ref/parula.html )
2018-01-21 17:16:18 +01:00
Lipu Fei
b92ebadfd0
Fix quality_changes for single-extrusion machines
...
CURA-4839
- Add newly created quality_changes container to ContainerRegistry
- If an extruder is created by CuraContainerRegistry, in project
loading, do not try to override extruder's quality changes.
2018-01-19 15:05:05 +01:00
fieldOfView
bcfcc8cc7c
Enable setting per mesh group settings when printing One at a Time
2018-01-19 14:59:25 +01:00
Diego Prado Gesto
0fbcd2d2ec
Merge branch '3.2'
2018-01-19 13:50:30 +01:00
ChrisTerBeke
d035ace40d
Add method to set active extruder count to machine manager so other plugins can use it, add empty definitions container template
2018-01-19 13:32:25 +01:00
Lipu Fei
e0c69eb675
Pressing enter on project overview will load the project file
...
CURA-4735
2018-01-19 12:51:09 +01:00
Diego Prado Gesto
f25aad8091
CURA-4821 Remove debug output
2018-01-19 11:18:46 +01:00
Diego Prado Gesto
1f4e7421c1
Revert "CURA-4821 Remove debug info"
...
This reverts commit d03ecf3cba
.
2018-01-19 11:17:42 +01:00
Lipu Fei
02291bb6a3
better name: "Compatible material diameter" in Machine Settings
...
CURA-4832
2018-01-19 11:15:55 +01:00
ChrisTerBeke
a76c84ca30
Finally remove annoying firmware check log line for non-UM3 printers
2018-01-19 10:42:04 +01:00
Diego Prado Gesto
a6acf4a4af
CURA-4829 Do not save the quality changes profile in the GCode if the
...
containers are empty.
Change the message when trying to import a GCode as a profile, but not profile was stored.
2018-01-19 10:34:04 +01:00
ChrisTerBeke
fb8aa08c6a
Merge pull request #3031 from Ultimaker/feature_headless_docker
...
Feature headless
2018-01-19 10:31:20 +01:00
Ian Paschal
81b2f0f7cd
Added drop-down buttons
2018-01-19 09:56:19 +01:00
Diego Prado Gesto
d03ecf3cba
CURA-4821 Remove debug info
2018-01-19 09:16:22 +01:00
Mark
00cf47a941
Merge branch '3.2'
2018-01-18 16:29:44 +01:00
Diego Prado Gesto
2e4b4036e7
Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2
2018-01-18 15:50:06 +01:00
Diego Prado Gesto
ece63bfea8
CURA-4821 The previous cached layer data is removed when a GCode is loaded. Temporary solution for one buildplate.
2018-01-18 15:47:01 +01:00