Commit graph

20683 commits

Author SHA1 Message Date
Simon Edwards
4ab84c0568
Merge pull request #6335 from Ultimaker/CS-158_fix_monitor_progress_bar
CS-158 Fix monitor tab print status (4.3 cherry pick)
2019-09-11 15:05:13 +02:00
Ian Paschal
72ba6153c2 Boyscout some stuff
CS-158
2019-09-11 14:50:54 +02:00
Ian Paschal
3b5cf115f1 Reduce progress bar length
CS-158
2019-09-11 14:50:42 +02:00
Ian Paschal
07a5213ea6 Reduce text size to 12pt from 14pt
CS-158
2019-09-11 14:50:15 +02:00
Ian Paschal
d370a69073 Add some theme values
CS-158
2019-09-11 14:49:36 +02:00
Ghostkeeper
8126cdc051
Update translation headers for Cura 4.3
Contributes to issue CURA-6768.
2019-09-10 17:33:30 +02:00
Ghostkeeper
6643bf5083
Update translation files per language for Cura 4.3
The translators can now fill these in with their translations.

Contributes to issue CURA-6768.
2019-09-10 17:33:29 +02:00
Ghostkeeper
b877717fde
Update translation template files for Cura 4.3
These are the new strings in Cura 4.3.

Contributes to issue CURA-6768.
2019-09-10 17:33:29 +02:00
Diego Prado Gesto
c6f5f4fb33
Merge pull request #6308 from smartavionics/mb-fix-legacy-glsl-issue
Remove gl_PrimitiveID from shader when it's not available.
2019-09-10 17:33:02 +02:00
Lipu Fei
cfeefe365d
Merge pull request #6328 from Ultimaker/fix_select_face
CURA-6754 / CURA-6761 Fix Select Face
2019-09-10 14:05:41 +02:00
Remco Burema
e5a690e605 Wrap up 'lay flat by face' feature for 4.3-BETA.
Icon thanks to Yi-An Lai.
part of CURA-6754
2019-09-10 12:37:59 +02:00
Lipu Fei
87285f6b86 Fix version upgrade 42 to 43 2019-09-10 12:22:16 +02:00
Remco Burema
c7bae1e8fc Move 'lay flat by face' operation to Uranium. 2019-09-09 23:25:16 +02:00
Ghostkeeper
8c817e041e
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:37:01 +02:00
Diego Prado Gesto
ddcd8e40cc
Merge pull request #6292 from samirabaza/patch-7
Update printrbot_simple.def.json
2019-09-09 16:26:51 +02:00
Lipu Fei
ea8b7ebd02 Fix remove all nodes for loaded gcode
Fixes the problem caused in UM commit 69057b48a1fc3df7c5c6f3e754a3beb285a94678
2019-09-09 11:49:25 +02:00
ChrisTerBeke
669fb39f40 Catch type errors when trying to populate models from API response 2019-09-09 10:44:17 +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
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00: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
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
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 a04bcbb3e9.
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 06d54f3970.
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 bb11c695e2.
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
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
Lipu Fei
f2ef363c01 Fix GLTF workaround for OSX
CURA-6739
2019-09-04 16:39:06 +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