20041 Commits

Author SHA1 Message Date
Ghostkeeper
a57304b603
Fix typo: Retracation -> Retraction
Contributes to issue CURA-6631.
2019-07-02 17:46:06 +02:00
Ghostkeeper
02b925388a
Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX
Conflicts:
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg -> Deleted in branch, but modified for setting version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/variants/tizyx_evy_dual_direct_drive.inst.cfg -> Modified in branch for new settings, in master for settings version
2019-07-02 17:35:07 +02:00
Jaime van Kessel
758a8a0078 Merge branch 'CURA-6583_fix_ortho_side' of github.com:Ultimaker/Cura 2019-07-02 16:50:00 +02:00
Remco Burema
5ea2b0e073 Make stripes closer togheter in striped shader.
part of CURA-6583
2019-07-02 16:49:27 +02:00
Remco Burema
a61e7ea7df Fix striped (off-buildplate) shader for ortho-view.
part of CURA-6583
2019-07-02 16:20:12 +02:00
Jaime van Kessel
e182459dba Fix the updating of material diameter.
This was a weeeird bug. It worked if you changed the value and selected another field.
Pressing enter however (aka; The behavior that 80%+ of the users have) would change it
but it would switch back in half a second. It seems to have been caused by mutliple onEditingFinished
signals being emitted in sequence.
As I can't be bothered to go through the bowels of QML and figure out why exactly this is doing what it's doing,
I just tied the enter to losing the focus, which ensures that the right behavior happens (Field is no longer selected,
and the onEditingFinished is emitted)

Contributes to CURA-6590
2019-07-02 15:16:41 +02:00
Lipu Fei
b463b0c35b Fix CuraVerison.py configuration 2019-07-02 14:19:56 +02:00
Lipu Fei
43baca1545 Hardcode Cura SDK version with each release 2019-07-02 13:33:18 +02:00
Ghostkeeper
a4093aa6fd
Merge branch 'type_fix_build_volume' 2019-07-02 10:37:22 +02:00
Francois Brassart
f924ddcc1c removed old files 2019-07-02 01:15:40 -07:00
Remco Burema
f5b0cae554 Prime-brim calculation needs adhesion extruder, not just any. 2019-07-02 07:46:21 +02:00
Francois Brassart
bc2de879e3 change draft2 and draft3 to coarse and extra coarse. removed layer height in non-global quality profiles 2019-07-01 09:00:39 -07:00
Jaime van Kessel
bc05587220 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-01 17:29:51 +02:00
Jaime van Kessel
20357dabb3 Merge branch 'feat_line_spacings' of https://github.com/BagelOrb/Cura 2019-07-01 17:19:26 +02:00
Ghostkeeper
ea93490c45
Fix crash when loading multi-extrusion print
Because getProperty needs a property to get.
2019-07-01 14:56:03 +02:00
Jaime van Kessel
a7d419f497 Fix deprecation decorator breaking the getExtruder function 2019-07-01 11:18:54 +02:00
Jaime van Kessel
d48b173118 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-01 11:15:53 +02:00
Jaime van Kessel
6544c123a4 Add camera view selector to the view application menu 2019-07-01 11:15:26 +02:00
Ghostkeeper
17e86a28b7
Guard against broken import 2019-07-01 10:58:08 +02:00
Ghostkeeper
f86cf06b88
Add typing 2019-07-01 10:57:08 +02:00
Jaime van Kessel
db3d6aae83 Add boundingbox test for buildvolume 2019-07-01 09:55:04 +02:00
Francois Brassart
997176eb14 update profiles, qualities, variants... of TiZYX printers 2019-06-28 08:21:59 -07:00
Jaime van Kessel
6136f5a2f2 Further simplify the build volume code 2019-06-28 15:22:58 +02:00
Jaime van Kessel
691d106719 Remove old unused code 2019-06-28 15:09:08 +02:00
Jaime van Kessel
f329d7aed9 Made typing hint a bit more specific 2019-06-28 15:08:46 +02:00
Jaime van Kessel
2133fc78e0 Remove unused code 2019-06-28 15:01:09 +02:00
Jaime van Kessel
47cc87ec47 Add tests for calculating the bed adhesion size 2019-06-28 14:17:18 +02:00
Jaime van Kessel
b240ede21c Add test for computing the static disallowed areas 2019-06-28 13:45:05 +02:00
Jaime van Kessel
efc6ef2905 Add missing typing 2019-06-28 13:44:47 +02:00
Lipu Fei
67f10d8bc3
Merge pull request #5885 from Ultimaker/CURA-6329_add_crystallinity_setting
Add deprime settings
2019-06-27 16:09:36 +02:00
Ghostkeeper
fe0fcc6eec
Change human-readable names of renamed settings too
Forgot about those.

