3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 20:57:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28475 commits 306 branches 270 tags 779 MiB
Commit graph

12854 commits

Author SHA1 Message Date
ninovanhooff
4773c4eaf3
Merge pull request #6803 from Ultimaker/sentry_crash_integration 
Sentry crash integration
 2019-12-19 14:29:07 +01:00
Nino van Hooff
2f628bbfd3 Merge branch 'voron2_duplicated' 2019-12-19 14:06:43 +01:00
Ghostkeeper
5ef7fe56be
Remove unnecessary override of expansion angle to 45 degrees 
Found in #6823.
 2019-12-19 09:58:42 +01:00
Nino van Hooff
ff01b1dab9 Add 6 Material Station specific material settings. 
These settings are currently unused by cura, but passed into the PPA
output. Some considerations:
- material_ prepended to all. Even though they are not all
  material specific. The consistency is more developer-friendly imho
- defaults taken from generic_pla
- type is float for all, consistent with what I found in this file

CURA-7041
 2019-12-18 11:46:40 +01:00
sm3dp
0256e39601 update definitions format 2019-12-17 23:10:32 +08:00
sm3dp
da4eeaa622 Added LotMaxx sc10 and sc20 profile 2019-12-17 22:27:09 +08:00
Lipu Fei
1eada1dc9b Update setting_version to 11 for Strateo3d 
CURA-7064
 2019-12-17 15:26:17 +01:00
Koub
2fcc5d8fd2
Merge branch 'master' into master 2019-12-17 14:57:22 +01:00
Lipu Fei
c1aa556a59 chmod 644 *.inst.cfg 2019-12-17 11:21:19 +01:00
KOUBeMT
97d21a8013 Adding_ASA-X_profiles 2019-12-17 11:07:15 +01:00
Lipu Fei
8b256f3efc
Merge pull request #6694 from maukcc/master 
HMS434 update
 2019-12-17 11:00:46 +01:00
KOUBeMT
1e851647be ABS_04&06_support_tuning 2019-12-17 10:57:57 +01:00
Ghostkeeper
bec513aa8a
Alternatively allow backspace to delete selection 
I thought we already had this?

Fixes #6475.
 2019-12-17 10:35:59 +01:00
Lipu Fei
dd5c6c892c chmod 644 for def.json files 2019-12-17 10:35:23 +01:00
Mark Burton
678ba61bca Add brim gap setting (#6279) 
Added brim_gap setting to space brim away from edge of model.
 2019-12-16 13:55:08 +01:00
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
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
Jaime van Kessel
4de28bed28
Merge branch 'master' of github.com:Ultimaker/Cura into sentry_crash_integration 2019-12-16 11:28:04 +01:00
Lipu Fei
20971cecc9
Merge branch 'master' into master 2019-12-16 10:47:29 +01:00
Lipu Fei
dd9395792f
Merge branch 'master' into fix_jobname_editing 2019-12-16 10:40:03 +01:00
ninovanhooff
a6946fa3d9
Merge branch 'master' into CURA-7011_enterprise_visual_cues 2019-12-13 11:44:34 +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
9259cea2dc Merge branch 'master' of https://github.com/Ultimaker/Cura into voron2-support 2019-12-12 16:40:35 -05:00
Remco Burema
8cc054cecc Add missing 'material break preparation temperature'. 
part of CURA-6971

(cherry picked from commit 25f0460231)
 2019-12-12 14:09:46 +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
Lipu Fei
f2b18d9d2a
Merge branch 'master' into add-lotmaxx-printers 2019-12-12 08:23:31 +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
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
3bdc90b89c
Merge branch 'master' into mesh_processing_order 2019-12-11 10:57:14 +01:00
Lipu Fei
e22083bd12
Merge branch 'master' into fix_jobname_editing 2019-12-11 10:56:17 +01:00
Lipu Fei
ba83b00535
Merge branch 'master' into CURA-7011_enterprise_visual_cues 2019-12-11 10:45:11 +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
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
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
Remco Burema
5681c631a2
Merge pull request #6781 from Ultimaker/CURA-6941_fix_intent_UI_dark_theme 
Cura 6941 fix intent ui dark theme
 2019-12-10 13:30:17 +01:00
Kostas Karmas
6ae0e08b7d Change RadioCheckbar active button color 
The RadioCheckbar active button is now using the slider_groove_fill
value instead of the small_button_active value to avoid issues in
case the small_button_active and small_button_text are used together.
 2019-12-10 13:19:10 +01:00
Jaime van Kessel
f66b1e6fde
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack 2019-12-10 13:06:37 +01:00
Jaime van Kessel
7ba1db830a
Re-enable the retraction min travel setting 
CURA-6675
 2019-12-10 13:00:29 +01:00
Kostas Karmas
c0ac03f2ae Change Custom profiles title similar to Default 
CURA-6941
 2019-12-09 14:35:19 +01:00
Kostas Karmas
5b9bd46ba3 Change active intent line to white 
The activated part of the intent lines will now be white
instead of grey.

CURA-6941
 2019-12-09 14:31:43 +01:00