 WinstonMao
|
d072c71621
Sync with main branch
|
10 months ago |
|
mao
|
a7082fde2b
Updated json format
|
2 years ago |
|
WinstonMao
|
4ae8744d22
Merge branch 'Ultimaker:main' into main
|
2 years ago |
|
Jelle Spijker
|
7ccb361b8f
Merge pull request #14202 from Ultimaker/CURA-10118_Enable_all_USB_ports_for_Mac
|
2 years ago |
|
Joey de l'Arago
|
6054473036
Remove unused environment variable
|
2 years ago |
|
Joey de l'Arago
|
332d41c22f
Remove unused environment variable
|
2 years ago |
|
jspijker
|
99f0e49934
Use Cura requirements
|
2 years ago |
|
Jelle Spijker
|
5c38f62d39
Merge pull request #14270 from Ultimaker/CURA-6867_pkg_for_macos
|
2 years ago |
|
Joey de l'Arago
|
c0b120b2fd
Put app name in quotes because it has spaces in it.
|
2 years ago |
|
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
|
2 years ago |
|
Joey de l'Arago
|
36d3662750
Merge branch 'main' into CURA-6867_pkg_for_macos
|
2 years ago |
|
Joey de l'Arago
|
1bc764f019
Only search for non usb device printers when using Linux or MacOS
|
2 years ago |
|
Joey de l'Arago
|
7eb75f01d7
Merge remote-tracking branch 'origin/CURA-6867_pkg_for_macos' into CURA-6867_pkg_for_macos
|
2 years ago |
|
Joey de l'Arago
|
902f4ef02e
Update packaging/MacOS/build_macos.py
|
2 years ago |
|
Joey de l'Arago
|
763dde61c8
Add comment to deprecate
|
2 years ago |
|
Joey de l'Arago
|
cf4752aa0b
Mention dmg in arg parser.
|
2 years ago |
|
Joey de l'Arago
|
1554f50518
Use app name so that enterprise is in the name
|
2 years ago |
|
Joey de l'Arago
|
7e88e3a019
Addd display name to bundle identifier as well so that enterprise can be installed alongside normal Cura.
|
2 years ago |
|
Joey de l'Arago
|
b72e29f33b
typo
|
2 years ago |
|
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 🤷
|
2 years ago |
|
Jelle Spijker
|
24cb9e16a8
Use auto generated shortcut Guid
|
2 years ago |
|
Joey de l'Arago
|
c04cc7809a
Only use end of cura version for identifier. The "/" is an illegal character in the distribution.xml
|
2 years ago |
|
jspijker
|
fe4679e4e8
Check before removing
|
2 years ago |
|
Jelle Spijker
|
5542eec0c4
Allow for uninstall of previous same major.minor.path versions
|
2 years ago |
|
Jelle Spijker
|
df5544444d
Still show the uninstall feature in the CE edition
|
2 years ago |
|
Joey de l'Arago
|
6ca4af399a
Use different identifier for different versions so that they don't replace eachother.
|
2 years ago |
|
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
|
2 years ago |
|
Joey de l'Arago
|
0f683d301a
Remove double .dmg at the end of file name.
|
2 years ago |
|
Jelle Spijker
|
dc2a8ffc60
Uninstall previous versions as a feature
|
2 years ago |
|
Joey de l'Arago
|
116d2b9ce5
Add source path back to macOs installer for fetching dmg background image
|
2 years ago |
|
Joey de l'Arago
|
3a24ab1bee
Merge branch 'main' into CURA-6867_pkg_for_macos
|
2 years ago |
|
Joey de l'Arago
|
e25730ad77
We hit the max 10 inputs for the workflow. Remove the pkg input and use the msi one temporarily instead.
|
2 years ago |
|
Jelle Spijker
|
37725db5e3
Added comment about requirements
|
2 years ago |
|
Joey de l'Arago
|
05e1f57324
Revert dmg deprecation
|
2 years ago |
|
Jelle Spijker
|
ee29fa5b28
Specify requirements cache path
|
2 years ago |
|
Jelle Spijker
|
28478710fc
Don't use requirements.txt
|
2 years ago |
|
Jelle Spijker
|
3db6cb5dab
don't use requirements.txt
|
2 years ago |
|
Jelle Spijker
|
7eadd0b56b
Use Cura requirements-conan-package everywhere
|
2 years ago |
|
Jelle Spijker
|
789a24afb4
Don't use Conan 1.57.0
|
2 years ago |
|
Jelle Spijker
|
e2252d818e
Reuse the requirements.txt from Cura across repo
|
2 years ago |
|
c.lamboo
|
6ef0a35c15
Fix error where icon in the marketplace would not show
|
2 years ago |
|
Joey de l'Arago
|
ca34fe2d2d
Change display now to include enterprise for MacOS
|
2 years ago |
|
Jelle Spijker
|
8e9289fd11
Disable ICE validation
|
2 years ago |
|
Joey de l'Arago
|
50c4f777ab
Fix Cura being moved on install
|
2 years ago |
|
Jelle Spijker
|
e31c2735dc
Document Wix arguments
|
2 years ago |
|
Joeydelarago
|
15c1ade87d
Applied printer-linter format
|
2 years ago |
|
Joey de l'Arago
|
0be12f7764
Merge pull request #14177 from RagingRoosevelt/main
|
2 years ago |
|
Casper Lamboo
|
5d4b6a0249
Merge pull request #14260 from Ultimaker/CURA-9157
|
2 years ago |
|
Jelle Spijker
|
639e014b36
Merge pull request #14039 from Ultimaker/CURA-6867_pkg_for_macos
|
2 years ago |
|
Joeydelarago
|
6b463971b7
Applied printer-linter format
|
2 years ago |