Contributes to issue CURA-6329.
2019-06-26 16:43:11 +02:00
Ghostkeeper
faf256b2f0
Rename deprime settings with the new name
These have been renamed for greater clarity. We also have to rename them on this side now.

Contributes to issue CURA-6329.
2019-06-26 16:41:51 +02:00
pkuiper-ultimaker
67191c4040
Merge pull request #5863 from Ultimaker/CURA-6414_no_blob_for_one_at_a_time
Don't prime-blob when print-sequence is one-at-a-time. [CURA-6414]
2019-06-25 17:44:51 +02:00
Ian Paschal
48a69afbcf
Merge pull request #5912 from Ultimaker/cloud-print-job-actions
CS-134: Print job actions via cloud
2019-06-25 15:52:10 +02:00
Lipu Fei
934248e218
Merge pull request #5578 from curso007/master
Adding Geeetech A30 & FLSUN QQ-S machine definitons
2019-06-24 13:27:03 +02:00
Lipu Fei
92d029d18f
Update flsun_qq_s.def.json 2019-06-24 13:22:18 +02:00
Lipu Fei
7bd297bef5
Fix setting_version 2019-06-24 13:21:04 +02:00
Jaime van Kessel
d9358d56cc Update issue templates
Added a bit more clarification to the issue template.
2019-06-24 13:20:05 +02:00
Lipu Fei
544e7a1614
Rename Geeetech_A30.def.json to geeetech_a30.def.json 2019-06-24 13:20:04 +02:00
Lipu Fei
6a7da56057
geeetech_a30.def.json
Fix geeetech_a30.def.json
2019-06-24 13:19:24 +02:00
ChrisTerBeke
1d09cb5b9c
Fix typing for optional data argument
Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2019-06-24 13:18:27 +02:00
Jaime van Kessel
9e4f2a441b Revert "Also upgrade profiles if only the setting version is incorrect"
This reverts commit 77d396b9bdbfe52f70548b26adcc18038ff6115d.

The upgrade only needs to be run if it still uses "profile" as type (eg 2.1 profiles). So for a
regular setting version upgrade, this does not need to be run (and breaks importing profiles).

Fixes CURA-6592
2019-06-24 11:59:13 +02:00
Jaime van Kessel
0a0b4821ef Added logging for cases where the upgrade of the profile failed
CURA-6592
2019-06-24 11:32:43 +02:00
Ghostkeeper
6273d34eae
Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master 2019-06-21 11:33:07 +02:00
Робокинетика
f5d94b9646
Fixed the value of "retraction_amount" 2019-06-21 11:53:06 +03:00
Diego Prado Gesto
efa42ccbd1 Merge branch 'master' into CURA-6329_add_crystallinity_setting 2019-06-20 14:06:18 +02:00
ChrisTerBeke
1ab109ade0 Fix 'resume' action 2019-06-20 13:46:20 +02:00
ChrisTerBeke
baf9dc041c Fix typing of Any 2019-06-20 12:56:45 +02:00
ChrisTerBeke
0513322f86 Fix expected controller options in test 2019-06-20 12:36:56 +02:00
ChrisTerBeke
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +02:00