 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 |
|
Lipu Fei
|
cbd8c8739d
Merge from master
|
6 years ago |
|
Lipu Fei
|
afa3e62dc1
Merge pull request #4615 from Ultimaker/CURA-5814_Material_cost_now_always_shown
|
6 years ago |
|
Lipu Fei
|
9b94db8957
Directly use empty containers in MachineManager
|
6 years ago |
|
Lipu Fei
|
e5efd1e41f
Move constant definition into constructor
|
6 years ago |
|
Diego Prado Gesto
|
54f32a1d82
Merge branch 'ui_rework_4_0' into cura4.0_header
|
6 years ago |
|
Diego Prado Gesto
|
b670cd82c4
Merge branch 'master' into cura4.0_header
|
6 years ago |
|
Jaime van Kessel
|
3ad113f70f
Added some missing typing.
|
6 years ago |
|
Jaime van Kessel
|
45da5b9130
Added more specific overrides for get/set globalContainerStack
|
6 years ago |
|
Jaime van Kessel
|
4c5bf3297c
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset
|
6 years ago |
|
Diego Prado Gesto
|
193f113851
Clean up Cura.qml:
|
6 years ago |
|
Lipu Fei
|
18cb21186c
Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager
|
6 years ago |
|
Jaime van Kessel
|
f3fdb46dba
Add missing types
|
6 years ago |
|
Jaime van Kessel
|
dabe747ec0
Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura
|
6 years ago |
|
Jaime van Kessel
|
edb5de9954
Added unit test for settingvisibility presets
|
6 years ago |
|
Jaime van Kessel
|
fc9f05fc8b
Moved SettingVisibilityPreset loading to it's own class
|
6 years ago |
|
Lipu Fei
|
f69005fef9
Rename to CuraFormulaFunctions
|
6 years ago |
|
Lipu Fei
|
8584af415a
Merge remote-tracking branch 'origin/CURA-5744-move-oauth-login' into resolve_dependencies_oauth
|
6 years ago |
|
Lipu Fei
|
7ae6800a14
Fix imports in QualityManager
|
6 years ago |
|
Lipu Fei
|
dd150bbab9
Resolve circular imports for CuraAPI
|
6 years ago |
|
Jaime van Kessel
|
3b70e5eb6b
Fix typing
|
6 years ago |
|
ChrisTerBeke
|
185a1707b2
Merge branch 'master' into CURA-5744-move-oauth-login
|
6 years ago |
|
Lipu Fei
|
7a681a2ae4
Move Cura custom setting functions to a separate file
|
6 years ago |
|
Cherubim
|
c29d38361b
Fix initial start-up when providing model parameter
|
6 years ago |
|
Jaime van Kessel
|
081b2a28fe
Expose Account API to QML
|
6 years ago |
|
Lipu Fei
|
a80fde1495
Merge remote-tracking branch 'origin/3.5'
|
6 years ago |
|
Lipu Fei
|
1bf78c086d
Remove import plugins which is not a module
|
6 years ago |
|
Diego Prado Gesto
|
8352fd1ae0
Merge branch '3.5'
|
6 years ago |
|
Diego Prado Gesto
|
4bd5d29970
Don't crash if the plugin is not found (maybe some error while loading).
|
6 years ago |
|
Diego Prado Gesto
|
2d300ab395
Revert "Fix plugins import in CuraApplication"
|
6 years ago |
|
Ghostkeeper
|
c6fa9474d6
Merge branch '3.5'
|
6 years ago |
|
Diego Prado Gesto
|
7e1a833e9c
Merge branch '3.5' into CURA-5682_material_manager_leftovers
|
6 years ago |
|
Jaime van Kessel
|
729d78e14a
Updated another set of typing
|
6 years ago |
