3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
21777 commits 306 branches 270 tags 786 MiB
Commit graph

21777 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
ca48f9171f
Merge branch '4.2' 2019-07-22 17:32:21 +02:00
Ghostkeeper
02ff433c92
Use set for unordered collections of things 
Contributes to issue CURA-6672.
 2019-07-22 17:07:07 +02:00
Jaime van Kessel
203ea2a83f Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-22 16:52:16 +02:00
Jaime van Kessel
67a0dc2ed8 Also rename the PETG profiles 2019-07-22 16:45:26 +02:00
Jaime van Kessel
00f21069e7 Ensure that metadata entries in cura namespace are stored correctly 
CURA-6672
 2019-07-22 16:41:08 +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
2af85899d7 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-22 11:23:27 +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
c3166703b4 Also connect the objectsModel to the selectionChanged signal 2019-07-22 10:27:19 +02:00
Jaime van Kessel
91651a34d4 Fix model binding for objectSelector 2019-07-22 10:24:04 +02:00
Lipu Fei
4b8a216771 Fix typing 2019-07-22 09:34:00 +02:00
KOUBeMT
31bbb8b65f Flow_&_Temp_tuning 2019-07-19 17:25:48 +02:00
Jaime van Kessel
28184ad999 Add some simple tests to CuraSceneNode 2019-07-19 16:53:37 +02:00
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