3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21759 commits 302 branches 270 tags 770 MiB
Commit graph

21759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
6bb9e6097a Rename "collideWithArea" to "collideWithAreas" 
This better reflects what it does (eg; it is checking for multiple colissions, not just one)
 2019-07-19 16:23:57 +02:00
Jaime van Kessel
d59e74c867 Add test for gettingFallbackMaterialByMaterialType 2019-07-19 16:19:24 +02:00
Jaime van Kessel
18f89529a7 Add additional tests for the material manager 2019-07-19 16:04:12 +02:00
Jaime van Kessel
57fbb54f75 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-19 15:00:49 +02:00
Jaime van Kessel
97758cfc88 Expand the qualityManager tests 2019-07-19 15:00:35 +02:00
Lipu Fei
e587367cc1 WIP GitLab CI: Add job for merge requests 2019-07-19 14:32:05 +02:00
Jaime van Kessel
1d62cc48aa Add test for getDefaultQualityType 2019-07-19 14:04:36 +02:00
Jaime van Kessel
9ad8d91ff9 Add tests for ExtruderManager 2019-07-19 13:55:16 +02:00
Jaime van Kessel
1c93dffc22 Added deprecation warning to getExtruderName 2019-07-19 13:36:53 +02:00
Jaime van Kessel
57199d8991 Add a few more simple test to MachineManager 2019-07-19 13:25:34 +02:00
Jaime van Kessel
2ee6f4af15 Added test for activeMaterialId's 2019-07-19 13:04:54 +02:00
Jaime van Kessel
9940023816 Add test for adding a new machine 2019-07-19 12:56:54 +02:00
Jaime van Kessel
b6de376b02 Add test for getMachine function 2019-07-19 12:48:36 +02:00
Jaime van Kessel
3dde93e7f4 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-19 12:43:38 +02:00
Jaime van Kessel
a436d5e0bf Added missing cast to getMachine 2019-07-19 12:43:17 +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
Jaime van Kessel
e6512e748c Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-19 10:58:45 +02:00
Jaime van Kessel
ee05dc7b47 Minor codestyle fixes 2019-07-19 10:55:22 +02:00
Jaime van Kessel
b8d27b9ce3 Fix definition_changes not being updated properly 
CURA-6667
 2019-07-19 10:53:11 +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
a7ddab3c60 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-19 10:38:39 +02:00
Jaime van Kessel
c67f2cfcf5
Merge pull request #6004 from Ultimaker/add_camera_view_stats 
Add camera_view as stats
 2019-07-19 10:38:25 +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
272ef40669 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-19 09:31:51 +02:00
Jaime van Kessel
a82dcb6f52 Fix crash when attempting to set build plate for selection 2019-07-19 09:23:42 +02:00
Jeff Rogers
5ee31a1983 Preserve extruder-only moves in post stretch script 2019-07-18 16:52:59 -07:00
Lipu Fei
a6790e7bb2
Merge pull request #6011 from Ultimaker/CURA-6651_add_peripheral_data_slot 
Add data slot for peripherals
 2019-07-18 12:39:56 +02:00
Lipu Fei
6a843866a0 Fix code style 
CURA-6651
 2019-07-18 11:57:07 +02:00
Ghostkeeper
cc9609738c
Show a message when trying to print via USB while already printing 
Otherwise the button does nothing and gives no feedback of why it does nothing.

Fixes #6026.
 2019-07-18 11:55:26 +02:00
Ghostkeeper
f334fa8578
Spelling of log entries and code style 2019-07-18 11:49:18 +02:00
Lipu Fei
d4a683966d Merge remote-tracking branch 'origin/master' into CURA-6651_add_peripheral_data_slot 2019-07-18 10:42:59 +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
Lipu Fei
0dfa7f1f84 Fix typing 2019-07-16 14:56:30 +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
Jaime van Kessel
e21de3edf9 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-16 14:33:57 +02:00