Merge branch 'feature/multimeter3' into feature/chatbot

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

@@ -377,6 +377,10 @@
 					<changeType>BUG_FIX</changeType>
 					<description>Using board underside display sometimes makes other components semi-transparent</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Fixed Windows ZIP package issue with the bundled JRE</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>

diylc/diylc-swing/pom.xml

@@ -664,8 +664,8 @@
                                         <copy file="${project.basedir}/deploy/win/diylc-x64.exe" 
                                               tofile="${project.build.directory}/zip-temp/diylc.exe" />
                                         
-                                        <!-- Copy JRE -->
-                                        <copy todir="${project.build.directory}/zip-temp/jre">
+                                        <!-- Copy JRE to jre17 folder instead of jre -->
+                                        <copy todir="${project.build.directory}/zip-temp/jre17">
                                             <fileset dir="${jre.dest.win64}" />
                                         </copy>