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
918d8005bc
Removing unneeded overwritten settings
2016-03-25 13:59:43 +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
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
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
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
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
6411168fc9
profiles: regenerated abs and pce profiles for UM2+ (CURA-987)
2016-03-02 15:14:23 +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
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
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
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
