 Lipu Fei
|
08dc035f6e
Merge remote-tracking branch 'origin/4.0'
|
6 years ago |
|
Ghostkeeper
|
96a6b7559e
Remember opened state of settings panel
|
6 years ago |
|
Jaime van Kessel
|
e02fcd664c
Merge branch '4.0' of github.com:Ultimaker/Cura
|
6 years ago |
|
Jaime van Kessel
|
4be228a4e2
Fix merging & grouping
|
6 years ago |
|
Jaime van Kessel
|
fd9b29fee2
Rename printersModel to GlobalStacksModel
|
6 years ago |
|
Jaime van Kessel
|
37af42aa93
Merge branch '4.0' of github.com:Ultimaker/Cura
|
6 years ago |
|
Ghostkeeper
|
139ab2e0bb
Increment setting_version to 6
|
6 years ago |
|
Ghostkeeper
|
c6f4cb4927
Make the settings panel resizable
|
6 years ago |
|
Jaime van Kessel
|
4ab79f963a
Remove deprecated functions
|
6 years ago |
|
Jaime van Kessel
|
33c97fcf4a
Updated typing
|
6 years ago |
|
Ghostkeeper
|
e51b5993d3
Don't create system tray icon in headless mode
|
6 years ago |
|
Diego Prado Gesto
|
da69c16e09
Split the constants in to files, indicating which constants each file
|
6 years ago |
|
ChrisTerBeke
|
25caf1a087
Fix merge conflicts
|
6 years ago |
|
Lipu Fei
|
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types
|
6 years ago |
|
Diego Prado Gesto
|
3c99b69724
Merge branch '4.0' into CURA-6005_cura_drive_plugin
|
6 years ago |
|
ChrisTerBeke
|
70421e5ac5
Merge branch '4.0' into STAR-322_cloud-connection
|
6 years ago |
|
Diego Prado Gesto
|
b5d8db6a77
Merge branch '4.0' into CURA-6011_connection_types
|
6 years ago |
|
Diego Prado Gesto
|
e62a570210
Merge branch '4.0' into CURA-6005_cura_drive_plugin
|
6 years ago |
|
Ghostkeeper
|
c235f339ae
Increment API version to 6
|
6 years ago |
|
Jaime van Kessel
|
226d052468
Move the machines from machinelist into their own model
|
6 years ago |
|
ChrisTerBeke
|
2772b3bcbd
Merge branch '4.0' into STAR-322_cloud-connection
|
6 years ago |
|
Lipu Fei
|
4252b95603
Make ConnectionType Enum type accessible to QML
|
6 years ago |
|
Lipu Fei
|
620790ae3d
Reduce the creations of ExtrudersModels
|
6 years ago |
|
Lipu Fei
|
b6ea61612e
Fix merge conflicts
|
6 years ago |
|
Lipu Fei
|
2275e5c71f
Refactor code to use constants in CuraConstants
|
6 years ago |
|
Diego Prado Gesto
|
e479772f4d
Merge branch 'master' into ui_rework_4_0
|
6 years ago |
|
Aleksei S
|
84c85439ff
The trigger_early_crash did not trigger early crash for testing purposes
|
6 years ago |
|
Diego Prado Gesto
|
dad2031e4b
Switch to the preview stage before to switch to simulation view
|
6 years ago |
|
Ghostkeeper
|
266e08fdff
Merge branch 'master' into ui_rework_4_0
|
6 years ago |
|
fieldOfView
|
e66875865f
Make Cura app name configurable in CuraVersion
|
6 years ago |
|
Remco Burema
|
5f4e3948d3
Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning
|
6 years ago |
|
Lipu Fei
|
75f2f40534
Make API version configuration for Application
|
6 years ago |
|
Diego Prado Gesto
|
2c59419dbb
Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage
|
6 years ago |
|
Diego Prado Gesto
|
2d59ca02ca
Merge branch 'ui_rework_4_0' into cura4.0_header
|
6 years ago |
|
Lipu Fei
|
ce517f1517
Merge from 3.6
|
6 years ago |
|
Diego Prado Gesto
|
18c9e9f05a
Merge branch 'ui_rework_4_0' into cura4.0_header
|
6 years ago |
|
Jaime van Kessel
|
412e5977a6
Fix type issues
|
6 years ago |
|
Lipu Fei
|
ff4dfcf9a6
Make Cura app display name configurable
|
6 years ago |
|
Diego Prado Gesto
|
a85fa6b9ad
Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage
|
6 years ago |
|
Diego Prado Gesto
|
ef0ba81564
Merge branch 'ui_rework_4_0' into cura4.0_header
|
6 years ago |
|
Lipu Fei
|
cb24549d7d
Set CuraApplication display name
|
6 years ago |
|
Jaime van Kessel
|
6083eda3fa
Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage
|
6 years ago |
|
Ghostkeeper
|
779496f846
Don't require MirrorTool, RotateTool, ScaleTool or SimulationView
|
6 years ago |
|
Ghostkeeper
|
8a52fd2c2c
Document why these plug-ins are required
|
6 years ago |
|
Jaime van Kessel
|
3248a05819
Add PreviewStagePlugin stubs
|
6 years ago |
|
fieldOfView
|
0c1b3931db
Revert "WIP: Add custom CameraView for UM camera feed"
|
6 years ago |
|
fieldOfView
|
484b1e5ec6
Remove CameraImageProvider and NetworkCamera
|
6 years ago |
|
fieldOfView
|
890ddc015e
Add Cura.NetworkMJPGImage widget
|
6 years ago |
|
Diego Prado Gesto
|
5de367bcc4
Merge branch 'ui_rework_4_0' into cura4.0_header
|
6 years ago |
|
Lipu Fei
|
b00ea4719a
WIP: Add custom CameraView for UM camera feed
|
6 years ago |
