Merge branch 'master' into top_most_skin_feature

This commit is contained in:
Tim Kuipers 2017-07-20 12:37:48 +02:00
commit d25e227707
18 changed files with 8825 additions and 125 deletions

View file

@ -304,7 +304,7 @@
"options":
{
"RepRap (Marlin/Sprinter)": "Marlin",
"RepRap (Volumatric)": "Marlin (Volumetric)",
"RepRap (Volumetric)": "Marlin (Volumetric)",
"RepRap (RepRap)": "RepRap",
"UltiGCode": "Ultimaker 2",
"Griffin": "Griffin",