Ghostkeeper
0684cee681
Merge branch '2.1'
...
Conflicts:
resources/machines/fdmprinter.json
resources/machines/innovo-inventor.json
resources/profiles/general/High+Quality.cfg
resources/profiles/general/Low+Quality.cfg
resources/profiles/general/Normal+Quality.cfg
resources/profiles/general/Ulti+Quality.cfg
resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
2016-04-04 18:49:09 +02:00
Jaime van Kessel
9fce463153
Removed olson block as upgrade from UM2
...
Fixes CURA-1280
2016-04-04 13:34:43 +02:00
Tim Kuipers
4c47615145
JSON+profiles: removed shell thickness as a whole (CURA-1309)
2016-03-30 19:12:41 +02:00
Jaime van Kessel
918d8005bc
Removing unneeded overwritten settings
2016-03-25 13:59:43 +01:00
Tim Kuipers
6e7be5995c
profiles: got print speed from old cura (CURA-1195)
2016-03-23 18:26:03 +01:00
Tim Kuipers
47b04efcfe
profiles fixes: removed double settings, introduced missing ones (CURA-1195)
...
I've made it such that all ABS and CPE profiles contain the same settings and also all PLA profiles contain the same settings. This is to verify that no settings have been overlooked.
2016-03-23 18:09:59 +01:00
Tim Kuipers
2539042858
profiles: did all profiles ABS and CPE with Paul by hand (CURA-1195)
...
also reordered settings to match Pauls sheet
2016-03-23 17:43:09 +01:00
Tim Kuipers
fd27fcb52d
profiles: removed superfluous/outdated infill_wipe_dist (CURA-1195)
2016-03-23 13:50:34 +01:00
Tim Kuipers
a7aafe958b
profiles: removed superfluous speed_slowdown_layers (CURA-1195)
2016-03-23 13:49:08 +01:00
Tim Kuipers
fc974c25c2
profiles: removed superfluous/outdated travel_avoid_distance (CURA-1195)
2016-03-23 13:47:12 +01:00
Tim Kuipers
12349d1228
profiles: removed superfluous/outdated retraction_min_travel (CURA-1195)
2016-03-23 13:45:38 +01:00
Tim Kuipers
40adb5b7e3
profiles: removed superfluous/outdated retraction_count_max (CURA-1195)
2016-03-23 13:42:19 +01:00
Tim Kuipers
6a150b3b7d
profiles: removed superfluous cool_fan_full=2 (CURA-1195)
2016-03-23 13:28:27 +01:00
Jaime van Kessel
834e2148d2
Major cleanup for profiles
...
This removes a bunch of settings that override default values from machine defaults (or inheritance)
2016-03-18 14:18:19 +01:00
fieldOfView
745bc8051a
Fix generic material profiles
...
Makes sure that the generic PLA material profile has all the same settings as the ABS and CPE settings, so a printer that uses the non-printer-specific material profiles can switch back to the proper settings for PLA when they are merged into the current settings.
CURA-1188
2016-03-17 16:29:19 +01:00
Ghostkeeper
de9a66e1f4
Merge branch '2.1'
...
Conflicts:
plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
plugins/USBPrinting/PrinterConnection.py
resources/machines/fdmprinter.json
resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
2016-03-17 15:24:00 +01:00
Jaime van Kessel
5c6200a046
Removed unneeded override from profile
...
CURA-1122
2016-03-14 12:00:45 +01:00
Jaime van Kessel
5fbf4f336e
Removed profile settings that already were on default
2016-03-11 11:54:31 +01:00
fieldOfView
83e4385e7e
Revert "Reimport default profiles from 15.04.04" because I did not oversee
...
the implications at the time
This reverts commit ce562713c3
.
2016-03-10 13:45:00 +01:00
Tim Kuipers
3a377a616b
profiles: machine_nozzle_size ==> line_width (CURA-1097)
2016-03-10 12:08:06 +01:00
fieldOfView
a911471206
Add weights to standard profiles for sorting
...
Contributes to CURA-1059
Conflicts:
resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
2016-03-09 15:33:51 +01:00
Ghostkeeper
ca1e9f6e52
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-03-09 09:38:18 +01:00
Ghostkeeper
ae0cb70d25
Tweak infill wipe distance
...
This wasn't taken over correctly from Paul's spreadsheet.
Contributes to issue CURA-892.
2016-03-09 09:38:02 +01:00
fieldOfView
48a181d0b5
Add weights to standard profiles for sorting
...
Contributes to CURA-1059
2016-03-08 17:45:00 +01:00
Jaime van Kessel
a9bd73f32a
Merge branch '2.1' of https://github.com/Ultimaker/Cura
2016-03-04 10:59:40 +01:00
Tim Kuipers
24f1726585
JSOn/profiles: changed infill overlap to mm (CURA-786)
2016-03-03 17:28:45 +01:00
Tim Kuipers
fc15b9e0b0
profiles: removed superfluous top_thickness and bottom_thickness from ABS and CPE profiles (CURA-1004)
2016-03-03 11:58:37 +01:00
Tim Kuipers
411b8b0502
profiles: removed brim_line_count and let brim_width just use the default 8mm (CURA-983)
2016-03-02 17:13:04 +01:00
Tim Kuipers
6411168fc9
profiles: regenerated abs and pce profiles for UM2+ (CURA-987)
2016-03-02 15:14:23 +01:00
Tim Kuipers
4cc3d03bae
prefoles: fix: platform_adhesion settings were spelled with capitals (CURA-983)
2016-03-02 14:10:22 +01:00
Tim Kuipers
777163cb1a
profiles: removed zhop=0 cause that was already default (CURA-983)
2016-03-02 12:23:02 +01:00
Tim Kuipers
fadb282cc6
profiles: fix: retraction_combing was All instead of true, but that was already the default (CURA-983)
2016-03-02 11:26:25 +01:00
Tim Kuipers
f1999db640
preofiles: fix: removed magic_mesh_surface_mode = False (CURA-983)
...
it is an enum, not a boolean!
it is already set to Normal by default
2016-03-02 11:13:34 +01:00
Tim Kuipers
4bde5c176f
JSON/profiles: fix: made travel_compensate_overlapping_walls_enabled always true (CURA-983)
2016-03-02 11:10:22 +01:00
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
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
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
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
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
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
fieldOfView
bcf0f507ad
Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block
2016-02-19 20:39:32 +01:00
fieldOfView
d30f8322ba
Make material profiles have values for the same settings
2016-02-08 09:18:34 +01:00
fieldOfView
57046a43e8
Rename material profiles for consistency
2016-02-08 09:18:34 +01:00
fieldOfView
a53b898670
Rename [profile] to [settings] in material profiles
2016-02-08 09:18:34 +01:00
fieldOfView
277dd71759
Align variant naming in profiles and machine definitions
2016-02-08 09:18:33 +01:00
fieldOfView
bfa45245cc
machine_type is a reference to the id, not the name
2016-02-08 09:18:33 +01:00
fieldOfView
747f5fbd55
Add converted UM2+ profiles (variant/material specific)
2016-02-08 09:18:32 +01:00
fieldOfView
cbbc6d1a18
Add converted material profiles
2016-02-08 09:18:31 +01:00