Lipu Fei
eafd856a14
Merge branch '3.5' of github.com:Ultimaker/Cura into 3.5
2018-09-18 16:11:46 +02:00
Diego Prado Gesto
e28b662649
Clean up the code a bit and update comments.
...
Contributes to CURA-5736.
2018-09-18 16:04:31 +02:00
Lipu Fei
a33ce8178a
Support mulitple bundled_packages JSON files
...
CURA-5718
2018-09-18 15:53:56 +02:00
Lipu Fei
9924e3e26c
Remove duplicated code
...
CURA-5735
2018-09-18 15:08:55 +02:00
Aleksei S
1b1ca8a53b
Fix, simulation did not play after second layer
...
CURA-5725
2018-09-18 14:39:43 +02:00
Aleksei S
f33576cc81
Stop simulation after pressing Up or Down in simulation layer textfield
...
CURA-5725
2018-09-18 13:56:20 +02:00
Lipu Fei
ddc5d983a1
Fix single extrusion machines without an ExtruderStack
...
CURA-5736
2018-09-18 13:35:25 +02:00
Ghostkeeper
e5778be887
Corrections to change log
...
One was missing. One was confusing. One was incomplete.
Contributes to issue CURA-5710.
2018-09-18 12:41:44 +02:00
Ghostkeeper
3a096cdb23
Add confirmation dialogue for deleting jobs
...
Re-using MessageDialog again.
Contributes to issues CL-1053 and CURA-5729.
2018-09-18 11:42:34 +02:00
Ghostkeeper
83528ffb48
Add confirmation dialogue for sending prints to top of queue
...
Very simple. Just re-use the MessageDialog component.
Contributes to issues CL-1053 and CURA-5729.
2018-09-18 11:41:51 +02:00
Ghostkeeper
ac4ee8c428
Fix context of pause, resume and abort labels
...
More in line with what we have in the rest of our code base.
Discovered during work on CL-1053 and CURA-5729.
2018-09-18 11:25:35 +02:00
Ghostkeeper
a7a022eca0
Add confirmation dialogue before aborting a print
...
It's a destructive operation so we should ask first.
Contributes to issue CL-1053 and CURA-5729.
2018-09-18 11:24:30 +02:00
Aleksei S
c764b31e06
Update unit test for 'visibilit_settings' and removed unused settings from expert.cfv
...
CURA-5734
2018-09-18 11:10:24 +02:00
Lipu Fei
725ea847a7
Add material_diameter into fdmprinter
...
When saving a material to a file, it will save all the settings in that
container, which needs to create SettingInstances for all the cached
ones, and for those instances, their definitions will be retrieved from
the machine definition.
material_diameter is one of the settings, but it only exists in the
extruder definitions, so when it tries to save a material profile, a lot
of warnings/errors will occur due to the missing "material_diameter" in
fdmprinter. Adding it back fixes this problem.
2018-09-18 10:35:44 +02:00
Ghostkeeper
51d342678e
Merge branch '3.5' of ssh://github.com/Ultimaker/Cura into 3.5
2018-09-18 09:38:55 +02:00
Lipu Fei
b723621fda
Merge pull request #4370 from fieldOfView/fix_usb_printing_port_access
...
[3.5][regression]Fix opening port after baudrate detection
2018-09-17 17:38:12 +02:00
Lipu Fei
4777c3f41d
Merge remote-tracking branch 'origin/CURA-5718_fix_upgrade_for_bundled_plugins'
2018-09-17 17:27:32 +02:00
Lipu Fei
da047ea674
isInstalled() should check old plugins as a fallback
2018-09-17 17:26:38 +02:00
Lipu Fei
15657f4cfc
Remove unneeded code
2018-09-17 17:26:19 +02:00
Lipu Fei
4db213c55a
Fix missing import
2018-09-17 16:24:10 +02:00
Lipu Fei
a4b20e046d
Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins
2018-09-17 16:22:22 +02:00
Lipu Fei
6929d96119
Merge remote-tracking branch 'origin/3.5'
2018-09-17 16:14:49 +02:00
Lipu Fei
6d1db55072
Fix SDK version comparison
2018-09-17 16:14:28 +02:00
Lipu Fei
51742b2a68
Merge pull request #4378 from Ultimaker/stop_simulation_when_changing_layers_or_paths
...
Stop simulation when dragging handles
2018-09-17 15:38:59 +02:00
Aleksei S
261600121a
Created Cura setting visibility test
2018-09-17 15:29:02 +02:00
Ghostkeeper
816c3cbd11
Fix forgotten separation between header and body
...
I copied these over from a piece where they had a different layout.
Contributes to issue CURA-5710.
2018-09-17 14:43:17 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5'
2018-09-17 14:41:45 +02:00
Diego Prado Gesto
6c9c68e004
Active the focus when the selected item changes.
...
In this case, if the user was updating some information in one material
and then select other material, the new data is stored.
Contributes to CURA-5682.
2018-09-17 14:41:45 +02:00
Ghostkeeper
1bf05e6701
Merge branch 'CURA-5718_fix_upgrade_for_bundled_plugins' into 3.5
2018-09-17 14:36:17 +02:00
Diego Prado Gesto
dfae4a9a86
Add a property that indicates when the layer slider or the path slider
...
has changed manually.
With this we can differentiate when the layer changed automatically
(during simulation) or manually (by user interaction). In case it was
changed manually, the simulation will stop.
Contributes to CURA-5725.
2018-09-17 14:02:04 +02:00
Lipu Fei
2bf617b53a
Merge pull request #4376 from Ultimaker/CURA-5682_material_manager_leftovers
...
Material preference page leftovers
2018-09-17 13:23:59 +02:00
Diego Prado Gesto
74fcc10f59
Merge branch '3.5' into CURA-5682_material_manager_leftovers
2018-09-17 12:11:00 +02:00
Diego Prado Gesto
bafc2b98c9
Reuse MaterialBrandSection component for Favorites, Generic and branded
...
materials.
This component will show different children depending on the
hasMaterialTypes flag.
Adjust some small UI issues.
Contributes to CURA-5682.
2018-09-17 12:08:41 +02:00
Lipu Fei
3ac5a316d3
Check package upgradable using PM first, old plugins later
...
CURA-5718
For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed
Exclude bundled plugins in the old plugins list
2018-09-17 12:05:10 +02:00
Jaime van Kessel
2d7e41263d
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-09-17 11:39:29 +02:00
Jaime van Kessel
58c7524164
Also rename dagoma_neva_magis profiles to dagoma_magis
2018-09-17 11:38:51 +02:00
Jaime van Kessel
0c9ec8d455
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-09-17 11:35:46 +02:00
Orel
093c5487bf
- Rename Dagoma Magis profile.
...
- Remove machine_gcode_flavor definition as the default value fits the
needs.
2018-09-17 11:30:00 +02:00
Ghostkeeper
9e21af65b4
Merge branch '3.5'
2018-09-17 10:54:44 +02:00
Ghostkeeper
8a94042a1f
Fix icon name role
...
The icons were not displaying in the context menu of the settings.
2018-09-17 10:51:56 +02:00
Ghostkeeper
ade2b565bc
Add 3.5 change log
...
Contributes to issue CURA-5710.
2018-09-17 10:30:08 +02:00
Diego Prado Gesto
f871a89825
Clean up the code by removing duplicate code. Also try to unify the
...
MaterialsBrandSection to use the same component for favorites, generic
and branded materials.
Contributes to CURA-5682.
2018-09-17 09:09:14 +02:00
fieldOfView
9c865e80d1
Remove debug print
2018-09-14 19:15:23 +02:00
Mark Burton
8efc5fe345
Now zig_zaggify_infill is enabled for gyroid infill.
2018-09-14 18:05:55 +01:00
Ghostkeeper
a870060a34
Remove unused parameter
2018-09-14 17:00:55 +02:00
Ghostkeeper
2369a10ce1
Disallow setting support wall line count per mesh
...
Because as soon as support is generated it can merge with the polygons of other support areas that are not directly beneath this model. They cannot have a different number of walls any more then because it is the same polygon.
Contributes to issue CURA-5603.
2018-09-14 16:31:40 +02:00
Jaime van Kessel
4c460b6fa5
Prevent crash if sdk_version is "dev"
2018-09-14 16:15:56 +02:00
Jaime van Kessel
41860b1e89
Merge branch 'CURA-5689_dont_ignore_small_z_gaps_by_default' of github.com:Ultimaker/Cura
2018-09-14 15:44:37 +02:00
Jaime van Kessel
2590b03540
Merge branch 'master' of github.com:Ultimaker/Cura
2018-09-14 15:42:11 +02:00