Commit graph

32380 commits

Author SHA1 Message Date
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
just-trey
6e5e3db627 Add AnkerMake M5 Profile 2022-10-22 19:56:51 -04: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
Stefano Serioli
d9ccbd2f66
Merge branch 'main' into work/cff 2022-10-20 12:21:22 -07: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
StuSerious
17627af0a0 improve CITATION.cff formatting && add keywords 2022-10-20 08:58:10 +02:00
StuSerious
96aeb1b581 update CITATION.cff to latest version 2022-10-20 08:53:54 +02:00
jelle spijker
ec9dcc43b4 Update changelog 5.2.1 2022-10-19 16:08:53 +02:00
jelle spijker
6860c6777c Update conandata for the 5.2.1 release
Fix translation:
- Italian (mea culpa)
- Chinese (我们很抱歉)
2022-10-19 15:52:29 +02:00
c.lamboo
c8a1b435a1 Add updated chinese translations 2022-10-19 15:48:48 +02:00
c.lamboo
8dbf69d2cc Revert incorrect update of translations
Accidentally overwrote the cn with cz translations
2022-10-19 15:48:36 +02:00
c.lamboo
15a39fc51b Update italian translations 2022-10-19 15:48:24 +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
c.lamboo
670f439fe2 update pt_br po files 2022-10-18 14:02:35 +02:00
c.lamboo
78ee77c361 update .mo files 2022-10-18 12:05:04 +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
Duarte Bragadesto
5a05f8ed4c
Update resources/definitions/blocks_pros30.def.json
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2022-10-14 17:42:17 +01:00
Duarte Bragadesto
01fb120883
Update Blocks Variants 2022-10-14 17:40:46 +01:00
Duarte Bragadesto
27b9c1e686
Update Standard Files 2022-10-14 17:38:37 +01:00
Duarte Bragadesto
7610d92a4f
Update Global Files 2022-10-14 17:37:32 +01:00
Duarte Bragadesto
b39a00b440
Update Blocks Global Files 2022-10-14 17:36:41 +01:00
Duarte Bragadesto
247d05e600
Update Meshes Blocks Printers 2022-10-14 17:35:04 +01:00
Duarte Bragadesto
1f12e42eb7
Update Blocks Extruder Files 2022-10-14 17:34:29 +01:00
Duarte Bragadesto
a70c773ae2
Definition Blocks Files 2022-10-14 17:33:41 +01: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
Mehmet Sutaş
d524a2f491
Merge branch 'Ultimaker:main' into main 2022-10-14 12:58:38 +03: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