20907 Commits

Author SHA1 Message Date
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
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
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
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
ChrisTerBeke
ed616789cb
Remove debug print statement 2019-09-03 21:22:13 +02:00
ChrisTerBeke
86d87acd5b
Filter out configurations for empty materials 2019-09-03 21:21:06 +02:00
Lipu Fei
0524796145 Do not trigger slicing if there's no slicable object
CURA-6604
2019-09-03 20:01:41 +02:00
Lipu Fei
09dc209956 Fix regex in FlavorParser 2019-09-03 20:01:41 +02:00
Ghostkeeper
e2ed6f03e2
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-09-03 16:42:45 +02:00
Lipu Fei
d154c98476
Merge pull request #6288 from Ultimaker/feature_bottom_face
Align Face To Build-Plate
2019-09-03 16:14:48 +02:00
Ghostkeeper
a9adceec87
Merge branch 'mb-fix-backend-plugin-crash' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-backend-plugin-crash 2019-09-03 16:14:26 +02:00
Remco Burema
d9b10e7180 Merge branch 'feature_bottom_face' of https://github.com/Ultimaker/Cura into feature_bottom_face 2019-09-03 16:04:38 +02:00
Lipu Fei
a07e88125f Fix typing
CURA-6713
2019-09-03 15:58:42 +02:00
Remco Burema
70332978fd Less cryptic max face-id.
part of CURA-6745
2019-09-03 15:48:31 +02:00
Lipu Fei
efbcdcc8ac Add None check in bottomFaceSelection()
CURA-6745
2019-09-03 15:47:29 +02:00
Lipu Fei
44db4216bc Rename to getEndFaceSelectionId()
CURA-6745
2019-09-03 15:44:43 +02:00
Ghostkeeper
2f917c2841
Change definition ID upon reading profile
Implements CURA-6713.
2019-09-03 15:38:41 +02:00
Remco Burema
503a24f7a1 Make magic value into funtion (max face-id).
part of CURA-6745
2019-09-03 15:08:41 +02:00
Remco Burema
5b48e13337 Remove 'align face to bottom' from context-menu.
part of CURA-6745
2019-09-03 14:25:10 +02:00
Ghostkeeper
c41af1b9a0
Remove user-visible XML tags
These XML tags are outside of the i18n call and are therefore not removed by gettext. They should not be present there.
2019-09-03 14:00:09 +02:00
Ghostkeeper
51ed0072db
Apply proposed Creality changes
These are the changes currently confirmed by multiple people in this comment: https://github.com/Ultimaker/Cura/issues/6106#issuecomment-524241165

Contributes to issue #6106.
2019-09-03 09:48:01 +02:00
SAMSECTOR
cb65cb868e
Update printrbot_simple.def.json
manufacturer name changed from "PrintrBot" to "Printrbot" to allow the profile under the "Add a printer" menu
not appearing in version 4.2.1
2019-09-02 22:20:20 +03:00
SAMSECTOR
957add798b
Update printrbot_simple_extended.def.json
manufacturer name changed from "PrintrBot" to "Printrbot" to allow the profile under the "Add a printer" menu
not appearing in version 4.2.1
2019-09-02 22:14:24 +03:00
Lipu Fei
b358d8ddd0 Fix typo in ComboBox.qml 2019-09-02 13:20:09 +02:00