diff --git a/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs b/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs index 46b28af8..e8b1459f 100644 --- a/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs @@ -2005,7 +2005,7 @@ namespace SicModules.TMs.Routines.Base { Tuple ret = Execute(id, () => { - Notify($"Close {tm.Name} fast pump valve"); + Notify($"Close {tm.Name} slow pump valve"); if (!tm.SetSlowVentValve(false, out string reason)) { diff --git a/Modules/Mainframe/gitversion.json b/Modules/Mainframe/gitversion.json index e114bed7..16a477dc 100644 --- a/Modules/Mainframe/gitversion.json +++ b/Modules/Mainframe/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.586", - "PreReleaseTagWithDash": "-----multiplate-develop.586", + "PreReleaseTag": "----multiplate-develop.587", + "PreReleaseTagWithDash": "-----multiplate-develop.587", "PreReleaseLabel": "----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 586, - "WeightedPreReleaseNumber": 586, + "PreReleaseNumber": 587, + "WeightedPreReleaseNumber": 587, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "MajorMinorPatch": "23.9.2", - "SemVer": "23.9.2-----multiplate-develop.586", - "LegacySemVer": "23.9.2-----multiplate-de586", - "LegacySemVerPadded": "23.9.2-----multiplate-d0586", - "AssemblySemVer": "23.9.2.586", - "AssemblySemFileVer": "23.9.2.586", - "FullSemVer": "23.9.2-----multiplate-develop.586", - "InformationalVersion": "23.9.2-----multiplate-develop.586+Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "SemVer": "23.9.2-----multiplate-develop.587", + "LegacySemVer": "23.9.2-----multiplate-de587", + "LegacySemVerPadded": "23.9.2-----multiplate-d0587", + "AssemblySemVer": "23.9.2.587", + "AssemblySemFileVer": "23.9.2.587", + "FullSemVer": "23.9.2-----multiplate-develop.587", + "InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "BranchName": "多片机/multiplate-develop", "EscapedBranchName": "----multiplate-develop", - "Sha": "2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", - "ShortSha": "2ccc1ea", - "NuGetVersionV2": "23.9.2-----multiplate-d0586", - "NuGetVersion": "23.9.2-----multiplate-d0586", - "NuGetPreReleaseTagV2": "----multiplate-d0586", - "NuGetPreReleaseTag": "----multiplate-d0586", + "Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", + "ShortSha": "4c18bc3", + "NuGetVersionV2": "23.9.2-----multiplate-d0587", + "NuGetVersion": "23.9.2-----multiplate-d0587", + "NuGetPreReleaseTagV2": "----multiplate-d0587", + "NuGetPreReleaseTag": "----multiplate-d0587", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", - "CommitsSinceVersionSource": 586, - "CommitsSinceVersionSourcePadded": "0586", - "UncommittedChanges": 9, + "CommitsSinceVersionSource": 587, + "CommitsSinceVersionSourcePadded": "0587", + "UncommittedChanges": 0, "CommitDate": "2024-06-24" } \ No newline at end of file diff --git a/SicRT/gitversion.json b/SicRT/gitversion.json index e114bed7..16a477dc 100644 --- a/SicRT/gitversion.json +++ b/SicRT/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.586", - "PreReleaseTagWithDash": "-----multiplate-develop.586", + "PreReleaseTag": "----multiplate-develop.587", + "PreReleaseTagWithDash": "-----multiplate-develop.587", "PreReleaseLabel": "----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 586, - "WeightedPreReleaseNumber": 586, + "PreReleaseNumber": 587, + "WeightedPreReleaseNumber": 587, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "MajorMinorPatch": "23.9.2", - "SemVer": "23.9.2-----multiplate-develop.586", - "LegacySemVer": "23.9.2-----multiplate-de586", - "LegacySemVerPadded": "23.9.2-----multiplate-d0586", - "AssemblySemVer": "23.9.2.586", - "AssemblySemFileVer": "23.9.2.586", - "FullSemVer": "23.9.2-----multiplate-develop.586", - "InformationalVersion": "23.9.2-----multiplate-develop.586+Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "SemVer": "23.9.2-----multiplate-develop.587", + "LegacySemVer": "23.9.2-----multiplate-de587", + "LegacySemVerPadded": "23.9.2-----multiplate-d0587", + "AssemblySemVer": "23.9.2.587", + "AssemblySemFileVer": "23.9.2.587", + "FullSemVer": "23.9.2-----multiplate-develop.587", + "InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "BranchName": "多片机/multiplate-develop", "EscapedBranchName": "----multiplate-develop", - "Sha": "2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", - "ShortSha": "2ccc1ea", - "NuGetVersionV2": "23.9.2-----multiplate-d0586", - "NuGetVersion": "23.9.2-----multiplate-d0586", - "NuGetPreReleaseTagV2": "----multiplate-d0586", - "NuGetPreReleaseTag": "----multiplate-d0586", + "Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", + "ShortSha": "4c18bc3", + "NuGetVersionV2": "23.9.2-----multiplate-d0587", + "NuGetVersion": "23.9.2-----multiplate-d0587", + "NuGetPreReleaseTagV2": "----multiplate-d0587", + "NuGetPreReleaseTag": "----multiplate-d0587", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", - "CommitsSinceVersionSource": 586, - "CommitsSinceVersionSourcePadded": "0586", - "UncommittedChanges": 9, + "CommitsSinceVersionSource": 587, + "CommitsSinceVersionSourcePadded": "0587", + "UncommittedChanges": 0, "CommitDate": "2024-06-24" } \ No newline at end of file diff --git a/SicSimulator/gitversion.json b/SicSimulator/gitversion.json index e114bed7..16a477dc 100644 --- a/SicSimulator/gitversion.json +++ b/SicSimulator/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.586", - "PreReleaseTagWithDash": "-----multiplate-develop.586", + "PreReleaseTag": "----multiplate-develop.587", + "PreReleaseTagWithDash": "-----multiplate-develop.587", "PreReleaseLabel": "----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 586, - "WeightedPreReleaseNumber": 586, + "PreReleaseNumber": 587, + "WeightedPreReleaseNumber": 587, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "MajorMinorPatch": "23.9.2", - "SemVer": "23.9.2-----multiplate-develop.586", - "LegacySemVer": "23.9.2-----multiplate-de586", - "LegacySemVerPadded": "23.9.2-----multiplate-d0586", - "AssemblySemVer": "23.9.2.586", - "AssemblySemFileVer": "23.9.2.586", - "FullSemVer": "23.9.2-----multiplate-develop.586", - "InformationalVersion": "23.9.2-----multiplate-develop.586+Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "SemVer": "23.9.2-----multiplate-develop.587", + "LegacySemVer": "23.9.2-----multiplate-de587", + "LegacySemVerPadded": "23.9.2-----multiplate-d0587", + "AssemblySemVer": "23.9.2.587", + "AssemblySemFileVer": "23.9.2.587", + "FullSemVer": "23.9.2-----multiplate-develop.587", + "InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "BranchName": "多片机/multiplate-develop", "EscapedBranchName": "----multiplate-develop", - "Sha": "2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", - "ShortSha": "2ccc1ea", - "NuGetVersionV2": "23.9.2-----multiplate-d0586", - "NuGetVersion": "23.9.2-----multiplate-d0586", - "NuGetPreReleaseTagV2": "----multiplate-d0586", - "NuGetPreReleaseTag": "----multiplate-d0586", + "Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", + "ShortSha": "4c18bc3", + "NuGetVersionV2": "23.9.2-----multiplate-d0587", + "NuGetVersion": "23.9.2-----multiplate-d0587", + "NuGetPreReleaseTagV2": "----multiplate-d0587", + "NuGetPreReleaseTag": "----multiplate-d0587", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", - "CommitsSinceVersionSource": 586, - "CommitsSinceVersionSourcePadded": "0586", - "UncommittedChanges": 9, + "CommitsSinceVersionSource": 587, + "CommitsSinceVersionSourcePadded": "0587", + "UncommittedChanges": 0, "CommitDate": "2024-06-24" } \ No newline at end of file diff --git a/SicUI/gitversion.json b/SicUI/gitversion.json index e114bed7..16a477dc 100644 --- a/SicUI/gitversion.json +++ b/SicUI/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.586", - "PreReleaseTagWithDash": "-----multiplate-develop.586", + "PreReleaseTag": "----multiplate-develop.587", + "PreReleaseTagWithDash": "-----multiplate-develop.587", "PreReleaseLabel": "----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 586, - "WeightedPreReleaseNumber": 586, + "PreReleaseNumber": 587, + "WeightedPreReleaseNumber": 587, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "MajorMinorPatch": "23.9.2", - "SemVer": "23.9.2-----multiplate-develop.586", - "LegacySemVer": "23.9.2-----multiplate-de586", - "LegacySemVerPadded": "23.9.2-----multiplate-d0586", - "AssemblySemVer": "23.9.2.586", - "AssemblySemFileVer": "23.9.2.586", - "FullSemVer": "23.9.2-----multiplate-develop.586", - "InformationalVersion": "23.9.2-----multiplate-develop.586+Branch.----multiplate-develop.Sha.2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", + "SemVer": "23.9.2-----multiplate-develop.587", + "LegacySemVer": "23.9.2-----multiplate-de587", + "LegacySemVerPadded": "23.9.2-----multiplate-d0587", + "AssemblySemVer": "23.9.2.587", + "AssemblySemFileVer": "23.9.2.587", + "FullSemVer": "23.9.2-----multiplate-develop.587", + "InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", "BranchName": "多片机/multiplate-develop", "EscapedBranchName": "----multiplate-develop", - "Sha": "2ccc1ea72bee8b014b7e8d0250178caaf30ee65c", - "ShortSha": "2ccc1ea", - "NuGetVersionV2": "23.9.2-----multiplate-d0586", - "NuGetVersion": "23.9.2-----multiplate-d0586", - "NuGetPreReleaseTagV2": "----multiplate-d0586", - "NuGetPreReleaseTag": "----multiplate-d0586", + "Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c", + "ShortSha": "4c18bc3", + "NuGetVersionV2": "23.9.2-----multiplate-d0587", + "NuGetVersion": "23.9.2-----multiplate-d0587", + "NuGetPreReleaseTagV2": "----multiplate-d0587", + "NuGetPreReleaseTag": "----multiplate-d0587", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", - "CommitsSinceVersionSource": 586, - "CommitsSinceVersionSourcePadded": "0586", - "UncommittedChanges": 9, + "CommitsSinceVersionSource": 587, + "CommitsSinceVersionSourcePadded": "0587", + "UncommittedChanges": 0, "CommitDate": "2024-06-24" } \ No newline at end of file diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index 1e86c531..e9978b8c 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index e2cd13f7..47e7f1f7 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index f311b864..e4640e93 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index af86118b..dc9da5b6 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index 369d79bd..07132366 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index 6b96950b..2e4ff5dd 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Core.dll b/ThirdParty/MECF.Framework/Sicentury.Core.dll index ebf97f31..ba79d362 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Core.dll and b/ThirdParty/MECF.Framework/Sicentury.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Localization.dll b/ThirdParty/MECF.Framework/Sicentury.Localization.dll index d26bbde8..9e17a8fa 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Localization.dll and b/ThirdParty/MECF.Framework/Sicentury.Localization.dll differ diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll index f73d2b74..118048d0 100644 Binary files a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