Commit graph

12848 commits

Author SHA1 Message Date
Tim Kuipers
b225cb5c34 profiles: fix: skin_no_small_skin_heuristic not set anymore in profiles, but now defaults to fdmPrinter default (TRUE) (CURA-983) 2016-03-02 11:02:13 +01:00
fieldOfView
5cd1a760e7 Fix saving Gcode for UM2 with Olsson printers
Add file_format parameter to ultimaker2 with olsson block machine definitions. Also removes some machine overrides that were also removed from um2+ profiles.

Fixes CURA-980
2016-03-01 18:08:06 +01:00
fieldOfView
bec897843d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-01 17:24:06 +01:00
fieldOfView
f8681ed401 Use Open Sans font instead of Proxima Nova
Also removes unused Roboto font

Contributes to CURA-953
2016-03-01 17:22:25 +01:00
Tim Kuipers
7b9ecd4aba Revert "Make conical support invisible by default"
This reverts commit d54b24ac86.
2016-03-01 12:16:55 +01:00
Jaime van Kessel
e3a12919f0 Slightly increased size of head for um2+
Discussed this with HW department, size of um2+ head is slightly bigger.

CURA-900
2016-03-01 11:34:36 +01:00
Jaime van Kessel
ff3bca19ac Renamed getdefaultsavepath 2016-03-01 10:40:35 +01:00
Arjen Hiemstra
363fb0c4dd Remove layer view slider style from Cura theme's style file
Since it is a plugin, it should not be in the main theme.

Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Tim Kuipers
98693e7a80 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-02-29 17:54:16 +01:00
Tim Kuipers
804af3cdda JSON: fix global_only problems (CURA-458)
draft shield, support, coasting, auto temp, combing, platform adhesion, speed slowdown layers, travel speed
2016-02-29 17:41:19 +01:00
Tim Kuipers
451e3bd377 JSON: fix more dual extrusion global_only (CURA-458) 2016-02-29 17:39:37 +01:00
Tim Kuipers
f276dd0282 JSON: fix dual extrusion global_only (CURA-458) 2016-02-29 17:21:26 +01:00
Tim Kuipers
36f8bb5553 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 16:40:11 +01:00
Tim Kuipers
f8d7b9ddfa JSON: wall line count should be 1 for magic spiralize (CURA-961) 2016-02-29 16:14:46 +01:00
Jaime van Kessel
06afed5283 Loading files now uses home folder as default location
CURA-906
2016-02-29 16:11:48 +01:00
Ghostkeeper
b9786e5208 Fix for infill overlap
Turns out it was only a distance on the master branch and should still be a percentage on 2.1. Sorry! The dependency on infill density still remains superfluous though.

Contributes to issue CURA-892.
2016-02-29 15:38:33 +01:00
Ghostkeeper
b4cda2bcf1 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 15:19:49 +01:00
Ghostkeeper
94314a7c2c Make infill overlap depend on line width
Paul said this way was a better default for all our profiles.

Contributes to issue CURA-892.
2016-02-29 15:09:51 +01:00
fieldOfView
f0b37d71cc Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 11:55:29 +01:00
fieldOfView
2eb06848b5 Match UM2 with Olsson Block profiles to Paul's UM2+ PLA profiles
Contributes to CURA-91
2016-02-29 11:54:37 +01:00
Ghostkeeper
d54b24ac86 Make conical support invisible by default
It is considered an 'expert setting' since it is fairly experimental.

Contributes to issue CURA-942.
2016-02-29 10:43:25 +01:00
Ghostkeeper
c1385f5e4a Merge pull request #643 from guigashm/master
prusa i3 filament diameter to 1.75
Conflicts:
	resources/machines/prusa_i3_xl.json
2016-02-26 10:55:10 +01:00
guigas
614a52425d filament diameter to 1.75
filament diameter to 1.75
2016-02-25 16:03:19 +00:00
fieldOfView
b5c90d67d0 Remove deprecated use of theme sizes from UM2 upgrades wizard
CURA-91
2016-02-25 11:35:21 +01:00
fieldOfView
d172a98ae4 Fix consistency in profile names ("Fast Print" vs "Fast Prints") to match Paul's new profiles
CURA-892
2016-02-25 11:34:14 +01:00
fieldOfView
b77f51c02e Renamed abs and cpe profiles to match Paul's new pla profiles
Also renamed Ultimaker2+Olsson profiles to match

Contributes to CURA-892
2016-02-25 11:10:42 +01:00
guigas
bcfc20014e add prusa I3 XL machine profile and STL
add prusa I3 XL  machine profile and STL
2016-02-24 21:05:14 +00:00
Jaime van Kessel
dc1ee1d73b Merge pull request #636 from Ultimaker/feature_um2upgrades
Support UM2 with Olsson block
2016-02-24 12:07:35 +01:00
fieldOfView
390dc7e2c6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-24 00:15:22 +01:00
fieldOfView
de28561152 Remove Profiles from Per Object Settings panel
Also disables Per Object Settings tool button when sidebar is in simple mode.

Contributes to CURA-901
2016-02-24 00:14:54 +01:00
Ghostkeeper
ba39864af2 Add new PLA profiles
These were designed through rigorous testing by the test team.

Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00
Ghostkeeper
9233813768 Remove override settings from UM2+ machine settings
A lot of these settings were just normal tweaks, such as speed, which should be set in the profiles rather than the machine definition.

Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00
Tim Kuipers
88ddf714c4 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 15:20:48 +01:00
Tim Kuipers
3c7beac515 JSON: fix: all platform adhesion settings are not settable per object (CURA-458) 2016-02-23 13:45:18 +01:00
Tim Kuipers
ce99ab8630 JSON: fix: global_only not depending on print_sequence (CURA-923)
because there is a bug in the frontend which causes the per-meshgroup settings not to be sent to the meshgroup, but instead sends them to the object itself, no setting which are not editable per object should be editable per meshgroup.
2016-02-23 13:24:39 +01:00
fieldOfView
8eb6fecacf Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 12:50:26 +01:00
Arjen Hiemstra
2aaf633492 Replace usage of UM.Theme with Theme from context in Cura theme styles
This way we do not recursively try to create the Theme object
2016-02-23 12:30:01 +01:00
Arjen Hiemstra
e378c54ce2 Remove commented code from Cura theme styles.qml 2016-02-23 12:26:17 +01:00
Arjen Hiemstra
fa907dfb1b Fix sizing behaviour of Save button
Use the text size with some margin for the button size and simply anchor
it to the right drop down button.
2016-02-23 12:24:27 +01:00
Arjen Hiemstra
222b4666d3 Do not load the theme again when the UI has been loaded
Theme is now loaded on creation instead
2016-02-23 12:24:27 +01:00
Arjen Hiemstra
074048f83c Use the key property of action's source to scroll setting visibility 2016-02-23 12:24:27 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
d208885755 Load preference pages dynamically and reset the current page to 0 on close 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
e2b2088246 Add a configureSettingsAction that will open the setting visibility page 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
4e139ae710 Fix minor error after rebase 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
19c25895bf Convert Toolbar.qml and styles.qml to Theme getThing style 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
d93055da1a Fix syntax 2016-02-23 12:22:30 +01:00
Arjen Hiemstra
720324f0c6 Replace Theme property accessors with getThing calls 2016-02-23 12:22:30 +01:00
Ghostkeeper
0989f8ced7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 09:31:15 +01:00
Tim Kuipers
a168eab140 JSON: fix: cone angle sign inverted compared to description (CURA-869) 2016-02-22 16:51:56 +01:00