From 28472ee03f07ba286f3ad592ba48a91127606eff Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Tue, 29 Jun 2021 15:48:41 +0200
Subject: [PATCH] Renamed "marlinfirmware" G-code flavor to "marlin2".

---
 src/libslic3r/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp
index e308b23ee..68b464599 100644
--- a/src/libslic3r/Config.cpp
+++ b/src/libslic3r/Config.cpp
@@ -546,7 +546,7 @@ bool ConfigBase::set_deserialize_raw(const t_config_option_key &opt_key_src, con
         // Deserialize failed, try to substitute with a default value.
         assert(substitutions_ctxt.rule == ForwardCompatibilitySubstitutionRule::Enable || substitutions_ctxt.rule == ForwardCompatibilitySubstitutionRule::EnableSilent);
 
-        if (opt_key == "gcode_flavor" && value == "marlinfirmware")
+        if (opt_key == "gcode_flavor" && (value == "marlin2" || value == "marlinfirmware"))
             static_cast<ConfigOptionEnum<GCodeFlavor>*>(opt)->value = gcfMarlin;
         else
             opt->set(optdef->default_value.get());