Commit graph

24910 commits

Author SHA1 Message Date
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
8dc6e7a386 Add encvironment variable to Sentry crash logging
CURA-7050
2019-12-19 09:45:35 +01:00
Lipu Fei
cf82ccf2b9 Merge remote-tracking branch 'origin/4.4' into CURA-7070_fix_quality_search 2019-12-18 16:53:10 +01:00
Lipu Fei
b90bed2c7d Sync cicd.yml with master 2019-12-18 16:52:20 +01:00
Lipu Fei
5476d430d1 Fix cicd.yaml 2019-12-18 16:51:32 +01:00
Lipu Fei
d74b2db8b8 Only run CI for master, WIP, and release branches on push 2019-12-18 16:50:33 +01:00
Kostas Karmas
cf6540f91d Fix qualities lookup for custom materials
Search the qualities of the custom material based on the base_file
and not based on the id.

CURA-7070
2019-12-18 16:44:19 +01:00
Lipu Fei
6c9b8f992f Fix quality search with material base_file
CURA-7070
2019-12-18 15:39:17 +01:00
Lipu Fei
4b313c2dac Fix formatting
CURA-7070
2019-12-18 15:38:23 +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
Dimitriovski
799e7fc48c
changed to use the new function name from UM
CURA-6979
2019-12-17 16:26:59 +01:00
Dimitriovski
1595c3aef9
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6979 2019-12-17 16:17:43 +01:00
Ghostkeeper
9870097ab5
Code style: Spaces around binary operators
Contributes to issue CURA-6979.
2019-12-17 16:11:47 +01:00
sm3dp
0256e39601 update definitions format 2019-12-17 23:10:32 +08:00
Ghostkeeper
1155b4bab2
Code style: Double quotes around strings
Contributes to issue CURA-6979.
2019-12-17 16:10:09 +01: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
Lipu Fei
6cf9b40f77
Merge pull request #6678 from eMotion-Tech/master
Add_hips_&_08_nozzle
2019-12-17 15:25:28 +01:00
Koub
2fcc5d8fd2
Merge branch 'master' into master 2019-12-17 14:57:22 +01:00
Lipu Fei
46020d5541 WIP: Fix fetching Uranium 2019-12-17 12:38:44 +01:00
Lipu Fei
7f053c8d2a WIP: Fix git ref 2019-12-17 12:35:41 +01:00
Lipu Fei
2048bc60f7 WIP: Update GH Actions 2019-12-17 12:30:20 +01:00
Lipu Fei
de9a07e6c1 WIP: Fix GH Actions for Uranium fetching 2019-12-17 12:28:27 +01:00
Lipu Fei
d12edaff10 WIP: Fix fetching Uranium 2019-12-17 11:57:36 +01:00
Lipu Fei
dc7ec41b12 WIP: Fix fetching Uranium 2019-12-17 11:55:06 +01:00
Lipu Fei
208ab6421f WIP: Fix fetching Uranium 2019-12-17 11:52:32 +01:00
Lipu Fei
d30c63a3fb WIP: Add GH Actions 2019-12-17 11:38:52 +01:00
Lipu Fei
88196fa62b Correct GH Actions steps name 2019-12-17 11:36:42 +01:00
Lipu Fei
f9739e2af8 Fix typing 2019-12-17 11:33:39 +01:00
ninovanhooff
bd7b8f4a93
Merge pull request #6814 from Ultimaker/CURA-7048_PPA-Crash_when_using_UM2_printers
Fix PPA crashing on single-extruder printers
2019-12-17 11:33:17 +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
Kostas Karmas
50b8ff2352
Fix check that finds the extruder in a position
CURA-7048
2019-12-17 10:55:28 +01:00
Kostas Karmas
a1d7eefc42
Fix PPA crashing on single-extruder printers
The machine manager was leading to a crash when trying to enable
the second extruder in single-extrusion printers, because the check
for the second extruder was not correctly implemented. This commit
fixes that issue by checking if the global stack has the specified
extruder. If it does not, then the function returns while logging the
issue.

CURA-7048
2019-12-17 10:55:28 +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
Lipu Fei
3ddc2466f8 Fix typing 2019-12-17 10:27:05 +01:00
Dimitriovski
d958e74467 Use the new name of the function from Uranium's PackageManager
CURA-6979
2019-12-16 15:57:49 +01:00
Dimitriovski
46d3a73e7e Some more refactoring
CURA-6979
2019-12-16 15:52:00 +01:00
Dimitriovski
3c2da64c94 Some refactoring done after code review
CURA-6979
2019-12-16 15:39:21 +01:00
ninovanhooff
ed838baafa
Merge pull request #6577 from Ultimaker/litho_alpha
make lithophane alpha channel control total final width multiplier.
2019-12-16 14:21:15 +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
Tim Kuipers
a7e4d76d05 make lithophane alpha channel control total final width multiplier.
That way the picture is not always square. We can use the alpha channel to encode the actual shape
2019-12-16 13:31:11 +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
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
Jaime van Kessel
4de28bed28
Merge branch 'master' of github.com:Ultimaker/Cura into sentry_crash_integration 2019-12-16 11:28:04 +01:00