GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,891 Commits 291 Branches 260 Tags
Commit Graph

29891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
c.lamboo
61ce8dff7d Add the abstract stack to the Resources 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:58:05 +02:00
c.lamboo
c4be0e298c Add mime type to AbstractMachine 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:57:18 +02:00
joeydelarago
544ac33537 Add resource type for abstract machine so they can be saved. 
CURA-9277
 2022-08-22 10:33:47 +02:00
c.lamboo
963110a9c6 Remove Fix me 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:41:02 +02:00
c.lamboo
f22d446fa4 Implement getMachines function 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:13 +02:00
c.lamboo
d7f119415f Use pretty-printed string for the AbstractMachine name 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:00 +02:00
c.lamboo
761bf3b8fa Fix creating abstract machines on account sync 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 14:44:19 +02:00
joeydelarago
b82f1f4a8c Add new Abstract machine stack type. This represents a type of printers (ultimaker_s3 etc). 
These are created whenever a cloud printer of a new printer type is added.

CURA-9277

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
 2022-08-19 13:53:43 +02:00
Casper Lamboo
bf6422825b
Merge pull request #12999 from Ultimaker/CURA-9488_infill_density_displayed_wrong 
[CURA-9488] Fix infill density being set incorrectly when changing intent
 2022-08-17 12:52:30 +02:00
joeydelarago
4667373cb4 Fix recipes not being uploaded to community conan repository. These booleans were strings because of a github runners bug, but that bug is fixed now so these changes are being reverted. 2022-08-15 17:17:40 +02:00
j.spijker@ultimaker.com
830adcea1b Fix not internal builds 
Contributes to CURA-9528
 2022-08-12 18:00:16 +02:00
j.spijker@ultimaker.com
1d4ee4dd96 Fix not internal builds 
Contributes to CURA-9528
 2022-08-12 17:47:28 +02:00
j.spijker@ultimaker.com
37077a7823 Fix not internal builds 
Contributes to CURA-9528
 2022-08-12 17:08:25 +02:00
j.spijker@ultimaker.com
d92fd3d1e3 Make internal resources requirements 
Contributes to CURA-9528
 2022-08-12 16:38:17 +02:00
j.spijker@ultimaker.com
05ea26a8cf Don't use conan 1.51.2 
Contributes to CURA-9528
 2022-08-12 10:40:21 +02:00
Jelle Spijker
00d99d10b9
Merge pull request #13003 from Ultimaker/CURA-8792_update_pycharm_run_config 
[CURA-8792] Move run configuration templates out of conan-config into this repo.
 2022-08-11 18:09:05 +02:00
j.spijker@ultimaker.com
c5acaa768b Moved pycharm_targets to conandata 
Added individual tests. Still not everything

Contributes to CURA-8827
 2022-08-11 18:01:45 +02:00
joeydelarago
a0f32c403d Move run configuration templates out of conan-config into this repo. 
Add extra test run configuration.

CURA-8792
 2022-08-11 16:44:07 +02:00
joeydelarago
fd8d6498ee When changing to an intent with infillDensity > 100 in recommended settings the RecommendedInfillDensitySelector would set infillDensity=100. 
This is because the onValueChanged function checks if the slider has a different value from the settings and updates the settings if it does. The slider has a max value of 100, so when setting the sliders value to 1000 the slider would update to have a value of 100. This would then update the setting to value to 100.

The fix is as follows. When updating the slider value > 100 just ignore the first onValueChanged. Following onValueChanged, which are triggered by the user sliding the slider, will still trigger.

CURA-9488
 2022-08-10 16:45:16 +02:00
j.spijker@ultimaker.com
e8c9df1794 Add internal build options 
This will add the keyword `internal` to the build metadata such that
it is easier to distinguish between normal Cura builds and internal
builds with private data.
 2022-08-10 12:36:41 +02:00
j.spijker@ultimaker.com
c09eb17a24 Allow for additional metadata to be passed along 2022-08-10 12:20:01 +02:00
Jelle Spijker
069e788139
Merge pull request #12995 from digitalfrost/100822 
PostProcessingPlugin/.../Stretch.py Use enumerate
 2022-08-10 11:59:45 +02:00
