GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 10:18:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,669 Commits 295 Branches 268 Tags
Commit Graph

32669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saumya Jain
f3c7b0f6f8
Merge branch 'main' into CURA-10896_improve_add_printer_wizard 2023-09-04 10:13:58 +02:00
Saumya Jain
6e781f4583
Merge pull request #16606 from Ultimaker/CURA-10180-warning_out_of_space 
Fixed possibly wrong error message
 2023-09-01 17:39:10 +02:00
Saumya Jain
683d4dbe69
Merge branch 'main' into CURA-10180-warning_out_of_space 2023-09-01 17:33:17 +02:00
Erwan MATHIEU
9e5ad281d5 Do not restore add printer dialog size 
CURA-10896
 2023-09-01 16:59:02 +02:00
Erwan MATHIEU
15243fd6f9 Remove QML warning at startup 
Using undefined works properly, but generates a warning. The other solution is to set the maximum size to something knowingly big.

CURA-10896
 2023-09-01 16:59:02 +02:00
Erwan MATHIEU
cb3d22a2c0 Use proper margin for gcode edition area 
CURA-10896
 2023-09-01 16:59:02 +02:00
Casper Lamboo
6ef4758a83
Merge pull request #16624 from Ultimaker/CURA-10835_make_setting_hidden_icon 
Icon is dragged into visible area
 2023-09-01 15:50:56 +02:00
Casper Lamboo
e064044298
Merge pull request #16638 from Ultimaker/CURA-11000_Update_Installation_Screen_Mac 
Update MacOS Installation Screen
 2023-09-01 15:32:24 +02:00
Saumya Jain
28d4bc677d
Merge pull request #16421 from Ultimaker/PP-370-Fix-horizonal-expansion-for-tree-support 
PP-370 Fix horizonal expansion for tree support
 2023-09-01 14:09:26 +02:00
Saumya Jain
26ddc1a9d6
Merge branch 'main' into PP-370-Fix-horizonal-expansion-for-tree-support 2023-09-01 13:22:24 +02:00
MariMakes
2b6b43efc0 Update MacOS Installation Screen 
We still had the temporary logo on this screen. Our designers created an updated version.
 2023-09-01 11:40:00 +02:00
Saumya Jain
4a8a8d35f6
Merge branch 'main' into CURA-10896_improve_add_printer_wizard 2023-09-01 11:17:18 +02:00
saumya.jain
5c2b127345 Few minor fixes 
CURA-10835
 2023-09-01 11:12:50 +02:00
Saumya Jain
012c77459c
Merge branch 'main' into CURA-10835_make_setting_hidden_icon 2023-09-01 11:06:46 +02:00
Erwan MATHIEU
6848974fcc Fix project write error not reported on Windows 
CURA-10180
 2023-09-01 10:14:17 +02:00
jellespijker
baafdbfce3 Use gcc-13 and new conan-config 2023-08-31 05:45:44 +02:00
jellespijker
1fb7191dd7 Use conf skip_test 
Contributes to CURA-10951
 2023-08-31 05:26:40 +02:00
Erwan MATHIEU
c7fde54f3d Fix GCode text bug when resizing 
CURA-10896
 2023-08-30 16:42:59 +02:00
saumya.jain
cb4c4214f4 Icon is dragged into visible area 
CURA-10835
 2023-08-30 15:28:49 +02:00
Saumya Jain
bd4a6a1831
Merge branch 'main' into CURA-10180-warning_out_of_space 2023-08-30 14:02:58 +02:00
Remco Burema
fa08848152
Merge pull request #15496 from Ultimaker/CURA-7951_lock_rotation 
Add option to arrange in grid
 2023-08-30 13:31:42 +02:00
Erwan MATHIEU
742e11327e Allow the printers selection list to reize 
CURA-10896
 2023-08-30 13:17:20 +02:00
c.lamboo
586739c547 Avoid bool-trap 
CURA-7951
 2023-08-30 13:06:19 +02:00
