jelle spijker
fc26413347
Check against str for conf_info bash path
2022-11-02 21:16:18 +01:00
Jelle Spijker
f1936dc37c
Ensure that gettext bin can be found
2022-10-25 02:41:35 +02:00
Jelle Spijker
10710fe838
Update the po files
...
conan install will now update the the po files
2022-10-23 15:55:56 +02:00
Jelle Spijker
e400f04319
Only run gettext in a bash environment
...
Once the msys2 (m4, autoconf, automake) are fixed
we can use the msys2 recipe.
For now people can use their own bash environment
on Windows by setting the tools.microsoft.bash:path
and tools.microsoft.bash:subsystem when needed.
2022-10-23 15:27:50 +02:00
Jelle Spijker
c45f371582
Merge branch 'main' into boyscout_translations_conan_package
2022-10-23 15:18:21 +02:00
Jelle Spijker
9f9723906f
Merge remote-tracking branch 'origin/boyscout_translations_conan_package' into boyscout_translations_conan_package
2022-10-23 15:17:34 +02:00
Jelle Spijker
035815b421
Only build mo on Unix
...
Once M4, autoconf and automake are Conan v2 ready this can be reversed
2022-10-21 17:19:55 +02:00
Joey de l'Arago
a9f4b2da71
Merge pull request #12254 from Ultimaker/fix_materials_list_too_small
...
Allow text to be wider if favourite button is not shown
2022-10-21 11:16:26 +02:00
Joey de l'Arago
09c86e6b98
Merge pull request #13319 from Ladnessness/main
...
Update Actions.qml
2022-10-21 10:26:47 +02:00
Remco Burema
7f4777fdf6
Fix unit-tests.
...
part of CURA-9769
2022-10-20 11:34:44 +02:00
Remco Burema
b4405d886b
Reverse sorting, newer machines on top.
...
Same brand or name, but with a higher number should generally be first, so reverse sorting.
CURA-9769
2022-10-20 10:24:01 +02:00
Jaime van Kessel
f8b0305bae
Merge pull request #13575 from Ultimaker/PP-42_improved_initial_layer_settings
...
PP-42_improved_initial_layer_settings
2022-10-19 11:58:47 +02:00
jelle Spijker
96363c652a
Build mo translation files when creating conan package
...
Added a build step which uses the Conan package gettext as a tool_requires
to convert the po files to mo files and store these in the resources folder
When on Windows the msys2 recipe is used to ensure that we have a bash environment
to run gnu gettext
Creating the mo files as part of the conan package will ensures that we no longer
need to store them in the cura-binary-data and generate them manually. This should
result in less risk of human error during the release cycle
2022-10-19 01:45:18 +02:00
jelle spijker
1f5336805c
Add 5.3.0-alpha entry
2022-10-17 16:29:06 +02:00
Rijk van Manen
d5020425bc
fix mistakes
...
PP-42
2022-10-17 15:55:03 +02:00
Rijk van Manen
c47243cdde
remove specific initial layer bed temperature
...
Forgot to remove an initial layer setting. PP-42
2022-10-17 14:52:10 +02:00
Rijk van Manen
7612faea79
make initial flow settings a fraction of the initial layer flow
...
PP-42
2022-10-17 14:51:05 +02:00
Rijk van Manen
9f6a47f04a
Merge branch 'main' into PP-42_improved_initial_layer_settings
2022-10-17 13:51:20 +02:00
Jelle Spijker
35a62af035
Merge branch '5.2'
2022-10-16 18:00:57 +02:00
jelle Spijker
a18d3b909d
use new master/s-line as tip
2022-10-16 18:00:31 +02:00
c.lamboo
4a30bbaf2b
Merge branch '5.2'
2022-10-14 16:39:05 +02:00
Casper Lamboo
c5ee307393
Merge pull request #13551 from Ultimaker/5.2_translations
...
5.2 translations
2022-10-14 16:17:09 +02:00
Casper Lamboo
722e659ec0
Merge pull request #13520 from sustmi/5.2_translations-cs_CZ
...
Czech translations for v5.2
2022-10-14 16:01:21 +02:00
c.lamboo
cfaa3ffe8e
Update translations
2022-10-14 15:57:32 +02:00
Remco Burema
e505396fe7
More updates for the changelog for 5.2
2022-10-14 15:40:58 +02:00
Remco Burema
be3c312c32
Update changelog for 5.2
2022-10-14 15:23:17 +02:00
jelle spijker
5c284cd094
Fix nightly builds
2022-10-13 13:00:08 +02:00
Remco Burema
ce6f7c20ca
Abstract printer types: Sort newer ones on top.
...
Partial (manual) revert of initial implementatio of CURA-9748 -- that first commit deleted the 'reverse = True' needed to make sure (read hack) the most recent abstract printer types on top, instead of the other way around.
2022-10-12 16:14:32 +02:00
Remco Burema
d3305585fc
Merge branch '5.2'
2022-10-12 15:33:26 +02:00
Casper Lamboo
c625d35f33
Merge pull request #13546 from Ultimaker/CURA-9746_recommened_intent_tooltips
...
[CURA-9746] Re-add tooltips for intent profile selection in recommended.
2022-10-12 15:31:36 +02:00
c.lamboo
e25048d88a
Add width to intent tool tips
...
CURA-9746
2022-10-12 15:29:08 +02:00
Remco Burema
7e2062feec
Merge pull request #13542 from Ultimaker/CURA-9670
...
Fix correct version number in uninstaller for patch releases
2022-10-12 15:01:50 +02:00
Remco Burema
db54c95d88
Merge pull request #13541 from Ultimaker/CURA-9526
...
Ensure the complete install folder is removed
2022-10-12 15:01:41 +02:00
Remco Burema
e9b268bc06
Review suggestion; best practices; javascript.
...
done as part of CURA-9746
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-10-12 14:54:33 +02:00
Remco Burema
8db3f02a4f
Re-add tooltips for intent profile selection in recommended.
...
They where skipped over when transferring the radio bar to the current large button based setup.
CURA-9746
2022-10-12 14:43:55 +02:00
c.lamboo
9bacbb5825
Sort cloud printers in printer selection dropdown menu
...
CURA-9748
2022-10-12 14:37:26 +02:00
Casper Lamboo
a5445111a4
Merge pull request #13544 from Ultimaker/CURA-9689_filter_config_list
...
[CURA-9689] Filter material lists for compatible printers.
2022-10-12 13:57:55 +02:00
Remco Burema
7dd37c6a53
Filter material lists for compatible printers.
...
So that only one identical entry shows up per material, per extruder (per printer).
CURA-9689
2022-10-12 12:02:20 +02:00
Jelle Spijker
547d801209
Add VERSION to REG_APP_PATH and UNINSTALL_PATH
...
This should ensure that updating a patch doesn't override
the uninstaller in the settings->Installed apps
Fixes : #13337
CURA-9670 Correct the version number in the uninstaller
2022-10-12 11:48:10 +02:00
Jelle Spijker
e28e25281c
Ensure the complete install folder is removed
...
Fixes: CURA-9526 Uninstalling main build doesn't remove all files
2022-10-12 10:42:44 +02:00
Remco Burema
c46e5e430e
Merge branch '5.2'
2022-10-12 09:10:32 +02:00
Jelle Spijker
74f864e285
Merge pull request #13538 from Ultimaker/CURA-7800_wall_count_when_tree
...
[CURA-7800] For tree support default should be support wall count 1.
2022-10-12 07:47:31 +02:00
Tim
a51b03b9f4
Fix startup on Zorin OS
...
First unset QT_STYLE_OVERRIDE then start Cura
(cherry picked from commit 6989aabff5
2022-10-11 16:30:45 +02:00
Jelle Spijker
e8cf55c5c2
Merge pull request #13525 from Tim453/master
...
Fix startup on Zorin OS
2022-10-11 16:29:14 +02:00
Jelle Spijker
7faf2f63da
Remove 5.3.0-alpha from the conandata
...
When the `conan install . ` command is run without a version specifier it would take the dependencies for 5.3.0-alpha
on the 5.2 branch.
2022-10-11 15:05:46 +02:00
Tim
6989aabff5
Fix startup on Zorin OS
...
First unset QT_STYLE_OVERRIDE then start Cura
2022-10-11 14:43:34 +02:00
Miroslav Sustek
51a90bc837
Czech translations for v5.2
2022-10-10 20:16:31 +02:00
Jelle Spijker
bbda089ae9
Add quotes around ref_name
2022-10-10 15:46:52 +02:00
Jelle Spijker
fce7df29e0
remove debugging statement
2022-10-10 15:44:46 +02:00
Jelle Spijker
2cc923761d
Fix missing quote
2022-10-10 14:58:46 +02:00
