Jaime van Kessel
cce7af9cb2
Merge branch 'add-lotmaxx-printers' of https://github.com/sm3dp/Cura
2019-12-23 15:48:51 +01:00
Dimitriovski
bd8c1e4c96
Initial implementation for the Compatibility Dialog window
...
CURA-7038
2019-12-23 15:18:09 +01:00
konskarm
4dbc56f09b
Merge pull request #6831 from springtiger/master
...
Hopefully Adding the Anet 3d Printer files to the latest version
2019-12-23 14:17:43 +01:00
Ghostkeeper
f02d4f5e43
Fix spelling
...
Help, I'm forced to do this by the Apostrophe Protection Society!
2019-12-23 14:01:06 +01:00
Jaime van Kessel
2108d408e4
Merge branch 'master' of github.com:Ultimaker/Cura
2019-12-23 11:14:17 +01:00
Jaime van Kessel
f983990ac1
Fix some codestyle issues
2019-12-23 11:13:59 +01:00
Jaime van Kessel
5061a36aba
Fix mesh_type being reset when adding a setting
2019-12-23 11:11:09 +01:00
Ghostkeeper
8218d62e20
Add change log entry for 4.4.1
...
Contributes to issue CURA-7047.
2019-12-23 10:52:51 +01:00
Ghostkeeper
0028cc85ed
Remove comment documenting commit history
...
Use the commit history to document the commit history.
This solves a log warning about unknown data type for skin_edge_support_thickness.
2019-12-23 09:08:47 +01:00
tiger.he
133e300f5e
fix miss delimiter error
2019-12-21 23:07:53 +08:00
tiger.he
dda67cde1a
add machine_extruder_trains in machine definitions
2019-12-21 23:04:02 +08:00
tiger.he
17d9aa7450
remove extruders definitions
2019-12-21 22:53:36 +08:00
tiger.he
d67dae2140
delete unused definitions
2019-12-21 22:35:28 +08:00
sm3dp
658604404c
Change head polygon profile name
2019-12-21 15:18:22 +08:00
Jaime van Kessel
4ce086d5c3
Cut op beginRendering of solidView
2019-12-20 16:44:12 +01:00
Jaime van Kessel
24a5cbfacb
Make test a bit more readable
2019-12-20 15:21:59 +01:00
Dimitriovski
9cf5a388f3
Change for CURA-6979. Check for packages installed in Cloud MP but not in Cura MP.
...
CURA-7038
2019-12-20 13:59:45 +01:00
Jaime van Kessel
ed9d79feed
Add some extra drawings regarding the profiles
2019-12-20 13:50:05 +01:00
Dimitriovski
dc20db393e
Initial work for Compatiility Dialog done
...
CURA-7038
2019-12-20 13:10:22 +01:00
Ghostkeeper
15ba762847
Fix spelling of error message in the log
...
Found during investigation of #6828 .
2019-12-20 09:54:07 +01:00
tiger.he
45a659ab49
Hopefully Adding the Anet 3d Printer files to the latest version
2019-12-20 14:30:18 +08:00
jos@mauk.cc
47f4a329ff
Merge branch 'master' of https://github.com/maukcc/Cura
2019-12-19 15:51:56 +01:00
jos@mauk.cc
f5f86e8e4b
HMS434 update
...
Material exclusion update
2019-12-19 15:49:15 +01:00
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
Remco Burema
894e678d84
Merge pull request #6820 from Ultimaker/CURA-7041_add_misp_material_settings
...
CURA-7041_add_misp_material_settings
2019-12-19 11:51:54 +01:00
Remco Burema
f05f4ff244
Fix typo.
...
part of CURA-7041
2019-12-19 11:38:53 +01:00
ninovanhooff
e8823d3529
Merge pull request #6821 from Ultimaker/CURA-7070_fix_quality_search
...
CURA-7070 fix quality search
2019-12-19 11:34:54 +01:00
Jaime van Kessel
0295113b31
Add user (identified by MAC) & ensure that no personal info is in server_name
2019-12-19 11:23:39 +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
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
