3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-27 21:01:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
20266 commits 344 branches 300 tags 757 MiB
Commit graph

8979 commits

Author SHA1 Message Date
Mark Burton
cfea12ab25 Fix dimensions of print job information popup when using Qt 5.13. 
Remains compatible with Qt 5.10.
 2019-07-24 20:35:39 +01:00
Jaime van Kessel
36159116fa Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-24 10:30:26 +02:00
Jaime van Kessel
0bf683d7b9 Set maximum value of the build_volume_temperature of the s5 to 50 
CURA-6680
 2019-07-23 17:48:43 +02:00
Jaime van Kessel
450302071f Simplified the dark & light theme for colorblindness 2019-07-23 14:19:21 +02:00
Jaime van Kessel
dd2ddbc71b Merge branch 'master' of https://github.com/nubnubbud/Cura 2019-07-23 14:12:16 +02:00
Jaime van Kessel
34e823e189 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-23 11:31:30 +02:00
Jaime van Kessel
14a1882e14 Add missing 4.1-4.2 upgrade to bundled package list 2019-07-23 11:30:40 +02:00
Jaime van Kessel
67a0dc2ed8 Also rename the PETG profiles 2019-07-22 16:45:26 +02:00
Jaime van Kessel
222caef0b8 Rename imade3d profiles so it doesn't cause issues when upgrading 2019-07-22 16:15:15 +02:00
Jaime van Kessel
822181f214 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-22 16:15:01 +02:00
Ghostkeeper
eca8f3ab57
Correction to ironing tooltip 
Fixes #6031.
 2019-07-22 11:47:56 +02:00
Ghostkeeper
5a51a036d7
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-07-22 11:42:08 +02:00
Ghostkeeper
edda75b682
Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master 2019-07-22 11:35:24 +02:00
Jaime van Kessel
a5984da60c Moved jellybox definitions to the right position 2019-07-22 11:21:24 +02:00
Jaime van Kessel
678621469f Fix weird update jitter in objectSelector after multiplying models 2019-07-22 10:31:21 +02:00
Jaime van Kessel
91651a34d4 Fix model binding for objectSelector 2019-07-22 10:24:04 +02:00
KOUBeMT
31bbb8b65f Flow_&_Temp_tuning 2019-07-19 17:25:48 +02:00
Ghostkeeper
7aec564848
Attempt at fixing saving of load location on Linux 
Hope this also works on the Qt version used by our build system...
 2019-07-19 12:38:07 +02:00
Ghostkeeper
4b8274d7cb
Add ID to stage selection buttons 
Necessary to switch stages in the Squish tests.

Contributes to issue CURA-6276.
 2019-07-19 12:38:07 +02:00
Brecht Nuyttens
949d62feef Added Vertex Nano K8600 profile (#5998) 
* Added Vertex Nano Profile
 2019-07-19 10:42:01 +02:00
Jaime van Kessel
2e3a390757 Merge branch 'update_imade3d_jellybox_support' of https://github.com/IMADE3D/Cura 2019-07-19 09:33:15 +02:00
Jaime van Kessel
49074e51ae Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-17 12:53:03 +02:00
Jaime van Kessel
ea5c34868e Merge branch 'revert_correct_depriming_settings' of github.com:Ultimaker/Cura into 4.2 2019-07-17 12:51:56 +02:00
Filip Goc
44420d5244 Lower the priming line from 0.6 to 0.3mm 2019-07-17 02:27:21 +02:00
Filip Goc
13df255477 Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support 
# Conflicts (resolved):
#	resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg
#	resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg
#	resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg
 2019-07-17 02:19:45 +02:00
Filip Goc
3c8e0f8ff1 Update setting_version to 8 (7 → 8) 
(cherry picked from commit f08fc10672)
 2019-07-17 01:49:08 +02:00
Filip Goc
1f18551688 Update JellyBOX start gcodes 
(cherry picked from commit f7da0fd301)
 2019-07-17 01:48:58 +02:00
Filip Goc
5b7dd6af2b Update the JellyBOX variants 
(cherry picked from commit ffaa09e906)
 2019-07-17 01:48:40 +02:00
Filip Goc
1b5fb36a4b Update JellyBOX quality profiles 2019-07-17 01:48:04 +02:00
Filip Goc
1023e043fb Add JellyBOX 2 platform 
(cherry picked from commit 73177f7497)
 2019-07-17 01:42:58 +02:00
Filip Goc
2633ae14b8 Add JellyBOX 2 Extruder 
(cherry picked from commit 920b7662cc)
 2019-07-17 01:42:45 +02:00
Filip Goc
6c80ebe86a Update the JellyBOX definitions 
(cherry picked from commit 9ad6c16c58)
 2019-07-17 01:42:35 +02:00
Filip Goc
f08fc10672 Update setting_version to 8 (7 → 8) 2019-07-17 00:58:44 +02:00
Lipu Fei
154d6a2182 Merge remote-tracking branch 'origin/4.2' 2019-07-16 15:03:32 +02:00
Diego Prado Gesto
b6fba1b196 Change the warnings sign 
Because those settings should be negative.

Contributes to CURA-6662.
 2019-07-16 15:01:54 +02:00
Ghostkeeper
8c11b67fa8
Update translation templates per language for Cura 4.2 
These files will get sent out to the translators.

Contributes to issue CURA-6663.
 2019-07-16 14:50:50 +02:00
Ghostkeeper
de1c588ec6
Update translation templates for Cura 4.2 
These are the new strings that were added.

Contributes to issue CURA-6663.
 2019-07-16 14:50:50 +02:00
Diego Prado Gesto
0eec9138c1 Merge branch 'DragonJe-master' 2019-07-16 12:09:22 +02:00
Diego Prado Gesto
3460ce5b8b Remove deprecated setting from the quality profiles 
The setting should not exist anymore in the new setting_version 8.

Contributes to CURA-6642.
 2019-07-16 12:07:37 +02:00
Ghostkeeper
569765adfc
Merge branch '4.2' 2019-07-16 11:51:39 +02:00
Diego Prado Gesto
0e9379e658 Merge branch 'master' of https://github.com/DragonJe/Cura into DragonJe-master 2019-07-16 11:47:00 +02:00
DragonJe
4216c2bfc4
Rename resources/quality/nwa3d_a31_normal.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg 2019-07-15 15:02:19 -05:00
DragonJe
12bdcacefc
Rename resources/quality/nwa3d_a31_fast.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg 2019-07-15 15:00:58 -05:00
DragonJe
b53794ca74
Rename resources/quality/nwa3d_a31_e.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg 2019-07-15 15:00:35 -05:00
DragonJe
85c7386990
Rename resources/quality/nwa3d_a31_nwa3d_a31_best.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg 2019-07-15 15:00:01 -05:00
DragonJe
c690f52878
Rename nwa3d_a31_best.inst.cfg to nwa3d_a31_nwa3d_a31_best.inst.cfg 2019-07-15 14:59:43 -05:00
Ghostkeeper
bf34550488
Merge branch 'eMotion-Tech-master' 2019-07-15 15:01:02 +02:00
Ghostkeeper
505742e63f
Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master 2019-07-15 14:49:36 +02:00
Jaime van Kessel
9fd7ceeae1 Fix trailing , 2019-07-15 14:01:26 +02:00
Ghostkeeper
20c55c09cd
Add description for smart hiding to Corner Seam Pref description 2019-07-15 11:34:04 +02:00