Fix rebase

GameData/ConformalDecals/Parts/decal-text.cfg

@@ -0,0 +1,57 @@
+PART
+{
+  name = conformaldecals-text
+  module = Part
+  author = Andrew Cassidy
+  MODEL
+  {
+    model = ConformalDecals/Assets/decal-blank
+    scale = 1.0, 1.0, 1.0
+  }
+  rescaleFactor = 1
+
+  // Attachment
+  attachRules = 1,1,0,0,1
+  node_attach = 0.0, 0.0, 0.1, 0.0, 0.0, -1.0
+
+  // Tech
+  TechRequired = start
+
+  // Info
+  cost = 75
+  category = Structural
+
+  // CDL-F Flag Decal
+  title = Conformal Text
+
+  // Peel-N-Stik Adhesive Decals
+  manufacturer = #LOC_ConformalDecals_agent-peel-n-stick_title 
+
+  // A simple switchable flag. Can either use the mission flag or select a specific flag to use.
+  description = #LOC_ConformalDecals_flag-description
+
+  // conformal decal sticker flag
+  tags = #LOC_ConformalDecals_flag-tags
+
+  bulkheadProfiles = srf
+
+  // Parameters
+  mass = 0.0005
+  dragModel = NONE
+  angularDrag = 0.0
+  crashTolerance = 10
+  maxTemp = 2000
+  breakingForce = 350
+  breakingTorque = 150
+  physicalSignificance = NONE
+
+  MODULE
+  {
+    name = ModuleConformalText
+
+    useBaseNormal = true
+
+    defaultDepth = 0.2
+    defaultCutoff = 0
+  }
+}

GameData/ConformalDecals/Resources/waukegan.kspfont.manifest

@@ -0,0 +1,22 @@
+ManifestFileVersion: 0
+CRC: 1685411399
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 90cdcf0dcb130a744f8c2f0141a92dcb
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 6e1e43b15993df3da9f9c4822403a365
+HashAppended: 0
+ClassTypes:
+- Class: 21
+  Script: {instanceID: 0}
+- Class: 28
+  Script: {instanceID: 0}
+- Class: 48
+  Script: {instanceID: 0}
+- Class: 114
+  Script: {fileID: 11500000, guid: 74dfce233ddb29b4294c3e23c1d3650d, type: 3}
+Assets:
+- Assets/Fonts/Waukegan_LDO_Extended_Bold_SDF.asset
+Dependencies: []