Jelle Spijker
e5ce3b0893
Simplify python command string in conanfile.py
...
Removed unnecessary string manipulation based on operating system in conanfile.py. The prior implementation used different types of quotes depending on the OS to form a python command string. This change applies one single format for all OS's simplifying the code.
Contributes to CURA-11079
2024-02-09 14:05:48 +01:00
Jelle Spijker
cb050ce46d
Use Cpython 3.12.2 and update dependencies as needed
...
Python dependencies which were updated to make it work with 3.12.2:
Numpy, Pyclipper, Scipy, requests, shapely, pybind11, wheel, setuptools, urllib3
Contributes to CURA-11079
2024-02-09 13:45:46 +01:00
c.lamboo
578057f16a
add file association for mac
2024-02-08 16:35:28 +01:00
Casper Lamboo
8b8d5191a5
Merge pull request #18253 from Ultimaker/CURA-11596-open-url-singleinstance
...
Cura 11596 open url singleinstance
2024-02-08 14:19:24 +01:00
Saumya Jain
84ecf8ec8f
Merge branch 'main' into CURA-11596-open-url-singleinstance
2024-02-08 10:52:11 +01:00
Saumya Jain
a251a5d2ca
Update resources/qml/Preferences/GeneralPage.qml
...
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-02-08 10:51:56 +01:00
Saumya Jain
495be39d1f
Update cura/SingleInstance.py
...
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-02-08 10:51:49 +01:00
Casper Lamboo
a991177cfa
Merge pull request #18262 from Ultimaker/CURA-11558-crash-opening-printer-setting
...
creating pyqtslot for desired functionality
2024-02-08 10:37:53 +01:00
saumya.jain
cf1a7889c2
mimicing behavior as files to open
...
CURA-11596
2024-02-07 17:01:56 +01:00
saumya.jain
d2e8999e45
creating pyqtslot for desired functionality
...
CURA-11596
2024-02-07 15:20:52 +01:00
saumya.jain
313a7f7068
remove debug statement
...
CURA-11596
2024-02-07 12:16:01 +01:00
saumya.jain
206b530724
Removing debug statement
...
CURA-11596
2024-02-07 11:05:48 +01:00
saumya.jain
bb28a7c506
fixing the if condition
...
CURA-11596
2024-02-07 11:01:05 +01:00
Saumya Jain
799ef9ef51
Merge branch 'main' into CURA-11596-open-url-singleinstance
2024-02-06 16:19:29 +01:00
saumya.jain
664fa4f48d
assigning different command for opening url
...
CURA-11596
2024-02-06 16:19:01 +01:00
saumya.jain
eff4584203
adding files in single instance in case of url
...
CURA-11596
2024-02-06 16:05:34 +01:00
saumya.jain
8073bc0e50
adding this preference in mac-os doesn't work.
...
It always opens it up in singlenstance
CURA-11596
2024-02-06 16:04:08 +01:00
Erwan MATHIEU
a8e3d51fea
Merge pull request #18188 from Ultimaker/CURA-11483
...
Fix mac Builds
2024-02-06 13:46:19 +01:00
Erwan MATHIEU
15156c70ad
Merge branch 'main' into CURA-11483
2024-02-06 13:46:09 +01:00
c.lamboo
d8cc99bf0d
Remove duplicate paths
...
CURA-11483
2024-02-06 13:00:31 +01:00
saumya.jain
9c57627a88
Adding command for opening url
...
CURA-11596
2024-02-06 12:17:38 +01:00
HellAholic
117d5f4792
Merge pull request #18199 from Ultimaker/CURA-11558-crash-while-opening-printer-setting
...
crash while opening printer setting
2024-02-06 10:20:41 +01:00
saumya.jain
e554eb264e
adding logging for debugging
...
CURA-11596
2024-02-05 15:44:46 +01:00
saumya.jain
21517c5025
Adding openURL in singleinstance
2024-02-05 13:22:26 +01:00
nallath
d67f0696cd
Applied printer-linter format
2024-02-05 12:14:00 +00:00
Jaime van Kessel
cfa5dccef1
Merge branch 'main' of github.com:Ultimaker/Cura
2024-02-05 13:12:31 +01:00
Jaime van Kessel
bf3f4061df
Fix ratrig definitions
2024-02-05 13:12:14 +01:00
Erwan MATHIEU
fd52fcd02c
Merge pull request #18064 from Ultimaker/PP-423-Small-top-bottom-width-and-wipe-distance
...
PP-423 Increase small skin width and wipe distance
2024-02-05 13:08:38 +01:00
c.lamboo
0f6f18e7dd
Clean up some paths
...
CURA-11483
2024-02-05 11:30:15 +01:00
Paul Kuiper
9e7418d957
Merge branch 'main' into PP-423-Small-top-bottom-width-and-wipe-distance
2024-02-05 11:19:12 +01:00
Paul Kuiper
965f9e5a1c
Increased maximum warning value for the small skin width from 3 line widths to 10 line widths.
...
PP-424
2024-02-05 11:15:34 +01:00
c.lamboo
54d6315f28
Fix broken windows/linux builds
...
Due to some breaking changes in pyinstaller upgrade, add option to use old packaging
https://github.com/pyinstaller/pyinstaller/pull/7713
CURA-11483
2024-02-05 10:58:19 +01:00
c.lamboo
ebea2b46db
Only bundle for mac
...
CURA-11483
2024-02-05 10:46:34 +01:00
c.lamboo
9d6f80fb86
Also make app bundle for linux/windows
2024-02-05 09:27:01 +01:00
Saumya Jain
7d9a699eb1
Update cura/CuraApplication.py
...
using modern typing
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-02-05 09:07:22 +01:00
c.lamboo
fc081b20e3
Remove unused variable
2024-02-04 22:48:55 +01:00
c.lamboo
da1f8bf1b6
Merge branch 'main' into CURA-11483
...
# Conflicts:
# conanfile.py
2024-02-04 22:46:33 +01:00
c.lamboo
c29eb49113
Add more paths
2024-02-04 22:44:21 +01:00
c.lamboo
8a0914c981
Adding more paths
...
🥲
CURA-11483
2024-02-02 16:38:02 +01:00
Saumya Jain
7755704266
Merge branch 'main' into CURA-11558-crash-while-opening-printer-setting
2024-02-01 11:35:10 +01:00
saumya.jain
3fc859c76b
crash while opening printer setting
...
It happened because of creating MachineActionManager as a singleton.
Code is refractored to make it work.
CURA-11558
2024-02-01 11:34:19 +01:00
Jelle Spijker
63da3f604c
Merge pull request #18138 from Ultimaker/fix_python_installs
...
Fix Python Installs about dialog
2024-01-31 21:10:29 +01:00
Erwan MATHIEU
90bf5409bf
Merge branch 'main' into PP-423-Small-top-bottom-width-and-wipe-distance
2024-01-31 13:49:50 +01:00
nallath
d490effcbd
Applied printer-linter format
2024-01-31 12:46:58 +00:00
Jaime van Kessel
0f0cf3e723
Merge pull request #17754 from Nu-hin/ratrig-squash
...
Add RatRig printers configurations
2024-01-31 13:45:48 +01:00
Erwan MATHIEU
1a965e57fe
Merge branch 'main' into PP-423-Small-top-bottom-width-and-wipe-distance
2024-01-31 13:45:22 +01:00
Jaime van Kessel
920f691531
Merge branch 'main' of github.com:Ultimaker/Cura
2024-01-31 13:41:06 +01:00
Jelle Spijker
0698f9a47b
Merge branch 'main' into fix_python_installs
2024-01-31 13:39:27 +01:00
Jaime van Kessel
1eb775ae13
Merge branch 'voron-base-updates' of https://github.com/NerdyGriffin/Cura
2024-01-31 13:38:58 +01:00
nallath
3793d4acbe
Applied printer-linter format
2024-01-31 12:38:21 +00:00
