GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 10:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,689 Commits 295 Branches 268 Tags
Commit Graph

20689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
a43de19113
Reduce size of print head without fans for one-at-a-time mode 
This allows you to place models more compactly.

According to the discussion at #5590, this was tested to work well.

Fixes #5590.
 2019-09-09 17:36:14 +02:00
Ghostkeeper
eb401defdf
Add deprecated marker on extruders: Use extruderList 
Extruders is dangerous because it's a dict of which the values are randomly ordered. The keys are often cast to int so you can't use anything else than integer numbers. And then they are often cast back so if you're not properly counting from 0 you're also in trouble. So please, only use the list. Eventually we can switch the data structure around.
 2019-09-09 14:21:57 +02:00
Jaime van Kessel
8c893caf9f
Merge pull request #6315 from Ultimaker/CURA-6755_add_retract_continue_script 
Add retract-continue script
 2019-09-09 13:05:33 +02:00
Jaime van Kessel
6f8c6b4af7
Merge branch 'master' of github.com:Ultimaker/Cura 2019-09-09 09:10:08 +02:00
Jaime van Kessel
5463f7600b
Add processEvent calls so progress bar moves while loading 
CURA-6572
 2019-09-09 09:08:52 +02:00
Ghostkeeper
354729b621
Only show support flow if support is enabled 2019-09-07 23:19:59 +02:00
Ghostkeeper
5e302c6a67
Fix display of Z Hop After Extruder Switch Height on single extruder 
If the setting is enabled on a single extruder printer, it'll show the Z Hop Height setting anyway even though it has no effect.
 2019-09-07 23:18:02 +02:00
Jaime van Kessel
7d3a2c60d4
Added some missing typing 2019-09-06 17:38:22 +02:00
Jaime van Kessel
5e41443bef
Merge branch 'master' of github.com:Ultimaker/Cura 2019-09-06 17:26:42 +02:00
Jaime van Kessel
6f92537305
Add unhappy test for serializing nonbase material 2019-09-06 17:26:28 +02:00
Jaime van Kessel
09025edffa
Convert some class functions to static 
Since they didn't access any class attributes, there is no need for them to be classMethods
 2019-09-06 17:22:40 +02:00
Jaime van Kessel
94b6f7864f
Add some tests for XMLMaterialProfile 2019-09-06 17:19:23 +02:00
Ghostkeeper
47fab6e16f
Merge branch '4.3' 2019-09-06 16:04:26 +02:00
Ian Paschal
f517beba76
Fix typo 
CS-171
 2019-09-06 16:04:03 +02:00
Ian Paschal
e0194d8721
Extend found_machine_type_identifiers to include R2 
CS-171
 2019-09-06 16:03:48 +02:00
Ian Paschal
dfc23d994f
Add bom_numbers field to definitions 
CS-171
 2019-09-06 16:03:26 +02:00
Ghostkeeper
b24ea11cfc
Merge branch '4.3' 2019-09-06 16:02:21 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00:00
Jaime van Kessel
608ca3e92a
Convert some functions to static 2019-09-06 15:18:50 +02:00
Jaime van Kessel
a6c27787b9
Merge branch 'master' of github.com:Ultimaker/Cura 2019-09-06 15:13:57 +02:00
Jaime van Kessel
f540abbd73
Expand the createUniqueName test 2019-09-06 15:13:25 +02:00
Ghostkeeper
c3f9d65de1
Ignore SettingsGuide plug-in 2019-09-06 14:35:30 +02:00
Ghostkeeper
f5aa2921ff
Add space before comments 
Some pause commands on some printers (looking at you, Repetier) seem to require a space after it, which is not obvious to the user. So we'll put a space there for them.

Fixes #6295.
 2019-09-06 14:35:29 +02:00
Diego Prado Gesto
4e086054a5 Merge branch '4.3' 2019-09-06 12:57:47 +02:00
Ghostkeeper
b20e5bfd98
Don't display any message if setting is empty 
Contributes to issue CURA-6759.
 2019-09-06 12:42:15 +02:00
Ghostkeeper
c1b4bcebec
Add message while pausing 
This way you can display instructions during the print.

Implements issue CURA-6759.
 2019-09-06 12:41:09 +02:00