Jelle Spijker
3d0025cda6
Merge pull request #12994 from digitalfrost/patch-8 
repositories.md: reformat to aid reading
 2022-08-10 11:55:24 +02:00
digitalfrost
aed16cf849 PostProcessingPlugin/.../Stretch.py Use enumerate 
Use enumerate instead of range(len
 2022-08-10 10:47:18 +02:00
Jelle Spijker
5a3ed4ca47
fixed ill-formed version exclusion 2022-08-10 10:42:30 +02:00
digitalfrost
2a11555a4a
repositories.md: remove extra whitespace 
Remove extra whitespace in markdown.
 2022-08-10 10:34:50 +02:00
digitalfrost
4e0addbe67
repositories.md: fix grammatical mistake 
Fix grammatical mistake.
 2022-08-10 10:23:58 +02:00
Jelle Spijker
780bbe0854
Fix I'll formed version range 2022-08-10 10:23:57 +02:00
digitalfrost
67d5839775
repositories.md: use is in descriptions 
Use is in these two instances as well for consistency with the first list item.
 2022-08-10 10:22:30 +02:00
digitalfrost
850749fdf5
repositories.md use is instead of comma 
Is should be used instead of a comma here
 2022-08-10 10:20:24 +02:00
digitalfrost
3f440a4481
repositories.md: remove extra whitespace 
Remove extra whitespace.
 2022-08-10 10:18:15 +02:00
digitalfrost
3402544906
repositoires.md: reformat to start with repos 
Move the name of the repos to the beginning of the line/ beginning of each section.
This makes it much easier to read.
 2022-08-10 10:16:39 +02:00
Jelle Spijker
e4516021fb
Don't use Conan 1.51.x 
Fails on Windows due to this bug https://github.com/conan-io/conan/issues/11822

PR  https://github.com/conan-io/conan/pull/11826 with the fix is planned for 1.52.0
 2022-08-10 10:13:06 +02:00
Jelle Spijker
64fa88d522
Use Conan lower then 1.51 
Fails on windows due to I'll formed msbuild not sure if it is a bug on Conan side or ours.
 2022-08-10 10:04:58 +02:00
digitalfrost
476033e6b6
repositories.md: Breakup text into lists 
This makes it easier to read and to understand what each repository does.
 2022-08-10 10:02:06 +02:00
j.spijker@ultimaker.com
982074c047 set gcc-12 as main alternative on ubuntu 22.04 2022-08-10 09:27:15 +02:00
jspijker
7b6e56287b Make sure the detection of the Conan profile happens after inst of build tools 2022-08-09 13:37:15 +02:00
j.spijker@ultimaker.com
8fa1cad635 Fix syntax mistake 2022-08-09 12:39:47 +02:00
j.spijker@ultimaker.com
ca9c107033 Don't install gcc-12 on ubuntu 20.04 
Allready present on the runner by default
 2022-08-09 12:33:12 +02:00
j.spijker@ultimaker.com
4dbcf464e1 Use latest test ppa to obtain GCC-12 2022-08-09 12:21:39 +02:00
j.spijker@ultimaker.com
265824043d install dependencies gcc-12 and disable multilib 2022-08-09 12:21:03 +02:00
Jelle Spijker
56e5bab174
Test against gcc-12 2022-08-09 11:42:18 +02:00
j.spijker@ultimaker.com
4724b25f53 Build GCC-12 from source 
The ubuntu-22.04 doesn't have the GCC-12 in the repository yet (which we need got C++20)
 2022-08-09 11:35:30 +02:00
Jelle Spijker
2968f96e85
Merge pull request #12970 from digitalfrost/070822 
Use is not operator rather than not ... is
 2022-08-08 15:04:47 +02:00
Jelle Spijker
605dc29890
Update to gcc-12 2022-08-08 15:02:58 +02:00
Jelle Spijker
7ebf5d5e70
update to gcc-12 2022-08-08 15:02:22 +02:00
digitalfrost
e7194db7f6 Merge pull request #12980 with #12970 
Merge the two pull requests as asked by @fieldOfView
 2022-08-08 14:22:58 +02:00
digitalfrost
54b9ed97ae Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 10:04:46 +02:00
digitalfrost
ff07129f2c Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 10:04:46 +02:00
digitalfrost
06e61a3129 Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 10:04:46 +02:00