Merge pull request 'Development' (#75 ) from Development into master

Merging F2023-083 and F2023-115 from development into master. No testing is required since formats are under development.
Merge pull request 'VogtleAlarms' (#74 ) from VogtleAlarms into Development
2023-08-09 12:16:06 -04:00 · 2023-08-09 12:12:41 -04:00 · 2023-08-09 12:00:45 -04:00 · 2023-08-09 09:54:46 -04:00
5 changed files with 6 additions and 2 deletions
--- a/PROMS/Formats/fmtall/VEGP1all.xml
+++ b/PROMS/Formats/fmtall/VEGP1all.xml
--- a/PROMS/Formats/fmtall/VEGP2all.xml
+++ b/PROMS/Formats/fmtall/VEGP2all.xml
--- a/PROMS/Formats/fmtall/VEGPAlrall.xml
+++ b/PROMS/Formats/fmtall/VEGPAlrall.xml
--- a/Interface/Properties/AssemblyInfo.cs
+++ b/Interface/Properties/AssemblyInfo.cs
@ -44,8 +44,11 @@ using System.Runtime.InteropServices;
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
 // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
-[assembly: AssemblyVersion("2.1.2307.2515")]
-[assembly: AssemblyFileVersion("2.1.2307.2515")]
+[assembly: AssemblyVersion("2.1.2308.911")]
+[assembly: AssemblyFileVersion("2.1.2308.911")]
+
+
+



--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@ -5388,6 +5388,7 @@ namespace Volian.Print.Library
 			if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Prefix != null && MyItemInfo.FormatStepData.Suffix != null && MyItemInfo.FormatStepData.UseSmartTemplate) return 0;
 			int everyNLines = MyItemInfo.FormatStepData == null ? 1 : MyItemInfo.FormatStepData.StepLayoutData.EveryNLines ?? 1;
 			if (everyNLines == -99) return 0;
+			if (everyNLines == -1) return -SixLinesPerInch;
 			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm ||
 				(MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && MyItemInfo.IsStep && MyItemInfo.FormatStepData.StepLayoutData.STBoxindex != null))
 			{
Author	SHA1	Message	Date
Devin Jankowski	d7b0e99c4a	Merge pull request 'Development' (#75 ) from Development into master Merging F2023-083 and F2023-115 from development into master. No testing is required since formats are under development.	2023-08-09 12:16:06 -04:00
Chris Glavan	95084aef73	Merge pull request 'VogtleAlarms' (#74 ) from VogtleAlarms into Development Merging into Development after code review (See files changed tab)	2023-08-09 12:12:41 -04:00
John Jenko	c8657e46c5	F2023-115 - Added new HLS type that removes extra blank lines between it and its table	2023-08-09 12:00:45 -04:00
John Jenko	b2e81621e6	F2023-083 Replace Words was removing space after Go To	2023-08-09 09:54:46 -04:00