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

29973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Casper Lamboo
3ef77df3fd
Merge pull request #12651 from Ultimaker/CURA-9357_hide_middle_line_threshold_settings 
[CURA-9357] Remove some very difficult to explain (even to experts) settings.
 2022-08-22 11:54:20 +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
joeydelarago
1f701c267a Merge branch 'main' into CURA-9272_semver_postfix 2022-08-22 09:04:03 +02:00
digitalfrost
50d81225da Improve documentation string 
onCurrentCallbackFinished documentation string:
- Improve clarity
- Fix grammar
- Improve layout and shorten line length
 2022-08-20 19:40:58 +02:00
digitalfrost
d9fb352ee2 Fix typo 2022-08-20 19:27:32 +02:00
digitalfrost
fe2b8ebaf7 Improve triggerNextCallback documentation 
triggerNextCallback documentation:
- Correct grammar
- Shorten lines and improve layout
 2022-08-20 19:22:28 +02:00
digitalfrost
62d05f2350 OnExitCallbackManager.py: Improve docstring layout 
- Reduce line length.
- More logical line breaks.
 2022-08-20 19:12:44 +02:00
digitalfrost
6298bb50ce OnExitCallbackManager.py: Fix grammar 
Grammatical correction of docstring
 2022-08-20 18:58:03 +02:00
digitalfrost
6df4d7677a Fix typo 2022-08-20 18:51:59 +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
Joey de l'Arago
6f6c2df28a
Update requirements-conan-package.txt 2022-08-19 14:45:42 +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
Joey de l'Arago
0e99a0029d
Update minimum conan version 2022-08-19 12:52:40 +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
joeydelarago
5900cac9c8 Default the prerelease number to 1 when it is not set in the github tags. 
CURA-9272
 2022-08-15 16:00:14 +02:00
joeydelarago
a20e7bf8d9 Add cura latest.json url to template so it can be set from the conanfile. 
CURA-9272
 2022-08-15 15:59:08 +02:00
joeydelarago
57d739a848 Move source of truth for latest.json url into ApplicationMetadata.py and out of the Uranium repository. 
CURA-9272
 2022-08-15 15:43:37 +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
トトも
50393dc4f6
Merge branch 'Ultimaker:main' into main 2022-08-12 06:59:18 -04: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
digitalfrost
a40b0da63d
settings_properties.md: correct indentation 
Correct indentation and fix and inconsistent use of "unused by Cura"
 2022-08-12 09:36:19 +02:00
digitalfrost
56f5d6b60d
Improve stylistic consistency 
Always use "This is currently unused by Cura" so that the settings descriptions are more coherent.
 2022-08-12 09:29:19 +02:00
digitalfrost
f9f7aae908
Use italics for "unused by Cura" 
Use italics to emphasize "This is currently unused by Cura".
 2022-08-12 09:27:17 +02:00
digitalfrost
22867d6984
settings_properties.md: reformat text 
Reformat text to make it easier to read.
Breakup setting descriptions into separate lines.
 2022-08-12 09:20:10 +02:00
digitalfrost
590c95020b
setting_properties.md: correct grammar 
Correct the grammar used in the description of default_value
 2022-08-12 08:51:06 +02:00
トトも
95542015d5
Merge branch 'Ultimaker:main' into main 2022-08-11 14:03:05 -04:00
トトも
52c36519f2
Muted Badge Colors 2022-08-11 14:02:57 -04:00
ElectronicsArchiver
4d61895caf Moved & Formatted Reporting 2022-08-11 13:55:36 -04:00
ElectronicsArchiver
f0b1d157e9 Removed Redundant Licensing Note 2022-08-11 13:40:43 -04:00
ElectronicsArchiver
481b6ffd2e Added Logo 2022-08-11 13:39:54 -04:00
ElectronicsArchiver
2f7bf5838e Added Quicklinks 2022-08-11 13:37:30 -04:00
ElectronicsArchiver
9da8f9a854 Updated Badges 2022-08-11 13:22:48 -04:00
ElectronicsArchiver
c101904be3 Referenced Links 2022-08-11 12:25:44 -04: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