PPC_v1.2.7

6 files changed, 20 insertions, 11 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index 9453b5c13..5fe5afe5a 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index e62326c29..aabb8ee24 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{62F1B4FB-22DC-4F1C-81DE-367C74EEBAA8} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{AC1F0FE6-ED7C-49EB-A023-29C32B2E5D25} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.2.6.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.2.7.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -505,7 +505,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.2.6" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.2.6"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.2.7" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.2.7"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c
index e4baae5c6..d6d4117b7 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "LiquidType.pb-c.h"
-static const ProtobufCEnumValue liquid_type__enum_values_by_number[7] =
+static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] =
 {
   { "Cyan", "LIQUID_TYPE__Cyan", 0 },
   { "Magenta", "LIQUID_TYPE__Magenta", 1 },
@@ -16,15 +16,21 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[7] =
   { "TransparentInk", "LIQUID_TYPE__TransparentInk", 4 },
   { "Lubricant", "LIQUID_TYPE__Lubricant", 5 },
   { "Cleaner", "LIQUID_TYPE__Cleaner", 6 },
+  { "LightCyan", "LIQUID_TYPE__LightCyan", 7 },
+  { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 },
+  { "LightYellow", "LIQUID_TYPE__LightYellow", 9 },
 };
 static const ProtobufCIntRange liquid_type__value_ranges[] = {
-{0, 0},{0, 7}
+{0, 0},{0, 10}
 };
-static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[7] =
+static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] =
 {
   { "Black", 3 },
   { "Cleaner", 6 },
   { "Cyan", 0 },
+  { "LightCyan", 7 },
+  { "LightMagenta", 8 },
+  { "LightYellow", 9 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
   { "TransparentInk", 4 },
@@ -37,9 +43,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor =
   "LiquidType",
   "LiquidType",
   "",
-  7,
+  10,
   liquid_type__enum_values_by_number,
-  7,
+  10,
   liquid_type__enum_values_by_name,
   1,
   liquid_type__value_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h
index da9ec1c60..eba52c4a7 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h
@@ -26,7 +26,10 @@ typedef enum _LiquidType {
   LIQUID_TYPE__Black = 3,
   LIQUID_TYPE__TransparentInk = 4,
   LIQUID_TYPE__Lubricant = 5,
-  LIQUID_TYPE__Cleaner = 6
+  LIQUID_TYPE__Cleaner = 6,
+  LIQUID_TYPE__LightCyan = 7,
+  LIQUID_TYPE__LightMagenta = 8,
+  LIQUID_TYPE__LightYellow = 9
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE)
 } LiquidType;
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index a7526087a..1dcfbf59a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.2.6.0")]
+[assembly: AssemblyVersion("1.2.7.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>