GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 06:26:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,506 Commits 290 Branches 260 Tags
Commit Graph

1850 Commits

Author SHA1 Message Date
Mark
b4154b8cc0 Merge branch '3.0' 2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ChrisTerBeke
c4c9375bc3 Merge branch '3.0' 2017-09-28 09:35:48 +02:00
ChrisTerBeke
07899ba798 Merge branch 'feature_hide_gradual_infill' into 3.0 2017-09-28 09:34:25 +02:00
ChrisTerBeke
ca277da35c Merge branch '3.0' 2017-09-28 09:22:15 +02:00
ChrisTerBeke
bff79c63d5 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-28 09:21:53 +02:00
ChrisTerBeke
8f4692b3bb Merge branch '3.0' into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:19:13 +02:00
Ghostkeeper
3fa281084f
Merge branch '3.0' 2017-09-28 09:17:55 +02:00
Ghostkeeper
2884e1e5b5
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-28 09:17:40 +02:00
ChrisTerBeke
f2e362838e Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:16:52 +02:00
fieldOfView
0b03681890 Hide gradual infill checkbox if the gradual infill steps setting is disabled 2017-09-27 22:28:20 +02:00
Ghostkeeper
c4fc4a7198
Add better descriptions for abbreviated units 
This should help the translators next time to find better translations.

Contributes to issue CURA-4341.
 2017-09-27 17:34:12 +02:00
Ghostkeeper
fcc914cf0d
Make material colour indication a circle instead of square 
The rest of them are circles. This one should be one too.
 2017-09-27 17:28:32 +02:00
Diego Prado Gesto
dcf07e4f35 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-27 17:25:22 +02:00
Diego Prado Gesto
f8722a2d4b Fixed code style in the function - CURA-4352 2017-09-27 17:21:43 +02:00
fieldOfView
47ad68bda7 Show ticks when they are not available 2017-09-27 17:20:55 +02:00
fieldOfView
87c7373cb0 Fix visibility when there are ticks but no available ticks 2017-09-27 17:14:41 +02:00
ChrisTerBeke
3ddb45160d Update infill slider icon border color to not look like a checkbox, fixes #2487 2017-09-27 16:59:03 +02:00
ChrisTerBeke
e948f54ada Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment 2017-09-27 16:37:40 +02:00
Diego Prado Gesto
c03d54f598 Merge branch '3.0' into fix_infill_slider_rounding 2017-09-27 16:11:10 +02:00
fieldOfView
3be8f45636 Move the quality indicator to the center when there is only one quality available 
Fixes #2485
CURA-4383
 2017-09-27 15:18:53 +02:00
ChrisTerBeke
83e612c1c1 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-27 14:51:34 +02:00
ChrisTerBeke
c1cfb76f8a CURA-4380 code improvements for build plate adhesion label 2017-09-27 14:51:20 +02:00
ChrisTerBeke
a8ce7185cc CURA-4380 gradual infill checkbox closer to slider to indicate category 2017-09-27 14:35:13 +02:00
ChrisTerBeke
a337fd4e9c CURA-4380 quality slider text disabled color when slider cannot be used 2017-09-27 14:32:05 +02:00
Mark
500989e36d Re-add the margin between infill and support checkbox 
CURA-4380
 2017-09-27 14:28:31 +02:00
Mark
aa93c67a94 Re-add the margin between infill and support checkbox 
CURA-4380
 2017-09-27 14:27:04 +02:00
ChrisTerBeke
f8e8dcacdf CURA-4381 use modulus to set infill slider step size and tick show 2017-09-27 13:55:57 +02:00
ChrisTerBeke
aed5e631dc CURA-4352 fix passing int values as float when changing slider value 2017-09-27 13:13:55 +02:00
Jaime van Kessel
2dee054003 Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0 2017-09-27 12:57:42 +02:00
fieldOfView
0308d3d9d0 Fix margin between tools and extruders 2017-09-27 11:46:42 +02:00
fieldOfView
3d08ec6bac Fix Simple mode sliders for Hi DPI 2017-09-27 11:43:57 +02:00
fieldOfView
1479322fbe Add screenScaleFactor to About window 2017-09-26 12:24:59 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
Diego Prado Gesto
b82309fb6a Merge branch 'custom_profiles' into 3.0 2017-09-25 15:52:31 +02:00
alekseisasin
c33bd80818 Added NOT SUPPORTED profile for UM2++ and quality slider validation if value:-1 
CURA-4182
 2017-09-25 15:38:47 +02:00
Ghostkeeper
e427f0bc5f
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-25 08:29:40 +02:00
ChrisTerBeke
11241642b3 CURA-4354 fixed plugin injected tool icon path finding, example in PerObjectSettingsTool 2017-09-22 16:15:38 +02:00
ChrisTerBeke
045f1ce259 update print button dropdown color and hover color 2017-09-22 15:52:44 +02:00
Ghostkeeper
3de608cb0f
Fix display of bed temperature before a printer is added 
Otherwise you get an error if you switch to the print monitor before adding a printer.
 2017-09-22 15:14:03 +02:00
ChrisTerBeke
eb39d857e9 CURA-4341 add documentation for Qt checkbox binding workaround 2017-09-22 15:00:55 +02:00
ChrisTerBeke
07610ea6bb Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-22 14:58:42 +02:00
ChrisTerBeke
0d6c366fa4 CURA-4341 remove debug logging 2017-09-22 14:58:08 +02:00
alekseisasin
07beae0c48 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-22 14:47:34 +02:00
Diego Prado Gesto
cf94c8d37d Working on fixing several issues with profiles - CURA-4327 2017-09-22 14:47:20 +02:00
alekseisasin
ea65457920 After first start (no machine added) the controls on right side are invisible 
CURA-4357
 2017-09-22 14:45:23 +02:00
ChrisTerBeke
bbff49664f Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-22 14:31:24 +02:00
ChrisTerBeke
14429d81cc CURA-4313 fix re-binding checkboxes after manually clicking them 2017-09-22 14:31:19 +02:00
alekseisasin
e1f8676cac Removed tooltip translation in SidebarSimple 
CURA-4182
 2017-09-22 14:02:13 +02:00
alekseisasin
4c3f146995 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-22 13:51:15 +02:00