Jaime van Kessel
9d62a281f7
Remove unused imports
2019-12-13 14:56:02 +01:00
Remco Burema
44e7cb7108
Replace deprecated code.
2019-12-13 13:52:24 +01:00
ninovanhooff
e2e9d2a307
Merge pull request #6787 from Ultimaker/CURA-7011_enterprise_visual_cues
...
CURA-7011_enterprise_visual_cues
2019-12-13 11:53:28 +01:00
ninovanhooff
a6946fa3d9
Merge branch 'master' into CURA-7011_enterprise_visual_cues
2019-12-13 11:44:34 +01:00
Kostas Karmas
2b6b7a1f81
Fix lost settings on sync to diff printer type
...
When syncing to a different printer type only the global user changes
where kept, while the per-extruder user changes were not copied at all,
since the extruder list is empty before the new machine becomes active.
This commit fixes this problem by keeping a copy of the per-extruder
user changes before the new machine (of different type) is activated.
The copied user changes are then transfered to the new global stack
after the new machine is set as active.
CURA-6127
2019-12-13 11:30:34 +01:00
Ghostkeeper
5ea60823f5
Don't crash if address is still none after getting info
...
This can happen (starting somewhere between zeroconf version 21.0 and 24.0).
Contributes to issue CURA-7032.
2019-12-13 10:54:27 +01:00
Ghostkeeper
e54ce8643b
Don't wrap str unnecessarily
...
Just an inefficiency that I found.
2019-12-13 10:44:48 +01:00
Benoit Miller
9b583be6ef
Upgrade metadata version numbers to match master
2019-12-12 17:05:35 -05:00
Benoit Miller
44ffa97ade
Fixed issues raised in #6666
2019-12-12 17:04:01 -05:00
Benoit Miller
9700b9986b
Merge branch 'voron2-support' of https://github.com/Fulg/Cura into voron2-support
2019-12-12 16:41:07 -05:00
Benoit Miller
9259cea2dc
Merge branch 'master' of https://github.com/Ultimaker/Cura into voron2-support
2019-12-12 16:40:35 -05:00
Remco Burema
ef4ee5d6b6
Merge pull request #5335 from Hrybmo/master-1
...
PostProcessingPlugin Script for 2-1 Dual Extruders - ColorMix 2-1
2019-12-12 17:14:59 +01:00
Remco Burema
002aaacf0e
Merge branch 'master' into master-1
2019-12-12 17:10:24 +01:00
Remco Burema
4d8c19ccc8
Always add Enterprise to name if Enterprise version.
...
part of CURA-7011
2019-12-12 14:37:18 +01:00
Remco Burema
7f1b1384e6
Merge pull request #6798 from Ultimaker/CURA-7012_manage_materials_third_party_printers
...
[CURA-7012] Fix duplicated materials don't show for 3rd-party printers
2019-12-12 14:11:51 +01:00
Remco Burema
8cc054cecc
Add missing 'material break preparation temperature'.
...
part of CURA-6971
(cherry picked from commit 25f0460231fd970b73744fb3fe1c004dc68a5dc9)
2019-12-12 14:09:46 +01:00
Remco Burema
382d177a3b
Merge branch 'master' into CURA-7012_manage_materials_third_party_printers
2019-12-12 14:06:39 +01:00
Lipu Fei
e1e65b43b3
Remove gitlab-ci.yml
2019-12-12 14:06:23 +01:00
MaukCC
002cf07834
Merge branch 'master' into master
2019-12-12 09:05:45 +01:00
jos@mauk.cc
c6cfd12c6f
HMS434 update
2019-12-12 09:04:41 +01:00
Ghostkeeper
c58edeb189
Merge branch 'mb-skin-edge-support' of https://github.com/smartavionics/Cura into smartavionics-mb-skin-edge-support
2019-12-12 09:03:17 +01:00
Lipu Fei
f2b18d9d2a
Merge branch 'master' into add-lotmaxx-printers
2019-12-12 08:23:31 +01:00
Lipu Fei
e4f97d2e08
Merge branch 'master' into voron2-support
2019-12-12 08:23:18 +01:00
Nino van Hooff
cef0ae349d
Fix selecting a new material for a base file on container deletion
...
CURA-7023
2019-12-11 17:17:57 +01:00
Jaime van Kessel
0f69c8d5f0
Merge branch 'CURA-7023_wrong_submaterial_container' of github.com:Ultimaker/Cura
2019-12-11 17:17:29 +01:00
Remco Burema
1415db7b76
Merge branch 'smartavionics-mb-skin-edge-support'
2019-12-11 17:02:36 +01:00
Remco Burema
2d486b0814
Default behaviour should be the same as previous.
...
Also added the new setting to 'expert' visibility.
2019-12-11 17:00:02 +01:00
Nino van Hooff
c8e86c8b18
Merge remote-tracking branch 'origin/CURA-7011_enterprise_visual_cues' into CURA-7011_enterprise_visual_cues
2019-12-11 16:26:42 +01:00
Nino van Hooff
fcaac91d5b
Add "Enterprise" About dialog
...
CURA-7011
2019-12-11 16:26:17 +01:00
Nino van Hooff
171609f9de
Refactor: Add "Enterprise" to the app display name.
...
CURA-7011
2019-12-11 16:25:57 +01:00
Nino van Hooff
2e4ee73d2f
Add "Enterprise" to the app display name.
...
Will also end up in the main window title and at the top of
the debug log. app_name remains unchanged.
CURA-7011
2019-12-11 16:21:35 +01:00
ninovanhooff
c910899ca7
Merge pull request #6606 from Ultimaker/pre_sliced_base_filename
...
dont prepend 'Pre-sliced file'
2019-12-11 15:31:28 +01:00
Nino van Hooff
6725e28c07
Connect materialsChanged signal for printers without variants
...
Fixes duplicated materials not showing up for third party printers
CURA-7012
2019-12-11 11:55:25 +01:00
Lipu Fei
af562b9c69
Merge branch 'master' into master
2019-12-11 10:58:30 +01:00
Lipu Fei
820925c9aa
Merge branch 'master' into default_union_off_for_surface_mode
2019-12-11 10:58:27 +01:00
Lipu Fei
849ac3551d
Merge branch 'master' into master-1
2019-12-11 10:57:50 +01:00
Lipu Fei
4cc5baacf4
Merge branch 'master' into mb-skin-edge-support
2019-12-11 10:57:47 +01:00
Lipu Fei
e22083bd12
Merge branch 'master' into fix_jobname_editing
2019-12-11 10:56:17 +01:00
Lipu Fei
0cb27774d6
Merge branch 'master' into pre_sliced_base_filename
2019-12-11 10:46:04 +01:00
Lipu Fei
07df020d12
Merge branch 'master' into CURA-7023_wrong_submaterial_container
2019-12-11 10:45:22 +01:00
Lipu Fei
ba83b00535
Merge branch 'master' into CURA-7011_enterprise_visual_cues
2019-12-11 10:45:11 +01:00
Lipu Fei
537424c058
Add GitHub Actions
2019-12-11 08:10:55 +01:00
Remco Burema
f0b277d491
Merge branch 'mb-skin-edge-support' of https://github.com/smartavionics/Cura into smartavionics-mb-skin-edge-support
2019-12-10 16:55:28 +01:00
Nino van Hooff
8aae5f7563
Fix: extra ConfigParsaer arg added to wrong call
...
CURA-6522
2019-12-10 16:33:47 +01:00
Nino van Hooff
cbfa45dd25
Update enterprise splash screen background
...
CURA-7011
2019-12-10 16:27:30 +01:00
Ghostkeeper
7f969528f3
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2019-12-10 16:03:02 +01:00
Ghostkeeper
ba2c9cb21e
Fix JSON formatting of start g-code
...
No newlines allowed.
2019-12-10 16:02:45 +01:00
Nino van Hooff
d09f3492db
Add enterprise splash screen.
...
Added it as a png, which might be a bit overkill but it could also
could be hard getting strokes / shadows exactly right otherwise. Also
Allows for more visual distinction of the background later
CURA-7011
2019-12-10 15:59:57 +01:00
Ghostkeeper
455721130c
Merge branch 'master' of https://github.com/TheOneOgre/Cura into TheOneOgre-master
2019-12-10 15:57:57 +01:00
Nino van Hooff
da6d4e6186
Log app display name, version, api version and build type when starting
...
Only build type was requested, but I figured: why not all the things?
Also fixes an arg typo
CURA-7011
2019-12-10 15:57:15 +01:00
