GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,148 Commits 295 Branches 268 Tags
Commit Graph

12148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tamara Hogenhout
e61d3e4f3e Merge pull request #562 from Ultimaker/feature_ux2-1 
Design rework for 2.1 release
 2015-12-10 11:05:19 +01:00
Tamara Hogenhout
18df633837 Revert "Displays settings based on whether they are global-only or not" 
This reverts commit 2e5bac5392f35d43c701abdfc2340e907258cfaa.
 2015-12-10 11:00:40 +01:00
Tamara Hogenhout
7e12269ca4 Revert "Adds a global-only role to the SettingOverrideModel" 
This reverts commit f8dbe056b2c53ac76f2ad124e26c7b8dbfd55b07.
 2015-12-09 16:49:13 +01:00
Tim Kuipers
fa7a434de4 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-12-09 16:38:39 +01:00
Tim Kuipers
99d9348c38 extruder trains can now be overridden (CURA-494) 2015-12-09 16:28:48 +01:00
Tim Kuipers
17e372820c JSON: machine_show_variants was never defined in fdmPrinter.json (CURA-494) 2015-12-09 16:28:31 +01:00
fieldOfView
f29e03f7e7 Tweak Setting Category header size 2015-12-09 15:40:57 +01:00
fieldOfView
5fe1de2153 Add warning to PerObjectSettingsPanel when Print Sequence is set to All at Once 2015-12-09 15:05:39 +01:00
Tim Kuipers
ff500e4315 JSON: machine_extruder_trains array refactored to objcet with int children (CURA-494) 2015-12-09 14:15:23 +01:00
Tim Kuipers
a390aa73a8 JSON: machine_settings ==> overrides (CURA-494) 2015-12-09 14:06:33 +01:00
fieldOfView
03e9694e32 Fix PerObjectSettingsPanel layout 2015-12-09 13:02:30 +01:00
daid
3d4b626c50 When running Cura from the master branch, there is no version set. Which puts the version at "master". The splash screen tries to split this into major-minor, but cannot draw the minor and throws an exception. This patch just skips drawing of the minor version number when it is not available. 2015-12-09 10:40:09 +01:00
Tim Kuipers
11f7f521c9 Merge branch '2.1' 2015-12-08 16:15:43 +01:00
fieldOfView
6863e15e20 Remove Print Speed setting from simple mode 2015-12-08 15:03:54 +01:00
Tamara Hogenhout
9388fd9e55 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2015-12-08 13:45:28 +01:00
Tamara Hogenhout
70b221b33a Proof of concept to test the global-only functionalities 
Contributes to #CURA-460458
 2015-12-08 13:44:59 +01:00
Tamara Hogenhout
f8dbe056b2 Adds a global-only role to the SettingOverrideModel 
Also adds a reload function

Contributes to #CURA-458
 2015-12-08 13:43:37 +01:00
Tamara Hogenhout
2e5bac5392 Displays settings based on whether they are global-only or not 
blobal-only means it's not allowed to be used as a per object setting

Contribute to #CURA-458
 2015-12-08 13:42:16 +01:00
Tim Kuipers
4932ef819c JSON fix: Min Volume Before Coasting doesn't include Coasting Volume anymore (CURA-528) 2015-12-08 13:30:12 +01:00
Tim Kuipers
5009ac99e6 retrieve brim_width instead of brim_line_count * skirt_line_width (CURA-550) 2015-12-08 10:51:07 +01:00
Tim Kuipers
a4e824464c JSON bugfix: coasting_min_volume had an inherit_function and the inherit property (CURA-550) 2015-12-08 10:47:09 +01:00
Tim Kuipers
71c8393f8c JSON bugfix: default brim width (CURA-550) 2015-12-08 10:13:23 +01:00
Tim Kuipers
26a7fc7bdc JSON: made brim_line_count default match brim_width_default for 0.4 nozzles (CURA-550) 2015-12-08 09:50:34 +01:00
Tim Kuipers
8a853e5b05 JSON bugfix: infill_density ==> infill_sparse_density (CURA-550) 2015-12-08 09:48:01 +01:00
Tim Kuipers
6ef68ca5c1 JSON: made coasting_min_volume depend on coasting_volume (CURA-550) 2015-12-08 09:47:20 +01:00
Tim Kuipers
67bbb5478e JSON: (bugfix) introduced brim_width (CURA-550) 2015-12-08 09:38:21 +01:00
Tim Kuipers
e69bdd4fe5 JSON: introduced brim_width (CURA-550) 2015-12-07 18:11:48 +01:00
Tim Kuipers
b86a219315 JSON: fix: coasting min volume should be at least as high as coasting volume (CURA-528) 2015-12-07 18:05:00 +01:00
Arjen Hiemstra
c854221d4f Update default profiles with values as supplied by Paul 2015-12-04 17:12:27 +01:00
Arjen Hiemstra
48a3e06fd6 Update default profiles with values as supplied by Paul 2015-12-04 17:09:05 +01:00
Arjen Hiemstra
fd4943b18a Fix variant selection dropdown in sidebar so it actually selects a variant 2015-12-04 16:46:45 +01:00
Arjen Hiemstra
92ff7e9360 Fix variant selection dropdown in sidebar so it actually selects a variant 2015-12-04 16:46:12 +01:00
Tim Kuipers
0f54e1e712 JSON: better retraction_count_max 2015-12-04 11:22:58 +01:00
Ghostkeeper
e0ebff91ed Remove period from setting label 
The 'Use towers' setting had a period behind the name. It shouldn't have.
 2015-12-04 11:12:37 +01:00
Tim Kuipers
ca49226e18 JSON: better retraction_count_max 2015-12-04 11:04:42 +01:00
fieldOfView
a8547483b8 CURA-361 2015-12-03 23:13:58 +01:00
Tim Kuipers
8dce36583f Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2015-12-03 17:54:34 +01:00
Tim Kuipers
531033c53b JSON: removed coasting dichotomy between move and retract (CURA-486) 2015-12-03 17:54:18 +01:00
Ghostkeeper
1db430c61a Log errors in case the file writing fails 
An error message is written to the log including the file that was not written to and the stringified exception.
 2015-12-03 14:09:22 +01:00
fieldOfView
a4dbc5743f Fix control borderwidth on High DPI screens 2015-12-03 12:34:17 +01:00
fieldOfView
2ebeb72fac Rework Per Object Settings selection mechanism 2015-12-03 12:09:32 +01:00
fieldOfView
d9098ff06d SimpleMode small fixes & additions 2015-12-03 12:09:32 +01:00
fieldOfView
943f86ab51 Add Speed section to Simple Mode 2015-12-03 12:09:32 +01:00
fieldOfView
7212080b42 Simplify SimpleMode tooltips 2015-12-03 12:09:32 +01:00
fieldOfView
e3018ed1bb Cleanup JobSpecs area 2015-12-03 12:09:31 +01:00
fieldOfView
1684aa5e50 Add tooltips to Simple Mode 2015-12-03 12:09:31 +01:00
fieldOfView
97359db2ae Add radius to MessageStack progressbar for consistency 2015-12-03 12:09:31 +01:00
fieldOfView
9a1a4d264e Restyle sidebar tooltips using pointingrectangle 
Restyle toolbutton tooltips to match sidebar tooltips
 2015-12-03 12:09:31 +01:00
fieldOfView
2fa29de4b9 Use PointingRectangle for toolpanel flyouts 2015-12-03 12:09:31 +01:00
fieldOfView
4d29fccb0b Remove cursorShapes for now 2015-12-03 12:09:30 +01:00