3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
23560 commits 302 branches 270 tags 773 MiB
Commit graph

293 commits

Author SHA1 Message Date
Ghostkeeper
40056c9a04
Update to setting_version 15 
Due to a merge conflict that Git couldn't detect, these are immediately outdated. Let's update them to 15.

Since I knew this would be coming, I didn't change the maximum deviation last time, so now I also don't need to change it back.

Contributes to issue CURA-7384.
 2020-05-11 11:43:37 +02:00
Ghostkeeper
a2946b057a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-11 11:41:30 +02:00
Ghostkeeper
156925d48e
Update to setting_version 14 
This is necessary before merging since these profiles would otherwise still need to be updated during runtime.

Contributes to issue CURA-7384.
 2020-05-11 10:51:44 +02:00
Ghostkeeper
c9a9579d8b
Merge branch 'master' of https://github.com/64bittuning/Cura into 64bittuning-master 2020-05-11 09:16:01 +02:00
Ghostkeeper
3527c16716
Upgrade containers that were forgotten to upgrade from setting_version 13 
This is why it was upgrading them as if from the profile importer...

Contributes to issue CURA-7420.
 2020-05-08 11:13:15 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15 
Once more into the fray.

Contributes to issue CURA-7420.
 2020-05-08 09:43:02 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6' 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
 2020-05-08 09:10:02 +02:00
Kostas Karmas
9bf0255046 Up the setting version to 14 in all the resourses 
CURA-7421
 2020-05-04 13:13:07 +02:00
64bittuning
6c9e414e8a removed obsolete variants 
X5SA Pro was condensed down into X5SA/X5ST/Pro model
 2020-04-30 14:33:57 -04:00
konskarm
98eda12f60
Merge pull request #7418 from Evg33/UNI_3D_profiles 
Adding profiles for UNI 3D Series printers
 2020-04-29 17:24:24 +02:00
64bittuning
98f3dbb028 Tronxy Variants 
Needs to be updated with relevant settings
 2020-04-28 23:10:21 -04:00
Evg33
bee9947d84 UNI3D CR at end of files 2020-04-28 16:29:07 +03:00
Evg33
80e0078979 UNI3D settings version 13 2020-04-28 15:56:34 +03:00
Strahler85
a6f60df2ed
Add nozzle profiles for Ender 3 pro 
These profiles were posted as solution for #7550 by Strahler85. I'm committing this in his name.

Fixes #7550.
 2020-04-24 14:07:33 +02:00
Strahler85
83adb98a5f
Add nozzle profiles for Ender 3 pro 
These profiles were posted as solution for #7550 by Strahler85. I'm committing this in his name.

Fixes #7550.
 2020-04-23 00:30:01 +02:00
Evg33
293be8fdb9 UNI 3D Series printers 2020-04-05 18:44:34 +03:00
Ghostkeeper
e2e69f6646
Increment setting version to 13 
Contributes to issue CURA-7282.
 2020-04-01 15:14:01 +02:00
Ghostkeeper
8422172000
Increment setting version to 12 
This is necessary for the version upgrade to run.

Contributes to issue CURA-7328.
 2020-03-30 11:54:18 +02:00
konskarm
90ed7ac184
Merge pull request #7298 from Ultimaker/CURA-7311_stair_step_height_0_for_pva 
Reduce stair step height to 0 for PVA
 2020-03-19 14:12:28 +01:00
konskarm
7d2391c4ed
Merge pull request #7101 from yyh1002/master 
Add DXU machine profile
 2020-03-18 16:12:50 +01:00
Ghostkeeper
fdd1cef11a
Reduce stair step height to 0 for PVA 
Given that:
* stair stepping is intended to be used to reduce the adhesion between support and the model, where the support rests on the model, and to reduce scarring, and
* PVA doesn't suffer from scarring or adhesion issues due to its water-solubility, and
* our current stair stepping algorithm has some bugs, causing support to disappear sometimes

