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
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 269b52487ed28e42daf7e2716117c4d3d27bc2fa. It was crashing Cura when pressing F5.
The completion of this job should not be moved to Uranium because the job exists only in Cura.
Contributes to issue CURA-4912.
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
Ghostkeeper
94bce53691
Update headers
2018-02-26 15:47:07 +01:00
Ghostkeeper
6169c36b06
Merge branch 'update-zh_TW-translation-3.2' of https://github.com/dinowchang/Cura into dinowchang-update-zh_TW-translation-3.2
2018-02-26 15:45:33 +01:00
Ghostkeeper
cde67ab84c
Add warning for low Retraction Min Travel
...
Because if you set it to be too close to the line width, you'll get retractions between every skin line.
2018-02-26 14:48:43 +01:00
Ghostkeeper
91d271b993
Reset UM2+ PP profiles retraction minimum travel
...
These settings were set to be lower than the line width. I'm resetting them so that they will again be 2 times the line width. Otherwise we'll get retractions between every skin line which is really bad for PP.
Fixes #3171 .
2018-02-26 14:48:43 +01:00
Diego Prado Gesto
197508028a
Merge branch 'master' of github.com:Ultimaker/Cura
2018-02-26 14:03:14 +01:00
Diego Prado Gesto
f5b3775b7c
CURA-4966 When loading a project, check the quality in all the extruder stacks and replace with
...
the global quality if they don't match.
2018-02-26 14:01:43 +01:00
Aleksei S
6df4ad3f6d
Merge branch 'master' of github.com:Ultimaker/cura
2018-02-26 11:51:56 +01:00
Aleksei S
cd0846fad2
PostProcessing plugi, script Pause at Height redo layers
...
gives incorrect E-values
CURA-4670
2018-02-26 11:49:51 +01:00
Lipu Fei
9ddc6a52b7
Refactor fix for extruder stack material diameters and nozzle sizes
2018-02-26 11:40:21 +01:00
Diego Prado Gesto
1f5d4e90c4
Merge branch 'CURA-4968_support_eraser_on_platform'
2018-02-26 11:28:20 +01:00
Jack Ha
2df9802ba5
CURA-4606 CURA-5010 fix print information crashing on printer switch
2018-02-26 09:57:16 +01:00
Ghostkeeper
6934c3f881
Use self.putValue to write g-code
...
Mostly as a test of this function. Seems to work.
2018-02-26 09:54:42 +01:00
Ghostkeeper
a7e1910711
Add E in the priority list
...
This way we're assured of the order in which these parameters occur, even though the firmware doesn't care about it. It's easier to read though.
2018-02-26 09:54:07 +01:00
Ghostkeeper
5160373580
Add helper function to write g-code lines
...
Requested during the post-processing script workshop that I was giving.
2018-02-26 09:43:10 +01:00
Ghostkeeper
d0cc9ba8a6
Remove debugging prints
2018-02-26 09:42:29 +01:00
Jack Ha
11be94c735
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-26 09:30:33 +01:00
Ian Paschal
e3411e9edb
CURA-4972 More zen.
2018-02-23 14:52:35 +01:00
Ghostkeeper
ce125a41a5
Merge branch 'feature_zigzag_all_infill'
2018-02-23 13:19:24 +01:00
Diego Prado Gesto
3c6e94ea81
CURA-4968 Add the support eraser cube to the bottom of the buildplate
...
when the automatic drop models preference is OFF
2018-02-23 13:08:15 +01:00
Aleksei S
ed7dec0cae
Fix: per model settings validation
...
CURA-4972
2018-02-23 13:05:29 +01:00
Lipu Fei
f487c5b084
Fix profile management page
2018-02-22 23:31:41 +01:00
Lipu Fei
dec7ad25e2
Fix activate newly created custom quality profile
2018-02-22 23:08:26 +01:00
Lipu Fei
a3a206c6dd
Quality groups are QObjects
2018-02-22 23:07:49 +01:00
Lipu Fei
e53048079d
Remove debugging logs
2018-02-22 23:05:06 +01:00
Lipu Fei
f51129b103
Remove TestTools plugin
2018-02-22 21:47:06 +01:00
Lipu Fei
8dfa52f15c
Fix material menu model extruder binding and initial update
2018-02-22 20:58:54 +01:00
Jack Ha
cad6a3bb3d
CURA-4606 CURA-5003 select and activate material after create, duplicate
2018-02-22 17:14:23 +01:00
Lipu Fei
68b1a374e0
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-22 16:53:32 +01:00
