Lipu Fei
025239c26e
Add documentation for ContainerGroup
2018-02-28 11:24:31 +01:00
Lipu Fei
a0acf8631d
Add copyright headers
2018-02-28 11:18:01 +01:00
Lipu Fei
c143cd97c8
More accurate doc for material maps
2018-02-28 11:15:43 +01:00
Lipu Fei
c5d443109b
Split MaterialGroup and MaterialNode
2018-02-28 11:12:44 +01:00
Aleksei S
e533c4604c
Update infill scroll bar if setting is changed in custom mode
...
CURA-4916
2018-02-28 10:52:46 +01:00
ChrisTerBeke
1c2999551b
install materials, install cura engine, run headless
2018-02-28 10:30:51 +01:00
Lipu Fei
615b20aa5b
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-28 09:51:26 +01:00
Ian Paschal
1eaec2ecbc
Update ISSUE_TEMPLATE.md
2018-02-28 09:17:11 +01:00
Ian Paschal
a74282a664
Update ISSUE_TEMPLATE.md
2018-02-28 09:15:53 +01:00
Jack Ha
7507ba10a9
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-27 16:33:44 +01:00
Jack Ha
01071da4c1
CURA-4606 corrected slider bar, it now updates correctly from 0 available qualities to 1 available quality
2018-02-27 16:33:37 +01:00
ChrisTerBeke
cee0887d1b
Fix typo in python path
2018-02-27 16:24:50 +01:00
ChrisTerBeke
d3f7771e16
Simplify cura engine cmake
2018-02-27 16:24:17 +01:00
ChrisTerBeke
e1a6ab098a
Rename source paths env variable
2018-02-27 16:21:07 +01:00
Lipu Fei
85e3857785
Use getters to get managers for CuraStackBuilder
2018-02-27 16:12:28 +01:00
Lipu Fei
9dcd72fb36
Remove outdated TODOs
2018-02-27 16:06:09 +01:00
Ian Paschal
62e7cb9a2d
CURA-4972 Allow reslice after setting is removed
...
The issue Andreea found was caused by the fact that the object was unsubscribed from setting validation while still having the illegal value, because the setting (and its illegal value) was removed AFTER unsubscribing. Thus the illegal value got "saved" until the next time you added that setting and set the correct value.
2018-02-27 16:05:07 +01:00
Lipu Fei
632e0469fb
Fix 3MF Reader
2018-02-27 16:01:11 +01:00
Lipu Fei
f304e7f2e7
Revert "Use userChanges instead of getTop()"
...
PerObjectContainerStacks are not CuraContainerStacks, so we cannot use "userChanges"
with it.
2018-02-27 16:01:11 +01:00
ChrisTerBeke
8144ca978b
Add CuraEngine to Dockerfile
2018-02-27 15:55:24 +01:00
Jack Ha
85f3b7dcee
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-27 15:15:13 +01:00
Jack Ha
ae00fc2a7e
CURA-4606 change activeQualityLayerHeight to use self._current_quality(_changes)_group
2018-02-27 15:15:04 +01:00
Jack Ha
cbeaf3b287
CURA-4606 set empty quality when setting active machine when the current quality type is not in the available qualities
2018-02-27 15:14:34 +01:00
Lipu Fei
950f6708c4
Make sure to generate unique name for duplicated quality changes
2018-02-27 14:20:43 +01:00
Jack Ha
fae82ef242
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-27 13:57:37 +01:00
Jack Ha
08bfe93385
CURA-4606 CURA-5020 switching to quality changes now also checks and shows keep or discard user settings
2018-02-27 13:57:30 +01:00
Lipu Fei
2f86687320
Fix init machine for machines loaded from project files
2018-02-27 13:49:45 +01:00
Lipu Fei
a2e84bbe97
Fix set quality group in init machine
2018-02-27 13:49:20 +01:00
ChrisTerBeke
4dd01afffb
Cleanup Dockerfile
2018-02-27 13:31:07 +01:00
ChrisTerBeke
dae2d9d761
Add Dockerfile
2018-02-27 13:20:18 +01:00
Lipu Fei
dfa870b6a9
Remove approximate diameter unit tests because the function/property is gone
2018-02-27 13:15:03 +01:00
Lipu Fei
75573da9dd
Fix merge conflicts with master
2018-02-27 13:08:29 +01:00
Lipu Fei
5412a29ef9
Fix update quality upon material change
2018-02-27 13:05:19 +01:00
Jack Ha
df46241225
CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack
2018-02-27 13:03:08 +01:00
Ghostkeeper
c47045a42e
Revert "CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished"
...
This reverts commit 269b52487e
2018-02-27 11:47:17 +01:00
Jack Ha
d79206301d
CURA-4606 CURA-5012 fix incompatible diameter update message in materialview
2018-02-27 11:43:54 +01:00
Ghostkeeper
b54d709f96
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master
2018-02-27 10:25:11 +01:00
Jack Ha
22cf5abec2
Merge branch 'master' into refactoring_machine_manager
2018-02-27 10:24:56 +01:00
Lipu Fei
ccd4bb285b
Use userChanges instead of getTop()
2018-02-26 19:40:31 +01:00
Lipu Fei
17d3be03b4
Use getMaterialManager() in ContainerManager
2018-02-26 19:38:44 +01:00
Lipu Fei
d9d2cc9069
Remove unused code in PrintInformation
2018-02-26 19:37:29 +01:00
Lipu Fei
a74f84fce7
Add comment why sorting the material group map
2018-02-26 19:35:56 +01:00
Lipu Fei
0b8678d2ae
Explicitly create MachineManager
2018-02-26 19:33:16 +01:00
Lipu Fei
12c51f4066
Use setActiveMachine() in project loading
2018-02-26 17:05:55 +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
Jack Ha
d471e34e48
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-26 16:33:32 +01:00
Jack Ha
c23827cfa1
CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change
2018-02-26 16:33:25 +01:00
Ghostkeeper
b5d1e5be36
Remove 'None' default for quality_type
...
It has no semantic meaning to specify that here. The behaviour of this commit should be the same since 'None' is the default value for that parameter.
Contributes to issue CURA-4966.
2018-02-26 16:21:46 +01:00
Ian Paschal
02c78faabc
Merge pull request #3404 from Ultimaker/CURA-4972_per_object_setting_validation
...
Cura 4972 per object setting validation
2018-02-26 16:06:44 +01:00
Ghostkeeper
c16214e0f3
Traditional Chinese is complete again
...
At least, complete for 3.2.
2018-02-26 15:48:04 +01:00