we've decided to set stair stepping to 0 for all PVA profiles for UM3, UMS5 and UMS3.

Contributes to issue CURA-7311.
 2020-03-18 15:50:27 +01:00
ODUCCEU
a5bdea75e0 Reduce redundant variants 2020-03-13 13:45:35 +03:00
ODUCCEU
1ccf73d11e Add Flying Bear Ghost 4S Printer 2020-03-08 18:37:48 +03:00
yyh1002
050ab50062 DXU defenition 2020-02-15 18:46:51 +11:00
Nino van Hooff
2f628bbfd3 Merge branch 'voron2_duplicated' 2019-12-19 14:06:43 +01:00
Lipu Fei
1eada1dc9b Update setting_version to 11 for Strateo3d 
CURA-7064
 2019-12-17 15:26:17 +01:00
Koub
2fcc5d8fd2
Merge branch 'master' into master 2019-12-17 14:57:22 +01:00
Lipu Fei
c1aa556a59 chmod 644 *.inst.cfg 2019-12-17 11:21:19 +01:00
Benoit Miller
9b583be6ef Upgrade metadata version numbers to match master 2019-12-12 17:05:35 -05:00
Benoit Miller
9259cea2dc Merge branch 'master' of https://github.com/Ultimaker/Cura into voron2-support 2019-12-12 16:40:35 -05:00
Jaime van Kessel
ea02bdf40a
Also bump up the setting version of files changed since this branch was branched 
CURA-6522
 2019-11-20 16:51:15 +01:00
Jaime van Kessel
50d72692d8
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_one_at_a_time_overlapping_build_area 2019-11-20 16:48:00 +01:00
KOUBeMT
631870adca Adding_08_Nozzle_&_fine_tuning_profiles 2019-11-19 17:05:25 +01:00
Dimitriovski
94a5b5ef90 CURA-6522_one_at_a_time_overlapping_build_area 
Changed the setting_version to 11
 2019-11-19 15:27:17 +01:00
Benoit Miller
dd477fe136 Add VORON2 printer profile 2019-11-16 08:16:09 -05:00
Lipu Fei
0ad5ce19da Fix leapfrog profiles 
CURA-6951
 2019-11-05 12:49:27 +01:00
Lipu Fei
2e4e19594f
Merge pull request #6608 from Leapfrog3DPrinters/master 
Leapfrog Bolt Pro machine profile
 2019-11-05 12:48:39 +01:00
WalshJames
45f0f1738b
Add files via upload 2019-10-22 15:07:06 +02:00
KOUBeMT
44290d3715 setting_version_update 2019-10-03 16:00:55 +02:00
KOUBeMT
f1ecb63c3f Setting version update 2019-10-03 12:11:20 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Lipu Fei
1977a865f1 Fix HMS434 version upgrade 
CURA-6774
 2019-09-24 11:05:52 +02:00
Lipu Fei
a6218179a9
Merge pull request #6329 from maukcc/master 
HMS434 change
 2019-09-24 11:04:50 +02:00
Lipu Fei
18d93d0b7b Fix UM2 extended variants 
CURA-6775
 2019-09-23 10:43:58 +02:00
Ghostkeeper
8d21f75c40
Merge branch 'feature_intent_container_tree' into feature_intent_upgrade 2019-09-16 15:20:41 +02:00
Ghostkeeper
3c9d191a6e
Add separate definition for Ultimaker 2 with Olsson block 
This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer.
However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible.

By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well.

Contributes to issue CURA-6775.
 2019-09-16 14:57:45 +02:00
maukcc
d514b324fb HMS434 update 
HMS434 update on material and quality profiles
 2019-09-13 11:38:42 +02:00
Lipu Fei
5631e94a48 Fix creality variant versions 2019-09-13 10:53:10 +02:00
Lipu Fei
fa8213c601 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-13 10:31:11 +02:00
Jaime van Kessel
a6a106b526
Merge branch 'feature/creality-machines' of https://github.com/trouch/Cura 2019-09-12 14:09:46 +02:00