31861 Commits

Author SHA1 Message Date
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
Jelle Spijker
dc2a8ffc60 Uninstall previous versions as a feature
Contributes to CURA-9157
2023-01-12 17:14:27 +01:00
Joey de l'Arago
116d2b9ce5 Add source path back to macOs installer for fetching dmg background image
CURA-6867
2023-01-12 16:19:24 +01:00
Joey de l'Arago
3a24ab1bee Merge branch 'main' into CURA-6867_pkg_for_macos 2023-01-12 15:25:32 +01:00
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.
CURA-6867
2023-01-12 14:15:53 +01:00
Jelle Spijker
37725db5e3 Added comment about requirements 2023-01-12 13:26:02 +01:00
Joey de l'Arago
05e1f57324 Revert dmg deprecation
CURA-6867
2023-01-12 13:24:28 +01:00
Jelle Spijker
ee29fa5b28 Specify requirements cache path 2023-01-12 13:04:48 +01:00
Jelle Spijker
28478710fc
Don't use requirements.txt 2023-01-12 10:58:05 +01:00
Jelle Spijker
3db6cb5dab
don't use requirements.txt 2023-01-12 10:57:16 +01:00
Jelle Spijker
7eadd0b56b
Use Cura requirements-conan-package everywhere 2023-01-12 10:53:00 +01:00
Jelle Spijker
789a24afb4
Don't use Conan 1.57.0 2023-01-12 10:49:36 +01:00
Jelle Spijker
e2252d818e
Reuse the requirements.txt from Cura across repo 2023-01-12 10:48:58 +01:00
c.lamboo
6ef0a35c15 Fix error where icon in the marketplace would not show
CURA-10139
2023-01-11 18:23:42 +01:00
Joey de l'Arago
ca34fe2d2d Change display now to include enterprise for MacOS
Add CFBundleVersionString, this might fix the app not showing up in search.

CURA-6867
2023-01-11 16:47:59 +01:00
Jelle Spijker
8e9289fd11 Disable ICE validation
https://stackoverflow.com/questions/1064580/wix-3-0-throws-error-217-while-being-executed-by-continuous-integration

Contribute to CURA-9157
2023-01-11 16:46:27 +01:00
Joey de l'Arago
50c4f777ab Fix Cura being moved on install
CURA-6867
2023-01-11 16:08:06 +01:00
Jelle Spijker
e31c2735dc Document Wix arguments
Contribute to CURA-9157
2023-01-11 15:36:57 +01:00
Joeydelarago
15c1ade87d Applied printer-linter format 2023-01-11 14:07:22 +00:00
Joey de l'Arago
0be12f7764
Merge pull request #14177 from RagingRoosevelt/main
Add Voron Trident profiles, bed meshes, variants
2023-01-11 15:06:13 +01:00
Casper Lamboo
5d4b6a0249
Merge pull request #14260 from Ultimaker/CURA-9157
Cura 9157
2023-01-11 14:18:22 +01:00
Jelle Spijker
639e014b36
Merge pull request #14039 from Ultimaker/CURA-6867_pkg_for_macos
[CURA-6867] Build PKG Installer for MacOS
2023-01-11 14:04:58 +01:00
Joeydelarago
6b463971b7 Applied printer-linter format 2023-01-11 12:43:14 +00:00
Joey de l'Arago
41c5f62c0a
Merge pull request #14083 from razzeee/add-anycubic-kobra-go
Add anycubic kobra go
2023-01-11 13:42:13 +01:00
Joey de l'Arago
9ae3bc37dc Rename MacOs -> MacOS
CURA-6867
2023-01-11 13:27:26 +01:00
Joey de l'Arago
11b2c94988 Remove build installer check.
CURA-6867
2023-01-11 13:03:16 +01:00
Jelle Spijker
358efa94b4
Merge pull request #14060 from Ultimaker/PP-286_make-buildplate-adhesion-extruder-optional_extruder
PP-286_make-buildplate-adhesion-extruder-optional_extruder
2023-01-11 12:51:54 +01:00
Jelle Spijker
4b8cae754c
Merge pull request #14061 from Ultimaker/PP-282_update-seam-corner-preference
PP-282_update-seam-corner-preference
2023-01-11 12:47:57 +01:00
Joey de l'Arago
a80390efb3 Make building easier without signing identity.
CURA-6867
2023-01-11 12:07:12 +01:00
Joey de l'Arago
ddb4547598 Use path to join paths
CURA-6867
2023-01-11 11:57:51 +01:00
ChipCE
e1f188a25e Add profile for Gutenberg G-Zero
By : Nguyen (minhtu.nguyen@gutenberg.co.jp)
2023-01-11 16:28:32 +09:00
Jelle Spijker
8ee1f61596 Merge remote-tracking branch 'origin/main' into CURA-9157 2023-01-10 17:38:31 +01:00
Jelle Spijker
4740172dcc Fix the file association
AnusNeukendeFlapperendePapegaaienDrol

Contribute to CURA-9157
2023-01-10 17:34:27 +01:00
Jelle Spijker
f99aeb9182 Set product code based app_name and version
This might fix upgrading of alpha versions

Contribute to CURA-9157
2023-01-10 17:00:09 +01:00
Jelle Spijker
81cb75ebd7 Allow for custom location installation
Contribute to CURA-9157
2023-01-10 16:59:17 +01:00
casperlamboo
1c0c85a3e0 Applied printer-linter format 2023-01-10 15:38:39 +00:00
Casper Lamboo
f601e9a9f6
Merge pull request #14231 from NARUTOfzr/main
Add Elegoo Neptune series Printer Configuration.
2023-01-10 16:37:27 +01:00
Jelle Spijker
fdfdc90a1a Fix file association
At least an attempt to.

Contribute to CURA-9157
2023-01-10 15:26:21 +01:00
Jelle Spijker
79c7f820e4 Fix file association
At least an attempt to.

Contribute to CURA-9157
2023-01-10 14:56:30 +01:00
Jelle Spijker
dc946b7444 Fix Firewall exception
Both Cura and CuraEngine are now added to the firewall for 127.0.0.1

No more bugging the user on initial startup

Contribute to CURA-9157
2023-01-10 11:59:02 +01:00
jspijker
ab86a85c77 Ignore redundant-override in the machine_* types 2023-01-10 11:02:08 +01:00
Joey de l'Arago
55531ab04b Remove old references to buildplate.
CURA-6867
2023-01-10 10:31:08 +01:00
Joey de l'Arago
b96c0dce39 Remove source path from build_macos.py because it is unused.
Refactor filename because it now includes the extension.

The component now has -Component.pkg instead of the installer usincg -Installer.pkg. They must have different names but now the input filename is used to upload the artifacts.

CURA-6867
2023-01-10 10:11:27 +01:00