GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 05:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,509 Commits 290 Branches 260 Tags
Commit Graph

21509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ghostkeeper
71b94f6d5b
Create own quality changes profiles instead of asking quality manager 
It was a protected function call on a different class anyway, so that should never have gotten accepted.

Contributes to issue CURA-6600.
 2019-09-05 17:26:48 +02:00
Ghostkeeper
9a6f76c069
Add typing for get---ManagementModel 
Just to have my IDE find usages properly, really.

Contributes to issue CURA-6600.
 2019-09-05 16:32:34 +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
Mark Burton
dffaf2f6c3 Exclude code that uses gl_PrimitiveID from shader when GLSL version < 150. 2019-09-05 10:53:15 +01: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
13011e375b Fix quality layer label alignment 
CURA-6598
 2019-09-05 09:01:00 +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
ChrisTerBeke
06d54f3970 Remove network manager re-creation that was causing issues 2019-09-04 19:19:49 +02:00
ChrisTerBeke
4364d94423 Reduce logging and network activity during print job upload 2019-09-04 18:54:53 +02:00
Lipu Fei
bb11c695e2 Update S3 definition 
CURA-6742
 2019-09-04 17:40:04 +02:00
Jaime van Kessel
423b4ad869
Fix binding loop 
CURA-6598
 2019-09-04 17:16:07 +02:00
Jaime van Kessel
994e0e53cc
Switch the anchors to paddings 
Otherwise the bottomb button would extend from the popup.

CURA-6598
 2019-09-04 16:54:35 +02:00
Jaime van Kessel
7f3b55a286
Remove unknown reference 
CURA-6598
 2019-09-04 16:48:06 +02:00
Jaime van Kessel
53aaaab891
Add a topMargin for the qualities menu 
CURA-6598
 2019-09-04 16:43:59 +02:00
Lipu Fei
f2ef363c01 Fix GLTF workaround for OSX 
CURA-6739
 2019-09-04 16:39:06 +02:00
Jaime van Kessel
2dbfbecd12
Ensure that show/hide behavior of the qualities intent menu is correct 
It would previously blink if you pressed the button, as a click outside would hide it
due to close policy, but a mouse release would show it again (as it's hidden and that's what the
on clicked of the button did)

CURA-6598
 2019-09-04 16:37:10 +02:00
Lipu Fei
7e97bc4e17 Add workaround for GLTF loading on OSX 
CURA-6739
 2019-09-04 16:23:57 +02:00
Diego Prado Gesto
79aefa950f
Merge pull request #6298 from bkp23/master 
Fixed PauseAtHeight.py to resume at starting height
 2019-09-04 15:54:15 +02:00
Lipu Fei
b67944cac1 Fix workaround for GLTF loading 
CURA-6739
 2019-09-04 15:25:58 +02:00
Remco Burema
16ea437255 Make 3MF-reader aware of setting-version for introduction Intent. 2019-09-04 14:52:54 +02:00
Lipu Fei
cadbde7b92 Add workaround for GLTF loading 
CURA-6739
 2019-09-04 14:33:24 +02:00
Diego Prado Gesto
f051c48b9e Add a printer to the list of translation IDs 
Contributes to CURA-6742.
 2019-09-04 14:11:57 +02:00
Diego Prado Gesto
1324ff67f6
Merge pull request #6300 from Ultimaker/merge_from_pr_data 
Move profiles from pr-data to main Cura repository
 2019-09-04 10:48:38 +02:00
Diego Prado Gesto
ebd3b4b9bf Change the URL to check for new firmware 
Contributes to CURA-6742.
 2019-09-04 10:26:48 +02:00
Marijn Dee
fa2c60810c
Merge pull request #6296 from Ultimaker/CS-278_ignore_material_empty 
Cs 278 ignore material empty
 2019-09-04 09:42:59 +02:00
Ghostkeeper
52cb68fdb3
Commit actual files instead of my symlinks 
I've been having this profile added via a symlink so that it would update itself. I didn't know that symlinks were possible in Git.

Contributes to issue CURA-6742.
 2019-09-04 09:23:27 +02:00
Ghostkeeper
de7915688a
Move profiles from pr-data to main Cura repository 
Don't look too deeply into this, please.

Contributes to issue CURA-6742.
 2019-09-04 09:16:22 +02:00
B. Perry
6ed57838a9 Fixed PauseAtHeight.py to resume at starting height 2019-09-03 14:02:52 -06:00
ChrisTerBeke
abb1d5d5eb
Merge branch 'master' into CS-278_ignore_material_empty 
* master:
  Do not trigger slicing if there's no slicable object
  Fix regex in FlavorParser
 2019-09-03 21:30:34 +02:00