Commit graph

8887 commits

Author SHA1 Message Date
Jaime van Kessel
7d446722a9 Remove the max-z-speed-override
CURA-6625
2019-07-03 16:13:21 +02:00
Jaime van Kessel
d43415191b Merge branch 'CURA-6635_add_printer_by_manufacturer' of github.com:Ultimaker/Cura 2019-07-03 14:29:26 +02:00
Ghostkeeper
cfa059fb81
Remove removed prime tower settings
The prime tower is now always circular. This fixes a unit test.
2019-07-03 12:48:29 +02:00
Ghostkeeper
12e2e47e72
Make corrections to manufacturer fields
When it's categorised by manufacturer these mistakes become more apparent.

Contributes to issue CURA-6635.
2019-07-03 11:27:19 +02:00
Ghostkeeper
0678d47dad
Make 'Ultimaker B.V.' preferred manufacturer rather than 'Ultimaker'
Ultimaker was the category. Ultimaker B.V. is the manufacturer, which is now used as the section property.

Contributes to issue CURA-6635.
2019-07-03 11:12:41 +02:00
Ghostkeeper
e6f25884f8
Categorise printers by manufacturer
This should make it easier to find the printer you want.

Contributes to issue CURA-6635.
2019-07-03 10:56:19 +02:00
Ghostkeeper
365d725e42
Add escape as hotkey to exit full screen
Should be easier to discover.

Fixes #5956.
2019-07-03 10:32:00 +02:00
Lipu Fei
e8c08b77e5
Merge pull request #5961 from Ultimaker/trouch-fix/creawsomemod
Import CreawsomeMod profiles and implement version upgrade
2019-07-03 09:42:05 +02:00
Ghostkeeper
d449ec9266
Really don't make creality_base a visible printer
It's not a printer. It's a base profile. Every printer in the list of printers should coincide with a physical printer, with the one exception of Custom FFF Printer.
If we find settings that work for all printers we should apply it to fdmprinter so that we do apply it to every printer.

Contributes to issue CURA-6554.
2019-07-03 09:31:10 +02:00
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
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
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
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
Francois Brassart
f924ddcc1c removed old files 2019-07-02 01:15:40 -07: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
20357dabb3 Merge branch 'feat_line_spacings' of https://github.com/BagelOrb/Cura 2019-07-01 17:19:26 +02:00
Jaime van Kessel
6544c123a4 Add camera view selector to the view application menu 2019-07-01 11:15:26 +02:00
Francois Brassart
997176eb14 update profiles, qualities, variants... of TiZYX printers 2019-06-28 08:21:59 -07: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
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
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
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
Remco Burema
9845178d26 Remove superfluous bracket (causing 'EOF'). [CURA-6460] 2019-06-20 09:44:19 +02:00
Ghostkeeper
15997685df
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2019-06-20 09:18:16 +02:00
Ghostkeeper
adc6f79c9c
Merge branch 'master' into CURA-6329_add_crystallinity_setting 2019-06-18 15:50:48 +02:00
pkuiper-ultimaker
6a65045587
Merge pull request #5862 from Ultimaker/CURA-6460_remove_square_tower
Remove square prime tower. [CURA-6460]
2019-06-18 11:49:43 +02:00
Ghostkeeper
487673e780
Always uncheck zoom to mouse if preference is disabled 2019-06-18 11:19:41 +02:00
Ghostkeeper
7f559987a0
Disable move to mouse position preference in orthogonal view 2019-06-18 11:16:21 +02:00