Commit graph

23379 commits

Author SHA1 Message Date
Ghostkeeper
d9b3f1fee9
Merge branch 'trouch-fix/creawsomemod' of github.com:trouch/Cura into trouch-fix/creawsomemod 2019-07-03 09:22:59 +02:00
Lipu Fei
63171508c9 Fix profiles 2019-07-03 09:18:39 +02:00
Lipu Fei
7f824b06bb Fix typing 2019-07-03 09:09:23 +02:00
trouch
8081e32ebf Change creality_base name to "Creawsome Custom" 2019-07-02 20:08:31 +02:00
trouch
0f79376547 fix ender purge line going out of bed 2019-07-02 19:39:20 +02:00
trouch
8911aa5cbb Update creality_base def with last Creawsome one 2019-07-02 19:26:59 +02:00
Jaime van Kessel
4428c32df3 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-02 17:59:50 +02:00
Jaime van Kessel
2cd6b73d12 Ensure that the material selection gets reset when diameter is changed
CURA-6590
2019-07-02 17:59:27 +02:00
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
Ghostkeeper
bb6e9da526
Fix upgrading custom quality profiles for Creality printers
Quite a lot of logic necessary... Oh well.

Contributes to issue CURA-6554.
2019-07-02 16:39:56 +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
Ghostkeeper
d5da6e34be
Add version upgrade for Creality printers and CreawsomeMod
This should work for both.

Contributes to issue CURA-6554.
2019-07-02 16:00:06 +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
Remco Burema
af467d4e16 Merge branch 'feature_intent_per_quality' of https://github.com/Ultimaker/Cura into feature_intent_per_quality 2019-07-02 14:44:56 +02:00
Remco Burema
270cf28ea1 Fix comments code review IntentManager.
part of CURA-6091
2019-07-02 14:43:56 +02:00
Lipu Fei
b463b0c35b Fix CuraVerison.py configuration 2019-07-02 14:19:56 +02:00
Jaime van Kessel
be1fd2e003 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent_per_quality 2019-07-02 13:52:46 +02:00
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Lipu Fei
43baca1545 Hardcode Cura SDK version with each release 2019-07-02 13:33:18 +02:00
Remco Burema
50cbf71f68 Fixed test 'selectIntent' for IntentManager-tests.
part of CURA-6091
2019-07-02 13:15:18 +02:00
Ghostkeeper
5a87a5a980
Make base Creality profile invisible (but the rest visible)
This makes it more logical to the user who just has a certain printer model.

Contributes to issue CURA-6554.
2019-07-02 12:00:24 +02:00
Ghostkeeper
5330293c90
Increment setting_version to 8
Otherwise these profiles won't get loaded.
The change necessary to perform this version upgrade is to rename support_minimal_diameter to support_tower_maximum_supported_diameter, but none of these profiles override that setting so no other changes are required.

Contributes to issue CURA-6554.
2019-07-02 11:54:35 +02:00
Ghostkeeper
234a85202a
Rename creawsome to creality
These are now meant to be the one-and-only Creality profiles, replacing the old profiles originally in Cura.

Contributes to issue CURA-6554.
2019-07-02 11:48:23 +02:00
Ghostkeeper
d9013a918e
Remove IDs from .def.json files
They are not used. It uses the filename instead.

Contributes to issue CURA-6554.
2019-07-02 11:23:28 +02:00
Ghostkeeper
8f83b5aea2
Merge branch 'fix/creawsomemod' of https://github.com/trouch/Cura into trouch-fix/creawsomemod 2019-07-02 11:20:51 +02:00
Ghostkeeper
a4093aa6fd
Merge branch 'type_fix_build_volume' 2019-07-02 10:37:22 +02:00
Remco Burema
fee6ec417f Merge branch 'master' into feature_intent_per_quality 2019-07-02 10:21:20 +02:00
Francois Brassart
f924ddcc1c removed old files 2019-07-02 01:15:40 -07:00
Remco Burema
ffe9515236 Refactor: Split up single test method in smaller ones.
part of CURA-6091
2019-07-02 08:57:40 +02: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
nubnubbud
59ee319293 changed red axis to be a bit more distiguishable 2019-06-29 01:22:54 -07:00
trouch
a9540c1ff0 define Z Seam X/Y as Z Seam Position children 2019-06-28 21:41:19 +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