Commit graph

32404 commits

Author SHA1 Message Date
Joey de l'Arago
582e85afe4
Merge pull request #14298 from mehmetsutas/main
Update Rigid3d Machine Definitions
2023-01-20 10:03:25 +01:00
sparkym3
a6e89a9d54 Make Creality Ender 3 S1 consistent 2023-01-19 11:49:41 -06:00
Joey de l'Arago
0f52521be2 Remove source path from extract tool creation. This can be derived from "self" that is being passed in.
CURA-9814
2023-01-19 14:02:06 +01:00
Joey de l'Arago
5af1f6e276 Rename extract function to generate to match better with conan style.
CURA-9814
2023-01-19 13:32:58 +01:00
Joey de l'Arago
5186b234dc Remove redundant code for merging po files
CURA-9814
2023-01-18 17:33:39 +01:00
Joey de l'Arago
18bfcd60ba Add the extractTool to the Cura conanfile
CURA-9814
2023-01-18 17:20:55 +01:00
Joey de l'Arago
67301a5b54 cleanup debugging changes script
CURA-9814
2023-01-18 10:36:45 +01:00
Joey de l'Arago
ee97962c31 Remove unused scripts 2023-01-18 10:36:09 +01:00
Joey de l'Arago
bcf715193a Use py file instead for extracting strings 2023-01-17 17:55:51 +01:00
Jelle Spijker
7ccb361b8f
Merge pull request #14202 from Ultimaker/CURA-10118_Enable_all_USB_ports_for_Mac
[CURA-10118] Change Only_List_USB
2023-01-17 15:51:37 +01:00
Joey de l'Arago
6054473036 Remove unused environment variable 2023-01-17 15:38:23 +01:00
Vandresc
82ed62941d Move_Intelrocking_To_Experimental_CURA-10168
Moving Interlocking to Experimental category.
2023-01-17 11:19:09 +01:00
Joey de l'Arago
332d41c22f Remove unused environment variable 2023-01-17 10:53:54 +01:00
jspijker
99f0e49934 Use Cura requirements
Contributes to CURA-6867 & CURA-9157
2023-01-16 17:26:58 +01:00
Jelle Spijker
5c38f62d39
Merge pull request #14270 from Ultimaker/CURA-6867_pkg_for_macos
[CURA-6867] Fix Cura being moved on install
2023-01-16 16:56:18 +01:00
Joey de l'Arago
912429bb18 make print statement more informative
CURA-9814
2023-01-16 16:04:40 +01:00
Joey de l'Arago
c0b120b2fd Put app name in quotes because it has spaces in it.
CURA-9814
2023-01-16 15:58:34 +01:00
Joey de l'Arago
3478c0af6c Remove unused translation script
CURA-9814
2023-01-16 15:56:42 +01:00
Joey de l'Arago
c8ba9bccdb Remove xtest as we will no longer be running this locally so it is not useful.
CURA-9814
2023-01-16 15:52:53 +01:00
Joey de l'Arago
ec26cd509e Extend comment
CURA-9814
2023-01-16 15:50:52 +01:00
Joey de l'Arago
d24bd3f979 Use a loop to go over files instead of passing them all in as arguments so that we don't go over the argument size limit.
CURA-9814
2023-01-16 15:50:19 +01:00
Joey de l'Arago
20778f3d10 Move translation scripts to Cura from Uranium
CURA-9814
2023-01-16 15:46:25 +01:00
Joey de l'Arago
e834cce32a Pass the app name into the build_macos script so that it matches the app name used in UltiMaker-Cura.spec.jinja 2023-01-16 15:29:38 +01:00
Joey de l'Arago
36d3662750 Merge branch 'main' into CURA-6867_pkg_for_macos 2023-01-16 13:53:14 +01:00
Joey de l'Arago
1bc764f019 Only search for non usb device printers when using Linux or MacOS
CURA-10118
2023-01-16 11:07:55 +01:00
Joey de l'Arago
7eb75f01d7 Merge remote-tracking branch 'origin/CURA-6867_pkg_for_macos' into CURA-6867_pkg_for_macos 2023-01-16 10:22:18 +01:00
Joey de l'Arago
902f4ef02e
Update packaging/MacOS/build_macos.py
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2023-01-16 10:22:06 +01:00
Joey de l'Arago
763dde61c8 Add comment to deprecate
CURA-6867
2023-01-16 10:21:24 +01:00
Joey de l'Arago
cf4752aa0b Mention dmg in arg parser.
Fix spelling

