3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
16653 commits 307 branches 272 tags 787 MiB
Commit graph

16653 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
a6a364c337 Move material diameter and machine nozzle size to the extruder 
definition.

Contributes to CURA-5902.
 2018-11-27 13:12:47 +01:00
Diego Prado Gesto
0794a2c8c9 Remove not needed printer and extruder definitions. 
Contributes to CURA-5902.
 2018-11-27 13:03:36 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin 
Tests for um3networkplugin
 2018-11-27 12:59:44 +01:00
Diego Prado Gesto
f91dbd356d Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-27 09:51:00 +01:00
Diego Prado Gesto
48853d0d06 Merge branch 'pinchies-add-a-u20' 2018-11-27 09:50:43 +01:00
Diego Prado Gesto
39e1cfd6bc Fix indentation. 
Contributes to CURA-5902.
 2018-11-27 09:50:01 +01:00
Lipu Fei
bd42136712 Fix GcodeStartEndFormatter to use fallback values 
CURA-5901

Use values from the global stack (if exist) as fallback values.
 2018-11-27 09:49:38 +01:00
Diego Prado Gesto
493b37b0fe Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20 2018-11-27 09:44:11 +01:00
Lipu Fei
2e81b97623 Use global_stack.extruders to find extruders 
CURA-5978
 2018-11-27 08:45:45 +01:00
pinchies
47ed9e3f5d
deleting the old wrong file.... 2018-11-27 15:09:36 +11:00
pinchies
519e2a3399
uploaded wrong file... oops 2018-11-27 15:06:54 +11:00
Diego Prado Gesto
fcc6af68af Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value. 
Contributes to CURA-5980.
 2018-11-26 17:55:25 +01:00
ChrisTerBeke
efd5f3799b Also catch TypeError now that we have explicit arguments 2018-11-26 16:31:32 +01:00
ChrisTerBeke
6506596ece Fix typing syntax 2018-11-26 16:19:01 +01:00
Mark
7019afe21f
Merge pull request #4717 from forkineye/fix-wanhao_profiles 
Fix Wanhao profiles to use speed_travel macro
 2018-11-26 16:03:25 +01:00
ChrisTerBeke
e4d8fb36ab Add more typing as per request from @sedwards2009 2018-11-26 15:53:04 +01:00
Mark
39f123f8e0
Merge pull request #4670 from pinchies/add-cc-mm-2 
Add Cocoon Create ModelMaker
 2018-11-26 15:49:21 +01:00
Mark
88cedd25cf
Merge pull request #4664 from pinchies/master 
Add JGAurora Z-603S
 2018-11-26 15:47:28 +01:00
Mark
037bf8863e
Merge pull request #4666 from pinchies/add-jg-a5 
Add JGAurora A5
 2018-11-26 15:43:41 +01:00
Mark
734a8882b1
Merge pull request #4667 from pinchies/add-jg-a1 
Add JGAurora A1
 2018-11-26 15:41:30 +01:00
Mark
30c585f298
Merge pull request #4834 from mcmidget/master 
Add BIBO2 printer (dual and single extruder settings)
 2018-11-26 15:39:39 +01:00
ChrisTerBeke
da5683c876 add typing to models 2018-11-26 15:30:30 +01:00
Marijn Deé
a382b77eaa Added validation to the models 2018-11-26 14:30:17 +01:00
ChrisTerBeke
68a90ec510 Use simple models instead of namedtuples 
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
 2018-11-26 14:08:21 +01:00
Marijn Deé
59510487fa Merge branch 'tests-for-um3networkplugin' of github.com:Ultimaker/Cura into tests-for-um3networkplugin 2018-11-26 09:50:40 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist 
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
 2018-11-26 09:40:14 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location 
This crashes Cura on start-up for some people.
 2018-11-26 09:32:59 +01:00
Ghostkeeper
8f9d6bee62
Document dependency on fdm_materials 
Without it, Cura simply won't start if you had a printer loaded with material profiles.

Fixes #4460.
 2018-11-26 08:30:24 +01:00
ChrisTerBeke
e3894c291c Merge branch 'tests-for-um3networkplugin' of https://github.com/Ultimaker/Cura into tests-for-um3networkplugin 2018-11-23 11:27:41 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added 
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
 2018-11-23 10:50:16 +01:00
alekseisasin
45076d9ca6
Merge pull request #4859 from Ultimaker/CURA-5878_gcode_file_association 
CURA-5878 Update desktop and mimeinfo to add gcode mime type
 2018-11-23 10:37:10 +01:00
Marijn Deé
76542a82d5 Removed the asserts on internals 2018-11-23 10:33:57 +01:00
Marijn Deé
294527f7fe Review changes 2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de Used duoble quotes iso single quotes 2018-11-23 09:20:19 +01:00
Jaime van Kessel
7ecad41625
Merge pull request #4843 from Ultimaker/fix-oauth2-client 
Switch Ultimaker Account OAuth2 client
 2018-11-22 16:38:10 +01:00
Lipu Fei
06cb628699 Update desktop and mimeinfo to add gcode mime type 
CURA-5878
 2018-11-22 15:47:12 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles 
CL-1148 Re-styling monitor queue tiles
 2018-11-22 15:08:42 +01:00
Ian Paschal
963b8aa974 Fix QML warnings 
Contributes to CL-1148
 2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations 
Contributes to CL-1148
 2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop 
Contributes to CL-1148
 2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else" 
Contributes to CL-1148
 2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state 
Contributes to CL-1148
 2018-11-22 13:11:59 +01:00
alekseisasin
b091e3a52c
Merge pull request #4854 from Ultimaker/fix_version_upgrade_returning_none 
Fix version upgrade returning none
 2018-11-22 11:44:36 +01:00
Aleksei S
088b2f6f28 Added an extra import module, did not pass coding style test 
CURA-5936
 2018-11-22 11:36:32 +01:00
Aleksei S
c765615f1a Merge branch 'master' into fix_version_upgrade_returning_none 2018-11-22 11:17:44 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link 
Contributes to CL-1148
 2018-11-22 11:09:35 +01:00
Jaime van Kessel
d4e4e50741 Fix typo 2018-11-22 10:55:53 +01:00
Marijn Deé
352427e460 Moved exception handling closer to the cause of error 2018-11-22 10:01:15 +01:00
Marijn Deé
7e3f86f091 Moved some of the mocks to class level because they are used in every test method 2018-11-22 09:37:47 +01:00
Marijn Deé
7b0f8882a2 Reverted models to namedtuples from collections because 
NamedTuple is a Python3.6 feature
 2018-11-21 11:01:26 +01:00