Commit graph

13597 commits

Author SHA1 Message Date
Ghostkeeper
0ae1e958f9
Merge branch 'master' of https://github.com/VOLUMIC/Cura into VOLUMIC-master 2021-06-08 16:00:46 +02:00
Konstantinos Karmas
b971ba20e8
Merge pull request #9937 from Ultimaker/CC0.4_print_profile
CC0.4 print profiles
2021-06-08 09:16:08 +02:00
mixware011
e6091fa32a
Update setting version to 17 for 4.10 2021-06-08 13:57:08 +08:00
mixware011
54b28942ff
Update setting version to 17 for 4.10 2021-06-08 13:57:02 +08:00
mixware011
fb83ecf135
Update setting version to 17 for 4.10 2021-06-08 13:56:56 +08:00
Ghostkeeper
836e7c0c9b
Fix overlap of unit and setting value with RTL-languages
The unit was hard-coded to be anchored to the right. The text was getting the full width and aligned implicitly by the language. We'll keep the layout of the text properly internationalised, but make sure that the unit is opposite of wherever the text is.

Fixes CURA-8206.
Fixes #9667.
2021-06-07 18:00:59 +02:00
Konstantinos Karmas
c5db545d04 Rename Fast Print quality files
The "f" wasn't capitalized
2021-06-07 17:47:15 +02:00
Jaime van Kessel
66f57d4d58
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-07 14:17:27 +02:00
Jaime van Kessel
89c2c94cc5
Merge branch 'PETG-for-UM3' of github.com:Ultimaker/Cura 2021-06-07 14:04:19 +02:00
VOLUMIC
ddd2e844cb
fix machine width (265) 2021-06-07 13:36:11 +02:00
VOLUMIC
7c8c978d05
Texts and names fixes (FR->EN) 2021-06-07 12:36:53 +02:00
VOLUMIC
230a0cd607
machine height correction to 310mm 2021-06-07 12:33:02 +02:00
mixware011
47afddea1a
Update mixware_hyper_s.def.json
Delete some "default_value"
2021-06-07 09:11:56 +08:00
Konstantinos Karmas
8db873b155 Update setting_version to 17 2021-06-04 13:25:40 +02:00
Sarita-Ultimaker
48036c7b62 CC0.4 print profiles
Added and changes files to create the CC0.4 print profiles into Cura for S3 and S5
2021-06-04 13:15:22 +02:00
Ghostkeeper
bb20e3307f
Revert "Fix merge conflict"
This reverts commit 7f1e61b7b8.

These icons were renamed, but the original icons are now restored so those changes need to be reverted.

