GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 02:25:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,538 Commits 294 Branches 267 Tags
Commit Graph

20538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ChrisTerBeke
87517a77c2
Merge pull request #6057 from Ultimaker/network-plugin-remove-hardcoded-references 
Get rid of any hard-coded references to machines
 2019-07-25 16:02:29 +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
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +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
Jaime van Kessel
8311a39f08 Fix case where an error in the stack would not prevent slicing 
CURA-6680
 2019-07-25 09:42:00 +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
Jaime van Kessel
004297b936
Merge pull request #6028 from sgtnoodle/stretch_retract 
Preserve extruder-only moves in post stretch script
 2019-07-24 17:05:41 +02: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
Lipu Fei
73b7bc3172 Remove verobse flags for pytest 2019-07-24 11:38:10 +02:00
Lipu Fei
80bf8c22ee Merge remote-tracking branch 'origin/4.2' 2019-07-24 10:56:48 +02:00
Lipu Fei
33739ea7a8 Fix profile upgrade in profile importing 
CURA-6681
 2019-07-24 10:55:38 +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
bc7c4d61f8 Mark test that only fails on CI server as to be skipped for the moment 2019-07-24 09:56:49 +02:00
Jaime van Kessel
e630cb3480 Merge branch 'fixes_toolbox' of github.com:Ultimaker/Cura 2019-07-24 09:53:51 +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
Diego Prado Gesto
8411d43ecd Merge branch 'fixes_toolbox' of github.com:Ultimaker/Cura into fixes_toolbox 2019-07-23 16:19:21 +02:00
Diego Prado Gesto
46e6baf6ae Make suggested changes 
Add anchors instead of using width

Contributes to CURA-6518.
 2019-07-23 16:17:54 +02:00
Jaime van Kessel
3e5d81ddb6 Merge branch 'patch-2' of https://github.com/adecastilho/Cura 2019-07-23 15:48:57 +02:00
Jaime van Kessel
5e94e51e0c Add default for max_layer setting in postprocessing script 2019-07-23 15:36:04 +02:00
Jaime van Kessel
a330ae12dc Merge branch 'patch-2' of https://github.com/N95JPL/Cura 2019-07-23 15:28:32 +02:00
Jaime van Kessel
23e295e9e7 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-23 15:26:13 +02:00
Diego Prado Gesto
1d6ba3ffb0 Merge branch 'master' into fixes_toolbox 2019-07-23 15:15:02 +02:00
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