c.lamboo
afc1ba78f5 Remove debugging utility function 
CURA-7951
 2023-08-30 12:52:27 +02:00
c.lamboo
3e39bbdabd Typo 
CURA-7951
 2023-08-30 12:51:03 +02:00
c.lamboo
38a5754c6f Mark method functions as private 
CURA-7951
 2023-08-30 12:47:56 +02:00
c.lamboo
b3b5ffbf55 Put try catch around actual arranging 
`arrange` is the function that _could_ fail

CURA-7951
 2023-08-30 12:45:34 +02:00
c.lamboo
cfc4db00a5 Use descriptive variable name 
instead of magic number

CURA-7951
 2023-08-30 12:41:53 +02:00
Erwan MATHIEU
6075a5b583 Make the "Add printer" window resizable 
CURA-10896
 2023-08-30 11:59:28 +02:00
Erwan MATHIEU
0450a3b09c Fixed possibly wrong error message 
CURA-10180
 2023-08-29 16:45:13 +02:00
saumya.jain
d80e349f0b source_folder as root for materials 
conan build fix
 2023-08-29 15:27:47 +02:00
saumya.jain
0397095789 pyarcus pynest2d and pysavitar version changed 
conan build fix
 2023-08-29 15:18:59 +02:00
c.lamboo
6e045e8b37 Put back getAnyExtruderPositionWithOrDefault api function 
CURA-10685
 2023-08-29 14:11:36 +02:00
Saumya Jain
81c44d8709
Merge branch 'main' into PP-370-Fix-horizonal-expansion-for-tree-support 2023-08-29 13:36:05 +02:00
saumyaj3
ef4665a55f Applied printer-linter format 2023-08-29 11:12:17 +00:00
Saumya Jain
577f34782b
Merge pull request #16159 from randyzwitch/main 
Definition: Pulse XE E444M
 2023-08-29 13:10:58 +02:00
Casper Lamboo
f3b2a05f49
Merge pull request #16589 from Ultimaker/CURA-10685_improve_ui_performance 
CURA-10685_improve_ui_performance
 2023-08-29 10:55:41 +02:00
Jelle Spijker
3d48e51ac2
Update requirements-conan-package.txt 2023-08-29 07:53:35 +02:00
Jelle Spijker
d70b209288
Update requirements-conan-package.txt 2023-08-28 17:32:03 +02:00
Jelle Spijker
7671705c16
Update requirements-conan-package.txt 2023-08-28 16:35:27 +02:00
Jelle Spijker
608878d7be
Update macos.yml 2023-08-28 15:21:09 +02:00
Jelle Spijker
2b39c73d56
Update linux.yml 2023-08-28 15:20:17 +02:00
Jelle Spijker
0e67ff38c2
Update windows.yml 2023-08-28 15:19:45 +02:00
c.lamboo
0362f8abe6 Revert "Update conan version" 
This reverts commit 711b4401007cbbcf7455c60114a63d8ee7976049.
 2023-08-28 14:42:04 +02:00
c.lamboo
711b440100 Update conan version 
CURA-10446
 2023-08-28 13:00:08 +02:00
Saumya Jain
95aec61de9
Merge pull request #16555 from Ultimaker/CURA-10307_expand-one-at-a-time-shadow 
CURA-10307_expand-one-at-a-time-shadow
 2023-08-25 17:24:53 +02:00
Casper Lamboo
e3b29b9ad5
Merge pull request #16556 from Ultimaker/CURA-10180-warning_out_of_space 
CURA-10180-warning_out_of_space
 2023-08-25 17:09:09 +02:00
saumya.jain
ab8b7c3ab5 name changes 
CURA-10685
 2023-08-25 15:46:30 +02:00
saumya.jain
2c6e3fb813 Merge branch 'CURA-10685_improve_ui_performance' of https://github.com/Ultimaker/Cura into CURA-10685_improve_ui_performance 2023-08-25 11:58:35 +02:00
saumya.jain
9129a526ba improve number of iterations 
CURA-10685
 2023-08-25 11:58:27 +02:00