Tim Kuipers
a144a51da4
Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura
...
This is a manual merge. I did a checkout on specific files from another branch
That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them
This way of merging bypasses all problems we had with the standard merges from 2.1 into master
CURA-1349
2016-04-11 18:50:41 +02:00
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
Tim Kuipers
4c47615145
JSON+profiles: removed shell thickness as a whole (CURA-1309)
2016-03-30 19:12:41 +02: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
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
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
fieldOfView
ce562713c3
Reimport default profiles from 15.04.04
2016-02-08 09:18:31 +01:00
fieldOfView
3d85646d07
Move general profiles into profiles/general
2016-02-08 09:18:31 +01:00