Contributes to issue CURA-8267.
2021-06-03 17:27:35 +02:00
Ghostkeeper
cc6191a141
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2021-06-02 15:24:23 +02:00
Jaime van Kessel
6fc1088cdb
Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura 2021-06-01 16:33:10 +02:00
Jaime van Kessel
942e3106cf
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 16:07:38 +02:00
Jaime van Kessel
02a4ade2a5
Fix incorrect icons
CURA-8267
2021-06-01 16:07:05 +02:00
Ghostkeeper
867b3ba31e
Merge branch 'master' of https://github.com/NilsRo/Cura into NilsRo-master 2021-06-01 15:58:09 +02:00
Jaime van Kessel
fc87c6a90c
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 11:41:16 +02:00
Jaime van Kessel
4f49a38168
Fix pre-heat button being ocluded by tooltip
Fixes #9891
2021-06-01 11:40:20 +02:00
StijnArntz
3e1cc89145 Changed version 16 to 17
Changed version number 16 to 17
2021-05-31 09:54:03 +02:00
StijnArntz
e68beabcbe Extra line at end of file
Added extra line at end of file
2021-05-31 09:34:47 +02:00
StijnArntz
605e1d1b2f PETG for UM3
Removed Generic and UM PETG from exclude material list.
Add quality files for PETG on UM3.
2021-05-31 09:20:00 +02:00
mixware011
abd15cd6ad
Update mixware_hyper_s.def.json 2021-05-29 16:30:31 +08:00
mixware011
f780904e76
Update mixware_hyper_s_draft.inst.cfg 2021-05-29 16:29:50 +08:00
mixware011
c8f0494232
Update mixware_hyper_s_normal.inst.cfg 2021-05-29 16:29:34 +08:00
mixware011
32d6da1d30
Update mixware_hyper_s_extra_fast.inst.cfg 2021-05-29 16:29:15 +08:00
mixware011
fe2fe9d6a3
Update mixware_hyper_s.def.json 2021-05-29 16:23:18 +08:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054, reversing
changes made to 95652556fe.
2021-05-27 16:06:20 +02:00
Jaime van Kessel
119a957e7f
Revert "Add list for deprecated icons"
This reverts commit 34f75839c4.
2021-05-27 16:03:03 +02:00
Jaime van Kessel
760726cf0b
Revert "Add Function icon"
This reverts commit 5ad9cd4845.
2021-05-27 16:02:53 +02:00
Jaime van Kessel
26afff6093
Revert "Switch out inherit icon"
This reverts commit 672d6c89cf.
2021-05-27 16:02:46 +02:00
Jaime van Kessel
6483db3d47
Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"
This reverts commit 90eb2bfbdc, reversing
changes made to 91c4d8b5f2.
2021-05-27 16:01:17 +02:00
ChronosTech
535026d0d3 edit start gcode 2021-05-25 10:40:56 +02:00
Gabriele Rossetti
ec7b3ea8f9 Most recent updates
- Travel avoid supports
- Dual Extrusion : switch_extruder_retraction_amount = 10
- PETg updates
- Reduced infill jerk in "quick" intent and removed useless first layer jerk
- Removed no more used 1.2x material_flow_layer_0 in order to compensate a bad bed leveling
- Rewiewed forced PLA and PETg temperatures
2021-05-20 22:20:46 +02:00
Gabriele Rossetti
89c90c8e0d setting_version to 17 2021-05-20 20:15:19 +02:00
Gabriele Rossetti
69beba448c
Merge pull request #5 from Ultimaker/master
Update from master CURA Repo
2021-05-20 17:00:57 +02:00
grigorasalex
7b0ce9fb65 Changed retraction 2021-05-20 15:06:26 +03:00
grigorasalex
3f7cbdb54b Support usb connection and modified cooling fan and retraction settings 2021-05-20 15:00:31 +03:00
fieldOfView
63a2085379 Fix positioning of setting visibility preset menu popup 2021-05-20 12:24:51 +02:00
fieldOfView
6e803c41f4 Add Cura-styled Menu, MenuItem and MenuSeparator controls 2021-05-20 12:20:19 +02:00
Jaime van Kessel
87fe4555ce
Merge branch 'inat_defs_fixes' of https://github.com/MarkINAT/Cura 2021-05-19 15:32:40 +02:00
oducceu
db7ea4149e Fix Power-loss Recovery and update G-codes for Flying Bear Base
Remove start G-code from Flying Bear Ghost 5 because it was causing positioning problems during Power-loss Recovery

Update machine_start_gcode and machine_end_gcode for Flying Bear Base

Update machine_height for Flying Bear Ghost 4S / 5 to a safe value
2021-05-18 16:57:34 +03:00
NilsRo
c89e186671 Mega X: Fixed Layer Mesh, Optimized qualities 2021-05-17 20:23:51 +02:00
Jaime van Kessel
90eb2bfbdc
Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura 2021-05-17 13:49:21 +02:00
Ghostkeeper
28a7facd1b
Merge branch 'CURA-8212_Add_version_upgrader_for_two_trees_definitions' 2021-05-17 09:55:56 +02:00
Kostas Karmas
9d284d9c6f Use new icon for "Block support overlap" models in the object menu
CURA-8205
2021-05-14 10:42:37 +02:00