Merge branch 'master' into feature/multimeter3

diylc/diylc-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.diylc</groupId>
         <artifactId>diylc-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
     
     <artifactId>diylc-core</artifactId>

diylc/diylc-core/src/main/resources/update.xml

@@ -296,6 +296,26 @@
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>5</major>
+				<minor>1</minor>
+				<build>1</build>
+			</versionNumber>
+			<releaseDate>2025-03-27 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Include windows ZIP package</description>
+				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Windows version doesn't start in some cases</description>
+				</org.diylc.appframework.update.Change>
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>
 		<org.diylc.appframework.update.Version>
 			<versionNumber>
 				<major>5</major>
@@ -313,10 +333,6 @@
 					<changeType>NEW_FEATURE</changeType>
 					<description>Added ability to highlight connected switch lugs in selected position in order to illustrate how it works internally.</description>
 				</org.diylc.appframework.update.Change>
-				<org.diylc.appframework.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added Windows zip file distribution in addition to the installer.</description>
-				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Moved 'Analyze' functions from 'File' menu to their own menu for faster access</description>

diylc/diylc-library/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.diylc</groupId>
         <artifactId>diylc-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
     
     <artifactId>diylc-library</artifactId>

diylc/diylc-swing/deploy/win/launch4j-x64.xml

@@ -3,7 +3,7 @@
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
   <jar>diylc.jar</jar>
-  <outfile>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\diylc-x64.exe</outfile>
+  <outfile>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\win\diylc-x64.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir>.</chdir>
@@ -13,10 +13,9 @@
   <stayAlive>false</stayAlive>
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
-  <icon>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\icons\diylc.ico</icon>
+  <icon>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\src\main\resources\icons\diylc.ico</icon>
   <classPath>
     <mainClass>org.diylc.DIYLCStarter</mainClass>
-    <cp>lib</cp>
   </classPath>
   <jre>
     <path>jre17</path>
@@ -28,7 +27,6 @@
     <maxHeapSize>4096</maxHeapSize>
     <opt>-Dorg.diylc.scriptRun=true</opt>
     <opt>-Dfile.encoding=UTF-8</opt>
-    <opt>-javaagent:lib/jar-loader.jar</opt>
     <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
     <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
     <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>

diylc/diylc-swing/deploy/win/launch4j-x86.xml

@@ -3,7 +3,7 @@
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
   <jar>diylc.jar</jar>
-  <outfile>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\diylc-x86.exe</outfile>
+  <outfile>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\win\diylc-x86.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir>.</chdir>
@@ -13,10 +13,9 @@
   <stayAlive>false</stayAlive>
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
-  <icon>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\icons\diylc.ico</icon>
+  <icon>C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\src\main\resources\icons\diylc.ico</icon>
   <classPath>
     <mainClass>org.diylc.DIYLCStarter</mainClass>
-    <cp>lib</cp>
   </classPath>
   <jre>
     <path>jre17</path>
@@ -24,11 +23,10 @@
     <requires64Bit>false</requires64Bit>
     <minVersion>17</minVersion>
     <maxVersion></maxVersion>
-    <initialHeapSize>512</initialHeapSize>
+    <initialHeapSize>1024</initialHeapSize>
     <maxHeapSize>2048</maxHeapSize>
     <opt>-Dorg.diylc.scriptRun=true</opt>
     <opt>-Dfile.encoding=UTF-8</opt>
-    <opt>-javaagent:lib/jar-loader.jar</opt>
     <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
     <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
     <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>

diylc/diylc-swing/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.diylc</groupId>
         <artifactId>diylc-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
     
     <artifactId>diylc-swing</artifactId>

diylc/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.diylc</groupId>
     <artifactId>diylc-parent</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.1</version>
     <packaging>pom</packaging>
     
     <name>DIY Layout Creator</name>