Merge branch 'master' into fairings

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg

@@ -254,21 +254,6 @@
 		name = ModulePartVariants
 		baseVariant = Size2
 		VARIANT
-		{
-			name = Boattail
-			displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #999999
-			secondaryColor = #000000
-			GAMEOBJECTS
-			{
-        Mainsail_Boattail = true
-        Mainsail_25m = false
-        Mainsail_Shroud = false
-        Mainsail_Shroud_Compact = false
-        Mainsail_Compact = false
-			}
-		}
-		VARIANT
 		{
 			name = Size2
 			displayName = #LOC_Restock_variant-engine_size2
@@ -280,6 +265,21 @@
         Mainsail_25m = true
         Mainsail_Shroud = true
         Mainsail_Shroud_Compact = false
+        Mainsail_Compact = false
+			}
+		}
+		VARIANT
+		{
+			name = Boattail
+			displayName = #LOC_Restock_variant-engine_boattail
+      primaryColor = #999999
+			secondaryColor = #000000
+			GAMEOBJECTS
+			{
+        Mainsail_Boattail = true
+        Mainsail_25m = false
+        Mainsail_Shroud = false
+        Mainsail_Shroud_Compact = false
         Mainsail_Compact = false
 			}
 		}
@@ -905,27 +905,6 @@
 		name = ModulePartVariants
 		baseVariant = Size2
 		VARIANT
-		{
-			name = Boattail
-			displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #999999
-			secondaryColor = #000000
-			GAMEOBJECTS
-			{
-        ActutatorCpt_Bottom001 = false
-        ActutatorCpt_Bottom002 = false
-        Actutator_Bottom001 = true
-        Actutator_Bottom002 = true
-        Skipper_GimbalMount = true
-        Skipper_GimbalMountCompact = false
-        Skipper_Compact = false
-        Skipper_Boattail = true
-        Skipper_25m = false
-        Skipper_Shroud = false
-        Skipper_Shroud_Compact = false
-			}
-		}
-		VARIANT
 		{
 			name = Size2
 			displayName = #LOC_Restock_variant-engine_size2
@@ -943,6 +922,27 @@
         Skipper_Boattail = false
         Skipper_25m = true
         Skipper_Shroud = true
+        Skipper_Shroud_Compact = false
+			}
+		}
+		VARIANT
+		{
+			name = Boattail
+			displayName = #LOC_Restock_variant-engine_boattail
+      primaryColor = #999999
+			secondaryColor = #000000
+			GAMEOBJECTS
+			{
+        ActutatorCpt_Bottom001 = false
+        ActutatorCpt_Bottom002 = false
+        Actutator_Bottom001 = true
+        Actutator_Bottom002 = true
+        Skipper_GimbalMount = true
+        Skipper_GimbalMountCompact = false
+        Skipper_Compact = false
+        Skipper_Boattail = true
+        Skipper_25m = false
+        Skipper_Shroud = false
         Skipper_Shroud_Compact = false
 			}
 		}