3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 19:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
23379 commits 305 branches 270 tags 779 MiB
Commit graph

23379 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
42abece298 Fix crash when a corrupted and unkown message was returned 
This is should be pretty rare, but we got a single crash report for it.
 2019-07-23 14:54:40 +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
757988a7f4 Merge branch 'master' of github.com:Ultimaker/Cura into fixes_toolbox 2019-07-23 14:04:40 +02:00
Jaime van Kessel
1e7875de48 Merge branch 'prevent_throwing_exception_when_not_connected' of github.com:Ultimaker/Cura 2019-07-23 13:57:31 +02:00
Jaime van Kessel
87666eb6a1 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-23 13:42:29 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Ghostkeeper
f69eb05636
Merge branch '4.2' 2019-07-23 13:33:58 +02:00
Ghostkeeper
5f74ed080f
Increment SDK version to 6.2 2019-07-23 13:32:48 +02:00
Jaime van Kessel
0077e022ce Renamed some small test classes so they don't cause pytest warnings 
Pytest thought that they were tests, since their name started with test
 2019-07-23 13:24:39 +02:00
Jaime van Kessel
827ccd5a13 Fix mypy issues caused by scenenode iterator being correctly typed 2019-07-23 13:19:42 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Ian Paschal
52efdb77b5
Merge pull request #6042 from Ultimaker/CS-227_hide_incorrect_tooltip 
Hide incorrect tooltip
 2019-07-23 11:50:06 +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
0b37da93a0 Merge branch '4.2' of github.com:Ultimaker/Cura into 4.2 2019-07-23 11:30:59 +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
ChrisTerBeke
7300f95a42
Hide incorrect tooltip 
The preffered solution was to change the copywriting, but since we are after stringfreeze we cannot do this. This is the next best solution to prevent user confusion.
 2019-07-22 21:21:18 +02:00
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