GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-29 21:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,648 Commits 295 Branches 268 Tags
Commit Graph

30648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xommit
fd546c347e
Update cura.po 2022-11-17 15:16:38 +01:00
Casper Lamboo
5a75678caf
Merge pull request #13762 from Ultimaker/CURA-9548_min_support_area_split 
[CURA-9548] The engine now operates on the area _before_ the offset.
 2022-11-17 14:47:30 +01:00
c.lamboo
9774349cb7 Make add printer component more responsive 
For some displays/screen resolutions the cut is expended beyond the borders of the window. By making the component more responsive this should be fixed.

CURA-9894
 2022-11-17 13:03:17 +01:00
Remco Burema
b0160b2d86 Revert "Specify to build installer per-OS." 
This reverts commit 957c25973b0fe57dde7bb16e960a7205e80407f4.
 2022-11-16 19:36:26 +01:00
Casper Lamboo
35094ff47d
Merge pull request #13837 from Ultimaker/CURA-9424_fix_loading_files 
[CURA-9424] Fix loading files
 2022-11-16 16:54:48 +01:00
Remco Burema
957c25973b Specify to build installer per-OS. 
Exclusion happens _before_ additional includes unfortunaltely, so the matrix is back to being a plain list if OS's. This also means that, if we don't want to build each OS x OS_id, we have to put that information somewhere else. OS_id didn't really belong in the matrix anyway, since it's a derivative value. It's now replaced with a named environment variable.

The way to exclude and select the 'name' used in the filename for each OS seems a little cumbersome, but I didn't find any better way so far.

(should) implement the 'easy', 'lite' version  of CURA-9880
 2022-11-16 16:39:14 +01:00
Joey de l'Arago
156004cb17 Move logic for deciding the initially selected printer that was inside WorkspaceDialog.qml before into WorkspaceDialog.py. 
A block of code is run after dialog.show() and most of the dialog assignment. This is because dialog.show() resets the _result dictionary, we want to update the values in _result afterwards.

CURA-9424
 2022-11-16 16:11:19 +01:00
Jelle Spijker
cc9a698f42
Merge pull request #13775 from Ultimaker/CURA-9350_support_interface_wall 
[CURA-9350] support interface wall
 2022-11-15 16:17:21 +01:00
Casper Lamboo
63b27d3ca8
Merge pull request #13774 from Ultimaker/CURA-9424_update_loading_projects_design 
Cura 9424 update loading projects design
 2022-11-15 15:38:15 +01:00
c.lamboo
dc65e801d0 Set machine isAbractMachine in workspace dialog initialisation 2022-11-15 15:35:16 +01:00
Joey de l'Arago
a30fbf5a8f Disable connection status icon for drop down in WorkspaceDialog. It is not possible to display the correct status for LAN printers without making them the active printer anyway. 
CURA-9424
 2022-11-15 15:10:44 +01:00
Joey de l'Arago
28862c89e5 Show online badge and printer icon when initially loading machine selector 
CURA-9424
 2022-11-15 15:03:23 +01:00
Joey de l'Arago
cd07647b24 Change misleading variable names 
CURA-9424
 2022-11-15 14:57:39 +01:00
Joey de l'Arago
dd0411f171 isOnline was incorrectly being used instead of isNetworked. This caused offline printers not to show an Icon. 
Fixed

CURA-9424
 2022-11-15 14:56:25 +01:00
Joey de l'Arago
7254c8ac78 Merge remote-tracking branch 'origin/CURA-9424_update_loading_projects_design' into CURA-9424_update_loading_projects_design 2022-11-15 14:14:11 +01:00
Joey de l'Arago
e4ad9cb48c Move base hovered logic out of ComboBox.qml since base is undefined in most places the component is used. 
CURA-9424
 2022-11-15 14:08:47 +01:00
Joey de l'Arago
cac9d67352
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-11-15 13:49:55 +01:00
Joey de l'Arago
90ce031b27 Add default case 
CURA-9424
 2022-11-15 13:49:02 +01:00
Casper Lamboo
52891f5a36
Merge pull request #11449 from Ultimaker/interlocking_gen 
Settings for Interlocking Structure Generation
 2022-11-15 13:07:03 +01:00
Joey de l'Arago
7f9c183072 Remove redundant assignments 
CURA-9424
 2022-11-14 13:35:03 +01:00
Joey de l'Arago
959c42d96a The printer to override was not being set initially, causing file loading to fail when not selecting a printer in the MachineSelector. 
Fix is to set it on initialization from the WorkspaceReader

CURA-9424
 2022-11-14 13:34:46 +01:00
