3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
22149 commits 312 branches 275 tags 718 MiB
Commit graph

22149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
1dc39dba71
Move prime speed override to definition file 
To reduce the number of overrides. You'd only need to change it in one place, next time. It was being overridden in the quality profile in every supported configuration.
 2019-12-16 13:15:40 +01:00
Ghostkeeper
d85dcf0d8f
Also set a limit to retraction prime speed for original Jellybox 2019-12-16 13:15:40 +01:00
Ghostkeeper
a9849be1b2
Code style: Space around binary operators 2019-12-16 13:15:40 +01:00
Ghostkeeper
eb54a62eca
Add minima for retraction prime speed 
Otherwise the automated inheritance function makes it negative sometimes.

Contributes to issue #6806.
 2019-12-16 13:15:39 +01:00
Lipu Fei
8b9e5c5154
Merge pull request #6594 from fieldOfView/fix_jobname_editing 
Make jobname less sensitive to being touched
 2019-12-16 11:20:36 +01:00
Lipu Fei
dd9395792f
Merge branch 'master' into fix_jobname_editing 2019-12-16 10:40:03 +01:00
ninovanhooff
51de4173e7
Merge pull request #6802 from Ultimaker/CURA-6127_settings_lost_when_sync_to_diff_printer_type 
Cura 6127 settings lost when sync to diff printer type
 2019-12-16 09:57:13 +01:00
ninovanhooff
f77832315a
Merge branch 'master' into CURA-6127_settings_lost_when_sync_to_diff_printer_type 2019-12-16 09:48:32 +01:00
Kostas Karmas
409dc98299 Keep global settings on sync to diff printer type 
In addition to the per-extruder user changes, copy the global user
changes to the new_machine.

CURA-6127
 2019-12-13 15:00:22 +01:00
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
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
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
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
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
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
Kostas Karmas
da1a5d1be6 Log error on failed machine creation 
An error message will be generated when machine creation fails
while switching printer types in the printer configuration menu.

CURA-6127
 2019-12-10 14:44:31 +01:00
Nino van Hooff
38935a1d02 Fix selecting a new material for a base file on container deletion 
CURA-7023
 2019-12-10 13:53:26 +01:00
Jaime van Kessel
b3430a1fad
Merge pull request #6765 from Ultimaker/CURA-6522_revert_edge_distance_hack 
Cura 6522 revert edge distance hack
 2019-12-10 13:35:44 +01:00