CURA-6867
2023-01-16 10:21:04 +01:00
Joey de l'Arago
1554f50518 Use app name so that enterprise is in the name
CURA-6867
2023-01-16 10:20:06 +01:00
mehmetsutas
18a5059bf6 Applied printer-linter format 2023-01-14 20:06:57 +00:00
Mehmet Sutaş
0d38f25553 Merge branch 'main' of https://github.com/mehmetsutas/Cura 2023-01-14 23:05:49 +03:00
Mehmet Sutaş
1fa2eb9565 Update rigid3d_zero3.def.json 2023-01-14 23:05:46 +03:00
mehmetsutas
565febad0a Applied printer-linter format 2023-01-14 19:31:50 +00:00
Mehmet Sutaş
a9bd21e1b7 Rigid3D Quality Definition Updates 2023-01-14 22:30:43 +03:00
Mehmet Sutaş
0f9976c6ac Merge branch 'main' of https://github.com/mehmetsutas/Cura 2023-01-14 21:43:19 +03:00
Mehmet Sutaş
8b1ab32796 Rigid3D Definitions Update 2023-01-14 21:42:28 +03:00
mehmetsutas
c4b1f1c20d Applied printer-linter format 2023-01-13 23:53:54 +00:00
Mehmet Sutaş
a5bc618cf0 Merge branch 'main' of https://github.com/mehmetsutas/Cura 2023-01-14 02:52:21 +03:00
Joey de l'Arago
7e88e3a019 Addd display name to bundle identifier as well so that enterprise can be installed alongside normal Cura.
CURA-6867
2023-01-13 17:31:23 +01:00
Joey de l'Arago
b72e29f33b typo
CURA-6867
2023-01-13 16:11:45 +01:00
Joey de l'Arago
5b8ef526fb Use bundle identifier including version. This stops the installer from overwriting previous installs. This is circumventing the intent of the pkg, it should always upgrade/update never double install. It will work though 🤷
CURA-6867
2023-01-13 15:45:27 +01:00
Jelle Spijker
24cb9e16a8 Use auto generated shortcut Guid
This should remove the short-cuts

Contributes to CURA-9157
2023-01-13 15:43:04 +01:00
Joey de l'Arago
c04cc7809a Only use end of cura version for identifier. The "/" is an illegal character in the distribution.xml
CURA-6867
2023-01-13 13:38:10 +01:00
jspijker
fe4679e4e8 Check before removing
Cura shouldn't crash when the abstract machine isn't in the other_machine_stack
2023-01-13 13:30:09 +01:00
Jelle Spijker
5542eec0c4 Allow for uninstall of previous same major.minor.path versions
Contributes to CURA-9157
2023-01-13 11:39:34 +01:00
Jelle Spijker
df5544444d Still show the uninstall feature in the CE edition
Contributes to CURA-9157
2023-01-13 11:39:01 +01:00
Joey de l'Arago
6ca4af399a Use different identifier for different versions so that they don't replace eachother.
CURA-6867
2023-01-13 11:33:43 +01:00
Joey de l'Arago
65bf56e9fa Installer was replacing any previous cura version when installing. Casuing strange install locations. Now it will only replace cura version with the exact same CURA_CONAN_VERSION
CURA-6867
2023-01-13 10:18:33 +01:00
Joey de l'Arago
0f683d301a Remove double .dmg at the end of file name.
Fix typo in msi_instaler

CURA-6867
2023-01-13 09:26:54 +01:00