Merge branch 'main' into feature-multiProject

# Conflicts:
#	GameData/ConformalDecals/Plugins/ConformalDecals.dll
#	Source/ConformalDecals/ModuleConformalDecal.cs
#	Source/ConformalDecals/ModuleConformalText.cs

GameData/ConformalDecals/Parts/decal-text.cfg

@@ -52,11 +52,17 @@ PART
     name = ModuleConformalText
 
     text = Text
+    fontName = Calibri SDF
+    fillColor = #000000FF
+    outlineColor = #FFFFFFFF
+    fillEnabled = true
+    outlineEnabled = false
 
     shader = ConformalDecals/Decal/Text
     useBaseNormal = true
     scaleMode = MINIMUM
 
+    defaultScale = 0.2
     defaultDepth = 0.2
     defaultCutoff = 0.5
   }

GameData/ConformalDecals/Patches/FAR.cfg

@@ -0,0 +1,17 @@
+// Decals are just paint, so they shouldnt affect a vessel's aerodynamics at all
+
+@PART[*]:HAS[@MODULE[ModuleConformalDecal]]:After[FerramAerospaceResearch]
+{
+  !MODULE[GeometryPartModule] {}
+}
+
+@PART[*]:HAS[@MODULE[ModuleConformalFlag]]:After[FerramAerospaceResearch]
+{
+  !MODULE[GeometryPartModule] {}
+}
+
+@PART[*]:HAS[@MODULE[ModuleConformalText]]:After[FerramAerospaceResearch]
+{
+
+  !MODULE[GeometryPartModule] {}
+}

GameData/ConformalDecals/Versioning/ConformalDecals.version

@@ -6,8 +6,8 @@
     {
         "MAJOR":0,
         "MINOR":2,
-        "PATCH":1,
-        "BUILD":0
+        "PATCH":6,
+        "BUILD":1
     },
     "KSP_VERSION":
     {