GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-23 03:43:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,296 Commits 295 Branches 268 Tags
Commit Graph

33296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
be5a6e421b Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-05 14:09:56 +01:00
Jack Ha
601d3fa554 Added blurSettings when switching machine to prevent taking values from old machine. CURA-3065 2016-12-05 14:09:33 +01:00
Jaime van Kessel
adb1cc7933 Merge branch 'recommended_sidebar' of github.com:Ultimaker/Cura 2016-12-05 14:02:51 +01:00
Jaime van Kessel
f24f06f106 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-05 13:56:43 +01:00
Simon Edwards
724cc99f59 Make things neater. 
CURA-2953 Version upgrade 2.3 to 2.4
 2016-12-05 13:31:24 +01:00
Ghostkeeper
1c14c8e2c5 Add cool zone length setting 
This setting can vary from cartridge to cartridge and between machines.

Contributes to issue CURA-2795.
 2016-12-05 13:20:43 +01:00
Ghostkeeper
96bca5e297 Fix spelling of heat zone length description 
Not user visible, but eh.
 2016-12-05 13:20:43 +01:00
Jaime van Kessel
e0168aac11 Improved logging for _replaceQualityChangesInStack 
CURA-3042
 2016-12-05 13:05:59 +01:00
Tim Kuipers
0e7223bd30 JSON fix: set user specified z seam position at back by default 2016-12-05 12:50:45 +01:00
Jaime van Kessel
16447f7173 Authentication data is now stripped from project file before saving 
CURA-1263
 2016-12-05 12:46:53 +01:00
Jaime van Kessel
8f023524d2 Small textual changes for project handling 
CURA-1263
 2016-12-05 11:44:42 +01:00
Jaime van Kessel
535250e714 Loading a project no longer destroys authentication 
CURA-1263
 2016-12-05 11:43:27 +01:00
Jaime van Kessel
ceb6017cf4 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-05 11:28:20 +01:00
Jack Ha
7a35e4170b Moved translation functionality needed for 3mf into ThreeMFReader. Fix CURA-3089, impacts CURA-382 2016-12-05 11:28:06 +01:00
Jaime van Kessel
1860b8667b Changed extension of 3mf projects to curaproject.3mf 
CURA-1263
 2016-12-05 11:27:36 +01:00
Simon Edwards
13af609830 Merge branch 'master' into upgrade_to_2.4 2016-12-05 11:01:33 +01:00
Simon Edwards
3d9c27a7f7 CURA-2953 Version upgrade 2.3 to 2.4 2016-12-05 11:00:33 +01:00
Jaime van Kessel
2559728cf6 Merge pull request #1207 from samirabaza/patch-4 
Minor starting code new line fix
 2016-12-05 09:28:51 +01:00
SAMSECTOR
c4a39443cb
Minor starting code new line fix 2016-12-05 09:27:35 +01:00
Jaime van Kessel
56daf80f2f removed pixelRatioSize, as this made the screen look weird on osx 
CURA-1263
 2016-12-05 09:23:37 +01:00
SAMSECTOR
a18bd6c404 Minor starting code new line fix 2016-12-03 19:53:10 +03:00
Thomas Karl Pietrowski
70c6b3acb8 QML: Remove name of application 
For me having "Cura" under the logo actually doesn't make sense, as it is quite obvious by the logo that we are talking about _Cura_ here. So in my opinion we can prefix the application version here with "version: " instead.

Untested but it should work (fingers crossed)
 2016-12-02 20:58:16 +01:00
Jaime van Kessel
db18635049 Instead of emitting signals for all containers, only emit them for top 
This significantly speeds up project loading. CURA-1263
 2016-12-02 16:27:58 +01:00
Jaime van Kessel
a1acfe167c Fixed UI spacing if there is no material conflict in project load 
CURA-1263
 2016-12-02 15:31:55 +01:00
Jaime van Kessel
a0813b3af3 Added warning when trying to load project with objects on buildplate 
CURA-1263
 2016-12-02 15:30:21 +01:00
Jaime van Kessel
5d1ba828bc Closing load project screen cancels loading of workspace 
CURA-1263
 2016-12-02 15:15:34 +01:00
Jaime van Kessel
a5c38e0591 Assign the empty containers before handling the globalcontainer changed signal 2016-12-02 15:08:18 +01:00
Jaime van Kessel
f782a76324 Material labels are now also displayed in the open project dialog 
CURA-1263
 2016-12-02 14:54:42 +01:00
Jaime van Kessel
c950288b86 Minor UI changes to projectDialog 
CURA-1263
 2016-12-02 13:41:39 +01:00
Jaime van Kessel
9a03e8640b Added spacers to workspace dialog 
CURA-1263
 2016-12-02 13:39:39 +01:00
Jaime van Kessel
3345e918e8 Conflict resolvement boxes are now invisible if there is nothing to resolve 
CURA-1263
 2016-12-02 13:37:56 +01:00
Jaime van Kessel
c50d0172cc Moved open project to below open recent 
CURA-1263
 2016-12-02 13:33:13 +01:00
Jaime van Kessel
c236f7d266 Total number of settings is now calculated for open project dialog 
CURA-1263
 2016-12-02 13:31:31 +01:00
Jaime van Kessel
04d268b1fb Machine name is now also displayed in open project dialog 
CURA-1263
 2016-12-02 13:27:39 +01:00
Jaime van Kessel
b3f1f6b4db Project load dialog now also gives information about the quality & quality changes 
CURA-1263
 2016-12-02 13:01:01 +01:00
Jaime van Kessel
6bb1b7ec80 Number of settings & mode are now displayed in open Project 
CURA-1263
 2016-12-02 11:54:28 +01:00
Jaime van Kessel
ea0cbec691 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-02 11:13:45 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open 
CURA-1263
 2016-12-02 11:13:21 +01:00
Ghostkeeper
53ab4955df
Set initial bed temperature to be equal to normal 
By default. Update from the materials team.
 2016-12-02 11:05:54 +01:00
Jaime van Kessel
4cf454757f Change import & export back to save & open 
CURA-1263
 2016-12-02 10:43:02 +01:00
Jaime van Kessel
0ee68b716f Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-02 10:41:55 +01:00
Jaime van Kessel
f21bc4fc42 Only add extra line to brim multiple extruders are used 2016-12-02 10:14:59 +01:00
Jack Ha
8c5d97f6a0 Removed log. CURA-2767 2016-12-01 14:52:40 +01:00
Jack Ha
8ff233871f Fixed typo. CURA-2767 2016-12-01 14:51:41 +01:00
Jack Ha
14701d89d0 Finally got edge cases regarding recommended mode support extruder color working. CURA-2767 2016-12-01 14:50:40 +01:00
Jack Ha
23f7a91b40 Merge branch 'master' into recommended_sidebar 2016-12-01 14:10:06 +01:00
Jack Ha
1972e59713 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-01 14:06:34 +01:00
Jack Ha
2924d2bf71 Fix color update in extruder comboboxes. CURA-3033 2016-12-01 14:06:17 +01:00
Jack Ha
4cd940cc5e Merge branch 'master' into recommended_sidebar 2016-12-01 11:34:41 +01:00
Jack Ha
ef6e90283e Added color to recommended view support extruder by adding combobox_color style. CURA-2767 2016-12-01 11:34:37 +01:00