diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index e3e4a5641..c7a05ccd3 100755 --- a/builds/linux/obs/PKGBUILD +++ b/builds/linux/obs/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3403 +pkgver=2.4.6.3404 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index 6b116578c..7cc242495 100644 --- a/builds/linux/obs/alldeps/PKGBUILD +++ b/builds/linux/obs/alldeps/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3403 +pkgver=2.4.6.3404 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog index 1ea4e66f7..6d6b11dbb 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3403) debian; urgency=medium +lpub3d (2.4.6.3404) debian; urgency=medium - * LPub3D version 2.4.6.292.3403_20230529 for Linux + * LPub3D version 2.4.6.293.3404_20230529 for Linux - -- Trevor SANDY Mon, 29 May 2023 01:54:35 +0200 + -- Trevor SANDY Mon, 29 May 2023 01:56:42 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 5eeb6f74a..0a2139136 100644 --- a/builds/linux/obs/alldeps/debian/lpub3d.dsc +++ b/builds/linux/obs/alldeps/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3403 +Version: 2.4.6.3404 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec index 8116f3016..44ef92880 100644 --- a/builds/linux/obs/alldeps/lpub3d.spec +++ b/builds/linux/obs/alldeps/lpub3d.spec @@ -120,7 +120,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3403 +Version: 2.4.6.3404 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -797,7 +797,7 @@ update-desktop-database || true %endif %changelog -* Mon May 29 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3403 +* Mon May 29 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3404 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog index 874d156f1..79affb842 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3403) debian; urgency=medium +lpub3d (2.4.6.3404) debian; urgency=medium - * LPub3D version 2.4.6.292.3403_20230529 for Linux + * LPub3D version 2.4.6.293.3404_20230529 for Linux - -- Trevor SANDY Mon, 29 May 2023 01:54:36 +0200 + -- Trevor SANDY Mon, 29 May 2023 01:56:44 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index c2d1af09e..9777e7896 100755 --- a/builds/linux/obs/debian/lpub3d.dsc +++ b/builds/linux/obs/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3403 +Version: 2.4.6.3404 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec index f71a5f029..51a61a552 100755 --- a/builds/linux/obs/lpub3d.spec +++ b/builds/linux/obs/lpub3d.spec @@ -82,7 +82,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3403 +Version: 2.4.6.3404 Release: 1%{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -313,7 +313,7 @@ update-desktop-database || true %endif %changelog -* Mon May 29 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3403 +* Mon May 29 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3404 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/utilities/version.info b/builds/utilities/version.info index 7da88df54..5bc9e1df6 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 292 3403 49669567f +2 4 6 293 3404 29c1120d1 diff --git a/gitversion.pri b/gitversion.pri index b31e1c7b8..3355c1161 100644 --- a/gitversion.pri +++ b/gitversion.pri @@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) { # Check if we do not have a valid version number (i.e. no version tag found) isEmpty(GIT_VERSION) { - GIT_REVISION = 292 + GIT_REVISION = 293 GIT_SHA = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE) GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) GIT_VERSION = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA} @@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) { # Get commit count GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) isEmpty(GIT_COMMIT) { - GIT_COMMIT = 3403 + GIT_COMMIT = 3404 message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~") } @@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) { GIT_VERSION = $$cat($$GIT_VER_FILE, lines) } else { message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~") - GIT_VERSION = $${VERSION}.292.3403.49669567f + GIT_VERSION = $${VERSION}.293.3404.29c1120d1 message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~") GIT_VERSION ~= s/\./" " } diff --git a/mainApp/blenderpreferences.cpp b/mainApp/blenderpreferences.cpp index 4c24574e0..d4dd305da 100644 --- a/mainApp/blenderpreferences.cpp +++ b/mainApp/blenderpreferences.cpp @@ -1780,8 +1780,8 @@ void BlenderPreferences::readStdOut() mStdOutList.append(StdOut); QRegExp rxInfo("^INFO: "); - QRegExp rxError("^(?:\\w)*ERROR: ", Qt::CaseInsensitive); - QRegExp rxWarning("^(?:\\w)*WARNING: ", Qt::CaseInsensitive); + QRegExp rxError("(?:\\w)*ERROR: ", Qt::CaseInsensitive); + QRegExp rxWarning("(?:\\w)*WARNING: ", Qt::CaseInsensitive); bool const hasError = StdOut.contains(rxError); bool const hasWarning = StdOut.contains(rxWarning); diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 530c47d3c..e0002ee90 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.292.3403 (29 05 2023 01:54:36) +LPub3D 2.4.6.293.3404 (29 05 2023 01:56:44) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index cf1117145..33f67038f 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.292.3403 (29 05 2023 01:54:36)

+

LPub3D 2.4.6.293.3404 (29 05 2023 01:56:44)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 4f5e65d27..90f6ac94f 100644 --- a/mainApp/extras/LPub3D_Npp_UDL.xml +++ b/mainApp/extras/LPub3D_Npp_UDL.xml @@ -14,8 +14,8 @@ ;; ;; Author......: Trevor SANDY ;; Name........: LPub3D_Npp_UDL.xml -;; Version.....: 2.4.6.292.3403 -;; Last Update.: Mon, 29 May 2023 01:54:36 +0200 +;; Version.....: 2.4.6.293.3404 +;; Last Update.: Mon, 29 May 2023 01:56:44 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY