3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
20302 commits 312 branches 275 tags 718 MiB
Commit graph

8999 commits

Author SHA1 Message Date
Mark Burton
d10d3070b9 Qt 5.13 compatibility - fix size of ExpandablePopup background. 
Without this, the view selector dropdown has no background.

Tested with Qt 5.13 on Linux and Qt 5.10 on Windows.
 2019-07-28 08:03:36 +01:00
Ghostkeeper
ce01f960b5
Remove references to start_layers_at_same_position 2019-07-26 17:26:40 +02:00
Ghostkeeper
aeabddb54a
Remove start_layers_at_same_position setting 
This setting is no longer configurable since we now slice multi-threadedly.
 2019-07-26 17:25:21 +02:00
Jaime van Kessel
e0c2611a0a Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-26 12:47:13 +02:00
Ghostkeeper
9185022295
Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master 2019-07-26 11:16:18 +02:00
Ellecross
b30dbdd9ed Updated change_log for 4.2 (contributed by Matt) [CURA-6677] 
Updated with the release notes from Matt
 2019-07-26 11:08:41 +02:00
KOUBeMT
485845acdd Add_preferred_material_to_definition 2019-07-26 10:42:03 +02:00
KOUBeMT
25de7fc037 Add_preferred_material 2019-07-26 10:38:14 +02:00
Ghostkeeper
67167ca250
Increment version number to Cura 4.2 
Contributes to issue CURA-6663.
 2019-07-25 16:39:35 +02:00
Zhang Heh Ji
8c04d85bde
Add translated strings for Cura 4.2 
These are the translations made by Zhang. Thank you Zhang!
 2019-07-25 16:36:44 +02:00
Lipu Fei
2054f507a4
Merge pull request #6046 from Ultimaker/add_42_43_version_upgrader 
Add 42 - 43 version upgrader
 2019-07-25 15:46:06 +02:00
Ghostkeeper
d353776fe8
Fix showing extruder names in USB printing monitor 
It was using a deprecated function. Apparently deprectated pyqtSlots don't work because it breaks the PyQt binding for some reason. That has to be fixed. But for now I'll make this use the non-deprecated function.
 2019-07-25 15:17:13 +02:00
Lipu Fei
9f18ceda51 Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader 2019-07-25 14:56:27 +02:00
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
Ghostkeeper
18d1148c78
Don't reset selected material upon container changed 
The onActiveMaterialChanged signal is triggered upon loading a material for the first time. This is hard to fix without breaking stuff, so we will revert this part.

This re-introduces a bug where if you change a material diameter such that the material disappears from the list, it is still selected and you can change its properties in the details panel.

Contributes to issue CURA-6679.
 2019-07-24 17:01:37 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager 
It doesn't make the code much simpler because the cache is also not a local variable.

Contributes to issue CURA-6679.
 2019-07-24 16:04:40 +02: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
9cdf18525c Merge branch 'master' of github.com:Ultimaker/Cura into add_42_43_version_upgrader 2019-07-23 11:33:52 +02:00
Jaime van Kessel
2877685bce Fix typo 2019-07-23 11:32:02 +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
585e8c3c97 Add the versionupgrade to bundled packages list 2019-07-23 11:29:13 +02:00
Jaime van Kessel
57eb47e267 Named the imade profiles back again and added upgrade step for it 
The proposed new name is better and since we have an upgrader now, it's best to change it.
 2019-07-23 11:23:42 +02:00
Jaime van Kessel
e56e355e79 Added upgrader for 4.3 2019-07-23 11:15:13 +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