Merge remote-tracking branch 'main/master' into cz-electron-v19

CHANGELOG.txt

@@ -1,3 +1,4 @@
+v1.0.332: Updated SSL certificates
 v1.0.331: Fixed bug in Firmware flashing tool
 v1.0.330: Fixed bug in Mobile Jog wizard, updated Pi install script
 v1.0.329: Testing version for random start bug

app/js/main.js

@@ -312,7 +312,7 @@ function jobNeedsHoming() {
         var dialog = Metro.dialog.create({
           clsDialog: 'dark',
           title: "<i class='fas fa-exclamation-triangle'></i> Job uses Machine Coordinates:",
-          content: "<i class='fas fa-exclamation-triangle fg-darkRed'></i> Tip: The GCODE file you loaded, contains G53 commands. Please make sure to HOME the machine to establish the Machine Coordinate (G53) System properly to prevent crashes.",
+          content: "<i class='fas fa-exclamation-triangle fg-darkRed'></i> Tip: The GCODE file you loaded contains G53 commands. Please make sure to HOME the machine to establish the Machine Coordinate (G53) System properly to prevent crashes.",
           actions: [{
             caption: "Close",
             cls: "js-dialog-close",

fullchain1.pem

@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFNDCCBBygAwIBAgISBKFO/ZFtv/n8hx0VTklZ+/HhMA0GCSqGSIb3DQEBCwUA
+MIIFNjCCBB6gAwIBAgISA0PzyGCRgKbtxqWSX04IMyd9MA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMjA3MDYxOTA1NTRaFw0yMjEwMDQxOTA1NTNaMCMxITAfBgNVBAMT
+EwJSMzAeFw0yMjEwMDMxMjMzMDVaFw0yMzAxMDExMjMzMDRaMCMxITAfBgNVBAMT
 GG15bWFjaGluZS5vcGVuYnVpbGRzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALK7bbNzrh66SIkJMYJoJxRqZ1DzkV1JNdXhLnAQcQPBNWryamL9
-Zt8ZvXC7X2BsL2ulWaoyDtaPvMGJLsfp5lnRpexS/iDNmK65cubbO2ixAV7LeEc0
-cIcuMRwCLbvt7lpKUlhQR32MaifTeeHY5+wuho4wucpE3T6XfPs0Dz8BrbJwo822
-IWU4dFPBqa9vZBbs0bx6aAKcAXltOqKlUzOWQ8g9EmqRdFdwlKoA96SEayjYP2aN
-lCeyErACxZWVLJFPMGSk+Coy0SPF8QN0KWwx7jyJ5ytW/0rSnKcpXOWJzOj5H82+
-vlu3LJzmyEl364pzOlw514EYPf4Vj7Jsks8CAwEAAaOCAlEwggJNMA4GA1UdDwEB
+ADCCAQoCggEBAMuI1z4Ac6M+W2q01W0Qe8CmvK4LKNZ0sUWgMM2nYK3DUj96Kvfk
+G8BD6RJUp7KUoKdN5StTnYYhRkBGUNnZubnqAn+E1fvqtuKVyAF62hsUCUNE/bfH
+7me6BIDfP0xD82/+GlkMaDi3X0upl7VnE5uJ5ZjCWE+FHjy6DidOyUD7qdPw2gWw
+sIaocA2hjaxxFv9KuiFJ8fS4rhYSD7l6COUELTwjAuz6fqXRPIfEHdFr9qEivLbr
+bBLw7TXdgO0x7vIcVN6PsniRTInzWmhqFH9xl5xbfJNDwDJmyU4UjPTYSxRsKqUO
+BEp5W0roWWjTKGLpvMLrMcS+bZ29ltTEpS8CAwEAAaOCAlMwggJPMA4GA1UdDwEB
 /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
-BAIwADAdBgNVHQ4EFgQUwo2ggVV+n2htQN9oDy+5PcwGCCIwHwYDVR0jBBgwFoAU
+BAIwADAdBgNVHQ4EFgQUmFYEQfug/g0kGKMDpdabAb/DUEwwHwYDVR0jBBgwFoAU
 FC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzAB
 hhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5p
 LmxlbmNyLm9yZy8wIwYDVR0RBBwwGoIYbXltYWNoaW5lLm9wZW5idWlsZHMuY29t
 MEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUH
-AgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBAgYKKwYBBAHWeQIEAgSB
-8wSB8ADuAHUARqVV63X6kSAwtaKJafTzfREsQXS+/Um4havy/HD+bUcAAAGB1R6B
-SAAABAMARjBEAiBcuxzOyjtzBYEhkpC1e6qwiprg/gcIq7RtHGinywBLMQIgX680
-KYhu8H5C03XcjwqYFJpfdhBq7JDJzpg34EkbxYcAdQDfpV6raIJPH2yt7rhfTj5a
-6s2iEqRqXo47EsAgRFwqcwAAAYHVHoMZAAAEAwBGMEQCIE4wjFCDKgzZwQwoE4Pg
-G83VxoAgWr/R0fUshXeyVPpUAiBM6du3h7a9T0uGPzGZna5DZChhGop4KduYT5z+
-ri6nETANBgkqhkiG9w0BAQsFAAOCAQEApXawUKZw9fYBlMg/afGDRq+RO0mmfHc2
-IK4NZHbeszUv8hZfrHHUxoQoIe8+lY8HPxCjUR3lvauP4H7uQFSkgUr3NrzEkzqM
-1ldqWf6P+XHoamgozlr7/2dgzgW30iuI5VrHahd1KSxYCd0dct+gxrocyq8NJKkc
-Fw6jt1DlOZdHM30BWFIO7kk+9NFGDCuAHJlX7kCNwaKoHoqhiPMa3ovDDpyOUoFR
-tsnM+J7mnc1+bsIa+QMY7veET/nk1yZhUJxMa472WpciQtMyj+6UTbh1/HkD+yUx
-XHacIa6YNn3bmk5hrqki+tG/PGJ9BWe34o6mB2cMzMZg7U4s0VZIPQ==
+AgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB
+9QSB8gDwAHUAejKMVNi3LbYg6jjgUh7phBZwMhOFTTvSK8E6V6NS61IAAAGDngza
+kgAABAMARjBEAiAAqOTFLDewoNbNxo+wvuw1KnfibWRyvUEVCNjnGPAVlwIgLKTC
+7e7d9gmyjVVHr4dx2QEQhpiwFx3CtCUAEFFcggMAdwDoPtDaPvUGNTLnVyi8iWvJ
+A9PL0RFr7Otp4Xd9bQa9bgAAAYOeDNo/AAAEAwBIMEYCIQDLFWM84ZbeG/TAXOhy
+7nyqlJLUtDWfWM2w93ykErxo9QIhAPV/Y8K2a19AgFdicpLSxLAao9NrK8Cq6rN6
+KO1Hj6+KMA0GCSqGSIb3DQEBCwUAA4IBAQAYUnYYNZEypFbSHQ8BTd28WAoDLW5i
+CVeWRj8Km+gps9Qo+y9g2P4IGOBxMoxYYxzkfJY7Wmq8R4UWApkQE3JhOVdV2XC1
+eZA3WPSaVe8lMHXatY/Z8PKYmY8LwhYiZqsK7Dnll506QkYK7njzurlwoTEj+0TN
++9Eu+l/YbC7u8BVdO4tplCFLbz9f12WHAf/JLDsw228lBhrOLhAre44C/FSt7ByT
+U/o7W3q2291zQimfvvQAl04b0913ezlRZPG8UB1lBYY3UFsiZGQp+xCIUMs7O6BD
+YM7tyCC5LS0V+e+obCKyzb/l3yN5O8UIDYkunbBMBvT9me8S6TB2DwXE
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw

privkey1.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCyu22zc64eukiJ
-CTGCaCcUamdQ85FdSTXV4S5wEHEDwTVq8mpi/WbfGb1wu19gbC9rpVmqMg7Wj7zB
-iS7H6eZZ0aXsUv4gzZiuuXLm2ztosQFey3hHNHCHLjEcAi277e5aSlJYUEd9jGon
-03nh2OfsLoaOMLnKRN0+l3z7NA8/Aa2ycKPNtiFlOHRTwamvb2QW7NG8emgCnAF5
-bTqipVMzlkPIPRJqkXRXcJSqAPekhGso2D9mjZQnshKwAsWVlSyRTzBkpPgqMtEj
-xfEDdClsMe48iecrVv9K0pynKVzliczo+R/Nvr5btyyc5shJd+uKczpcOdeBGD3+
-FY+ybJLPAgMBAAECggEBAKYGsVq3JJFqnaKeJZ1rvpGaXaq29tte/GFXMdnri+/e
-9A4KbYTSu1KXCIDFrU1WcZ5fFLGimmH5V2+4TPprbg0VUDn8xhAWq7PylKeaEs+n
-TQyPmYUbU0RfRkMsSut9k6HP1DoxKJeZbardKSUAZj/g4CEJZixcV+Ciu/hlXZw6
-FwMwFSRZWTP1SsKvmNmYclka7ov8hd9ZD/L6D1d827JlZqqrxW6aAJBqVcIo6LFI
-razHoKIl/Doo/cHuIxwaaXRB/q9723DJ+p2Xv53+Ft3mC7pLg4YnuaSR+fb0y8vd
-jBArL2SdITCtqvkXhqZ3hAJXTxphZhHYuLQfMjbDU5ECgYEA4Q5Gt+JhrW0UqjXR
-LdXyoNOtBRU7vLIjN1WH2YNKe16glKmdR+rneGt+cMXV0ipJ/FkcN3ZOT37fPapt
-c6A9oCnudTgyKkeya7blnSN/28zWIJtd8445X2zSFDoTpJ2MeW4hsg/PBv9aUkGl
-BObllAjLY+z9epaUCuDcunAEIIsCgYEAy06cJftdv4v9ek27wN4ZYP/Ch69ukPUF
-6rI5DT+zK82Wcz8lE5DDsp/c4wEHniwdyriZzb+xLNuZf+xCqwny+vqpI7lK+Cbr
-5g/kEKtkMrn9dV7vhk6TT2WErDddg92cY8NojtqfIUN9bWgfW6CuRTKrVrE8yBU0
-HWUyjJYke00CgYEApHScNK8WlXZKTX76FjZrEB7eJgK4HlFF7p9voACSosgpK7ku
-F2mOL67NPHc0olkIq4AqYFTxMKITW6p4RK/pmGpLuBiSf9bYiGGkNEnGmsV6C2W9
-J8bcIeEROnqd9AK0rd9OfCGVNRXP2J/jiEt5o80xYxnAuJ3kHHbolMxaF7UCgYEA
-np3/L5b05mvW4GPjVy8wx7/jSq8xaUDxU9Gmt1J6fHNSrSmXyLMKK8OTtzvncJ1k
-xPPPc3naRnAyS17OCNmjS/LioW+AMSlUpNLDEcpWS0lWmQrvf26weaJvp1kuyaHN
-0Pv1CHdC7dXU9tXkmT08mdpVWTbAgC4i0chRbuP5JIUCgYBblq4CRo8qyMwm54H3
-BFX1UZWJrCzC7AohAs1j1LvCshrFI+Eu5DL2Wr80PxuLs1zDxqLAZQWTlifdEaaV
-RrbpsIUDTTlPQ6aPW1zv1F1MV73DSWD6a4C6cAJEMdlkpD1Sb5jJmQKEq30k2vZd
-YrcknbQLqQ+FwphIOnAJjkXW6g==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDLiNc+AHOjPltq
+tNVtEHvApryuCyjWdLFFoDDNp2Ctw1I/eir35BvAQ+kSVKeylKCnTeUrU52GIUZA
+RlDZ2bm56gJ/hNX76rbilcgBetobFAlDRP23x+5nugSA3z9MQ/Nv/hpZDGg4t19L
+qZe1ZxObieWYwlhPhR48ug4nTslA+6nT8NoFsLCGqHANoY2scRb/SrohSfH0uK4W
+Eg+5egjlBC08IwLs+n6l0TyHxB3Ra/ahIry262wS8O013YDtMe7yHFTej7J4kUyJ
+81poahR/cZecW3yTQ8AyZslOFIz02EsUbCqlDgRKeVtK6Flo0yhi6bzC6zHEvm2d
+vZbUxKUvAgMBAAECggEAMNxv97V6DUVqAsrYta8QVmZww0NwkVNAP1u+e5Bj+DL8
+qrp0WEBNnTFwYXMrMwbVLnTXwDf5h/qy97kprbLEEGqqINzN1gU51Flqw1gvxfJg
+auLEGfuIMySH8jwl4PQrG8afoqME3iC/YtWa0vSk02EeWjbFpolpgeCUh0E1tUCH
+Zs74SWGJgWJQ2r88k0CWj/ARkFpUv3I+YGQZJHr2+cq5fPZvongHzsv9N7Tq/7UA
+L0APgz2e1FUOgK0/CaFHKfZo8IkFv7cTk9mRAh7ez9KsMUHkhTZb5KI2xZIy1E55
+cGpBjMNz0UIhxXPnW5+HU8BudLlWJ0TUJDDbiaphCQKBgQDzqlvIqahUgUzk6E0j
+t3mpLsphMLuucG/KIH9V+3F8W4Y5XjiOmUjuhqnZxUtBZK3X3WGhb8iv8HffXXNA
+AAVD2q4zfiu1GK9wf7vvEKuqYFJwrh2+DgCKFGSyQAIDX4dN2A7i+XygoT7mYP8O
+Vn13hx30KnsKWtZWPhTYaZLCFQKBgQDV1m3BFhm5GGoaSROqCuGxdoJwM3tzw/ST
+A6w/NVF4dkOQ1+myObJ4PObJnfC4z/++udt0OrwPdkG/9ThBf3ujLf1OH8bmVpw+
+wq86mSxxmF6HiS1lG1Y7KVkBh/7XpVbA4vDlV0wxe/6LYAxDi6xi6dN12imFb+Do
+rI71NnXPMwKBgQCLouQocXmCu/qJ78pNHpb86lCWM+xKQir+JXNznb3iazzXYXR9
+28Ac2VU69EJ1PjIV08tgTYQvt1mqyo4CbkCWKxrLbZG0nWnkyX60uNP3tm1oH4/x
+22pZtugh8mZ08mjCpn+ZeSn/j4hRU+K2n8AVIHx88V9Dhtzv3XHqt02gJQKBgQCw
+oMbVh6DFr/HsNlJk0UotIJuLfCrLq594U79SEoNyAhW7LW0eRuQwxvVGsgvlTAGO
+E8y+S8mM5/xVR4MpLtj8J3+kqUDMf9vdR0ggGeeJCPeD8n4plpP6mCOpzSBmFW78
+MjgS57HK6gWOME7Q+CzzIvsEzKghTRE0f1wyFcLn2wKBgHWfv+pMipMZ4+dC681w
+n4GE6aezivS/dU25dA5D1tchSWgdJscAojalFPPsz+nHsi0sLVrfwvySHUzi9vZG
+JL/jNvCrFlFjc/T3CVnhRE1jDtzjJ1rNszxR7I55Ixdi5cherliqcvU4m48shqa0
+r3mOS1fIqlNgZfY+L84V4xG6
 -----END PRIVATE KEY-----