Chris ter Beke
7ff7ab53bf
Merge pull request #6313 from Ultimaker/CS-171_add_r2_support 
CS-171 Add R2 support
 2019-09-06 11:53:55 +02:00
Ghostkeeper
138d76e7d9
Rename speed to ratio 
Contributes to issue CURA-6755.
 2019-09-06 11:46:59 +02:00
Ghostkeeper
2abda86162
Add retract-continue script 
Contributes to issue CURA-6755.
 2019-09-06 11:38:53 +02:00
Ian Paschal
f49cf8dfd5 Fix typo 
CS-171
 2019-09-06 11:30:42 +02:00
Ian Paschal
7674905f1c Extend found_machine_type_identifiers to include R2 
CS-171
 2019-09-06 11:23:28 +02:00
Ian Paschal
b7cc48131c Add bom_numbers field to definitions 
CS-171
 2019-09-06 11:23:02 +02:00
Jaime van Kessel
db604cdd16
Ensure that PerObjectContainer stack doesn't trigger a save 2019-09-06 11:16:12 +02:00
Simon Edwards
f53031f6b9
Merge pull request #6311 from Ultimaker/CS-284_fix_crash_missing_printer_configuration 
Check if printerConfiguration is actually set before trying to access it
 2019-09-06 10:30:25 +02:00
Jaime van Kessel
0235ad6930
Check gltf extension against lower() filename 
CURA-6739
 2019-09-06 09:51:26 +02:00
ChrisTerBeke
5f480f753c Add fixme note to hardcoded extruder count 2019-09-06 09:50:15 +02:00
ChrisTerBeke
549b724a4f Use 2 extruders at all times for now 2019-09-06 09:37:43 +02:00
ChrisTerBeke
ab3f627177 Check if printerConfiguration is actually set before trying to access it 2019-09-05 18:01:04 +02:00
Jaime van Kessel
9d5ee286b4
Merge branch 'CURA-6537_ui_feedback_on_invalid_firmware' of github.com:Ultimaker/Cura 2019-09-05 16:10:30 +02:00
Chris ter Beke
e02f0f1480
Merge pull request #6302 from Ultimaker/fix-job-sending 
Print job uploading
 2019-09-05 14:43:56 +02:00
Ghostkeeper
1e04a88859
Merge branch '4.3' of ssh://github.com/Ultimaker/Cura into 4.3 2019-09-05 14:41:08 +02:00
Ghostkeeper
bff9f2fb82
Merge branch 'patch-5' of https://github.com/samirabaza/Cura into samirabaza-patch-5 2019-09-05 14:38:47 +02:00
Lipu Fei
46a15762aa Add doc for the need of filename in processGCodeStream() 2019-09-05 14:19:48 +02:00
Lipu Fei
5644721073 Fix UFPReader due to gcode reader readFromStream() change 2019-09-05 14:17:49 +02:00
ChrisTerBeke
da4fcc8ee6 Revert "Revert "Remove network manager re-creation that was causing issues"" 
This reverts commit a04bcbb3e9d7a193a30684cc07a55ad8141f9a0b.
 2019-09-05 14:08:18 +02:00
ChrisTerBeke
a04bcbb3e9 Revert "Remove network manager re-creation that was causing issues" 
This reverts commit 06d54f397096771ce3655c62a46f9413a6430369.
 2019-09-05 11:05:26 +02:00
ChrisTerBeke
210843a7bb Improve adding/connecting to output devices 2019-09-05 10:47:15 +02:00
Lipu Fei
c7c859f02c Revert "Update S3 definition" 
CURA-6742

This reverts commit bb11c695e24b3df92e388ecaf28dba9fb9e90c88.
 2019-09-05 09:14:52 +02:00
Lipu Fei
1e1ae95c60 Only use DYLD_FALLBACK_LIBRARY_PATH once for trimesh.load 
CURA-6739
 2019-09-04 19:22:02 +02:00
Lipu Fei
b309680fb7 Fix CTM loading on Linux 
CURA-6739

Note that this doesn't work with Python 3.5.7, but with 3.6 and 3.7. To
make Python 3.5.7 work, a fix needs to be backported from 3.6 for
ctypes.util.find_library() for Linux.
 2019-09-04 19:20:59 +02:00