Jack Ha
c2888529cb
CURA-5128 cleanup .gz and only leave .gcode.gz as Cura and Uranium now accept extensions with multiple periods
2018-03-22 14:35:21 +01:00
Lipu Fei
ce0e3f89b7
Fix code style and typo
...
CURA-4846
2018-03-22 09:42:14 +01:00
Aleksei S
47417c86a3
Rename method name
...
CURA-4846
2018-03-21 17:25:23 +01:00
Aleksei S
feb59f2531
Merge branch 'master' of github.com:Ultimaker/cura
2018-03-21 17:22:24 +01:00
Aleksei S
4fa195894d
Fix: After reloading merged models they do not update origin position
...
CURA-4846
2018-03-21 17:21:11 +01:00
Diego Prado Gesto
5e3cf92197
CURA-5134 Add funtionality to lazily remove plugins
2018-03-21 16:57:48 +01:00
fieldOfView
5a9bcf446e
Do not select parented nodes when selecting all
2018-03-19 17:52:40 +01:00
fieldOfView
91e1ae69ec
Don't reparent nodes that are children of a selected node when grouping selection
2018-03-19 14:35:08 +01:00
fieldOfView
af637d5acc
Don't explode all nested groups when ungrouping groups of groups
2018-03-19 11:33:17 +01:00
Lipu Fei
9de114c73a
Simplify discardOrKeepProfileChangesClosed()
2018-03-15 16:48:09 +01:00
Lipu Fei
83175b00c2
Change SettingVisibilityPresetsModel to non-singleton
...
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
1f2602a2f4
Move SettingVisibilityPresetsModel to Machines.Models
...
CURA-5088
2018-03-15 14:41:34 +01:00
Jack Ha
98b0559c9a
Merge branch 'master' into speedup
2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d
CURA-5090 speedups by using qtimers on updating mostly visual elements
2018-03-14 16:09:59 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles
...
Setting Visibility Presets sidebar menu
2018-03-14 13:25:59 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button
...
[Feature] Sync Button
2018-03-13 16:52:39 +01:00
Diego Prado Gesto
2bf6d071d1
Merge branch 'master' into feature_sync_button
2018-03-13 13:54:22 +01:00
Lipu Fei
934d297e6c
Split error checking into smaller sub-tasks
...
CURA-5059
Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
2018-03-13 13:21:44 +01:00
Jack Ha
d70cc072e9
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 09:06:24 +01:00
Diego Prado Gesto
85d6919ce6
Merge branch 'master' into feature_sync_button
2018-03-09 16:59:18 +01:00
fieldOfView
e62ed62bdd
Remove duplicate import
2018-03-09 16:57:09 +01:00
Diego Prado Gesto
472ae8e044
CURA-4870 Create a custom model for the machines in order to show the
...
printers grouped by local or networked.
2018-03-09 16:35:23 +01:00
Ghostkeeper
d8a066c1e7
Increment instance container version number instead of just quality_changes
...
Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong.
Contributes to issue CURA-5054.
2018-03-09 16:14:24 +01:00
fieldOfView
4c66c935af
Merge branch 'master' into feature_setting_visibility_profiles
2018-03-09 15:45:24 +01:00
Ghostkeeper
5caa92cf7a
Update current version for quality changes
...
We now need to upgrade up to version 3000004.
Contributes to issue CURA-5054.
2018-03-09 15:21:45 +01:00
Lipu Fei
d1beae4603
Better logging for checkIsValidProjectFile()
...
CURA-4966
2018-03-08 19:50:22 +01:00
fieldOfView
97d7354839
Merge branch 'master' into feature_setting_visibility_profiles
2018-03-05 23:09:51 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +01:00
Jack Ha
01f4e7c0e3
CURA-4400 on load mesh, set the extruder to the default extruder
2018-03-05 16:31:49 +01:00
Lipu Fei
c6128ef5ba
Move setMaterialName() into MaterialManager
2018-03-02 16:22:22 +01:00
Lipu Fei
06ec16d627
Rename quality drop down menu models
2018-03-01 15:37:48 +01:00
Lipu Fei
c0604e5c75
Move MultiBuildPlateModel into Models folder
2018-03-01 15:25:11 +01:00
Lipu Fei
580244a546
Split material models into separate files
2018-03-01 11:50:55 +01:00
Lipu Fei
4a202d6728
Use getMultiBuildPlateModel()
2018-02-28 11:42:26 +01:00
Lipu Fei
75573da9dd
Fix merge conflicts with master
2018-02-27 13:08:29 +01:00
Ghostkeeper
c47045a42e
Revert "CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished"
...
This reverts commit 269b52487e
2018-02-27 11:47:17 +01:00
Jack Ha
22cf5abec2
Merge branch 'master' into refactoring_machine_manager
2018-02-27 10:24:56 +01:00
Lipu Fei
0b8678d2ae
Explicitly create MachineManager
2018-02-26 19:33:16 +01:00
Ian Paschal
f98b60f549
Merge pull request #2827 from Ultimaker/thopiekar-UM-watch-files-for-modification
...
CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished
2018-02-26 16:58:55 +01:00
Lipu Fei
8dfa52f15c
Fix material menu model extruder binding and initial update
2018-02-22 20:58:54 +01:00
Lipu Fei
d2ffd59431
Switch to the new quality profile when it is created
2018-02-22 16:53:13 +01:00
Lipu Fei
392f729731
Reduce number of QML singletons
2018-02-22 14:21:10 +01:00
Lipu Fei
b415a36110
WIP: Remove delayed update in MachineManager
2018-02-22 13:58:35 +01:00
Lipu Fei
9a354efd19
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-21 14:05:19 +01:00
Jack Ha
b96d49c010
CURA-4606 ensure startup order for machine manager before build volume to prevent errors there
2018-02-20 16:04:41 +01:00
Lipu Fei
6cc65e97f2
WIP: Cleanup MaterialsModel
2018-02-20 09:13:11 +01:00
Lipu Fei
251fe8a3a6
WIP: Remove ContainerSettingModel
2018-02-19 17:03:30 +01:00
Jack Ha
3ff9cb6b1e
CURA-4606 added first Profile management page
2018-02-19 15:07:50 +01:00
Aleksei S
1afe2668f7
Fix: Extreme small model was not automatically scaled.
2018-02-19 15:04:08 +01:00
Lipu Fei
495fc8bbd7
WIP: Refactor BuildPlateModel and split MultiBuildPlateModel
2018-02-17 22:24:05 +01:00