Joey de l'Arago
d6cab972c6 Fix call to incorrect function after revert. 
CURA-9424
 2022-11-14 12:57:38 +01:00
Joey de l'Arago
e947959ca9 Merge branch 'main' into CURA-9424_update_loading_projects_design 2022-11-14 12:56:47 +01:00
Jelle Spijker
d83f11f42a Make usage of lockfile conditionally 2022-11-14 12:46:51 +01:00
Jaime van Kessel
3314929e44
Merge pull request #13776 from Ultimaker/PP-275-increase-initial-layer-skin-flow 
PP-275-increase-initial-layer-skin-flow
 2022-11-14 11:52:57 +01:00
jspijker
00f83dd3f8 Store the log and build artifacts 2022-11-13 13:48:46 +01:00
jspijker
b161a8ed94 install bison and flex on ubuntu 2022-11-13 13:34:23 +01:00
jspijker
fab0430966 use runs_on as cache key 2022-11-13 13:13:36 +01:00
jspijker
d85786c829 fix uploading buildinfo step 2022-11-13 11:05:35 +01:00
jspijker
76be83434f Use the correct project_name 2022-11-13 10:55:27 +01:00
jspijker
2e0619d647 Fix buildinfo.json generation 2022-11-13 10:47:03 +01:00
jspijker
9d690da9d5 Fix buildinfo.json generation 2022-11-13 10:29:34 +01:00
Joey de l'Arago
57e1c7a4ce Commit suggestion by Jelle 
CURA-9424
 2022-11-11 17:08:45 +01:00
Joey de l'Arago
62274c4dac Revert Some of "Fix show/hide button in WorkSpaceDialog printer selector" 
This reverts commit 0c79ec73
 2022-11-11 17:04:39 +01:00
Joey de l'Arago
44d9df57e4 Update drop down to show correct printer icons in header 
CURA-9424
 2022-11-11 16:34:22 +01:00
Joey de l'Arago
1d34cd01c1 Removed unused UpdatableMachinesModel.py 
CURA-9424
 2022-11-11 16:34:08 +01:00
Joey de l'Arago
bbadc9c887
Apply suggestions from code review 
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-11-11 13:44:37 +01:00
Remco Burema
c9fc171776
Merge pull request #13596 from Ultimaker/boyscout_translations_conan_package 
Build mo translation files when creating conan package
 2022-11-11 13:44:33 +01:00
Remco Burema
571adbb25f
Merge pull request #13790 from Ultimaker/CURA-9876_per_object_retract_PR 
[CURA-9876] Expose per-model retraction settings.
 2022-11-11 11:51:45 +01:00
Joey de l'Arago
ebbefb5439
Merge pull request #13718 from discip/patch-2 
minor fixes + layer_no instead of height
 2022-11-11 11:17:22 +01:00
Remco Burema
57c6a228aa Expose per-model retraction settings. 
Related engine PR made it possible to do this. No PR was made to expose these to the front-end as far as I can see, so (since this was a PRwe where very behind on -- like 10 months or so) I choose to do it myself instead of asking the original author.

part of CURA-9876
 2022-11-11 11:02:05 +01:00
Joey de l'Arago
bba5532a83
Merge pull request #13608 from StuSerious/work/cff 
Update CITATION.cff to 5.2.1
 2022-11-11 10:38:41 +01:00
Joey de l'Arago
c59f5a5c00 Add tooltip in WorkspaceDialog over the printer selection drop down. 
CURA-9424
 2022-11-10 14:48:38 +01:00
jspijker
4830479b63 Also map plugins folder in conandata.yml 2022-11-10 11:34:46 +01:00
c.lamboo
0c79ec738e Fix show/hide button in WorkSpaceDialog printer selector 
CURA-9424
 2022-11-09 23:05:06 +01:00
Casper Lamboo
71398596ed
Merge pull request #13778 from Ultimaker/fix_conan_private_data 
Fix internal data plugins deployment
 2022-11-09 21:13:32 +01:00
jspijker
65f7769e58 Fix internal data plugins deployment 
The conan package from the internal package wasn't deployed,
added the logic for the second list item
 2022-11-09 20:15:23 +01:00
c.lamboo
27267deb22 Fix clicking PrepareMenu 
CURA-9424
 2022-11-09 17:16:47 +01:00
c.lamboo
06a2886139 Clean up section property logic 
CURA-9424
 2022-11-09 17:11:31 +01:00
c.lamboo
79a7b1e064 Round width to prevent drawing text on non-integer offsets 
Contribution from @fieldOfView

CURA-9424
 2022-11-09 16:56:07 +01:00