GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 02:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,448 Commits 295 Branches 268 Tags
Commit Graph

31448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remco Burema
7e695908cf Rename confusing parameter. 
part of CURA-10092
 2023-01-25 11:44:46 +01:00
Remco Burema
e2f7ef8b8b Add typing to Retract-Continue script. 
part of CURA-10092
 2023-01-20 17:58:42 +01:00
Remco Burema
9861e450a0 Fix/rewrite for relative extrusion mode. 
For relative mode, not only needs the retractions created to be actually relative, but it also needs to compensate on the next G1 (as opposed to absolute mode, where you'd want to go to the same absolute E position after). Rather than massively complicating the already gnarly code (once it found a G1 retraction, it scanned forwards to find G0 statements (which it rewrote to G1), so it would go over those _again_ in the middle (layer) loop). While this worked for absolute mode, but would be a nightmare to make work for relative mode as-is (if only because the compensation could _also_ potentially involve keeping track of things over the outer loop). As a bonus I think the resulting code is actually easier to read.

part of CURA-10092 -- should fix #14100
 2023-01-20 17:34:39 +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
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
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
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
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
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