Commit graph

1057 commits

Author SHA1 Message Date
64bittuning
b592c1b0aa Tronxy Quality pack
These need to be renamed and tweaked before attempting a PR
2020-04-28 23:07:31 -04:00
Evg33
b87444f571 UNI3D setting_version 13 2020-04-28 16:26:25 +03:00
Ghostkeeper
68e8261c21
Squashed commit of the following:
commit 96187e21580e10ba3006895c0a0613cb1fa66c4d
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:52:29 2020 +0200

    Update setting_version of recently merged profiles

    None of these had any settings that needed to be deleted or updated. I'm updating them so that they load properly in Cura 4.7.

    Contributes to issue CURA-7403.

commit 80bea3caa14139c189fc10c6874867d104df2fd7
Merge: 174b58374 037eb9a89
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:41:31 2020 +0200

    Merge branch 'master' of https://github.com/curso007/Cura into curso007-master

commit 037eb9a898
Merge: 109b5cf8e 772fd650a
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 19:36:01 2020 +0200

    Merge pull request #2 from Ultimaker/master

    Resync with Ultimaker

commit 109b5cf8e3
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:34:31 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit cdea1a7d59
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:28:18 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit bc8422d4ee
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 00:14:38 2020 +0200

    plateform image renamed.

commit e0d95c1255
Merge: a069ed5f9 b1e95d7a8
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 00:03:57 2020 +0200

    Merge pull request #1 from Ultimaker/master

    Resync with ultimaker

commit a069ed5f94
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Thu Apr 23 23:15:36 2020 +0200

    Reducing size of meshes and image(s)

commit 256d4a5576
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 21:03:02 2020 +0200

    Try to fix errors comming from the CI

commit ec4cbe6809
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 20:44:30 2020 +0200

    STL size reduced as much I could.

commit 8a6468943a
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 18:17:13 2020 +0200

    Adding Anycubic Predator printer

commit e4491b30bd
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Tue Apr 21 18:51:29 2020 +0200

    Adding the mesh for the FLSUN QQ-S thanks to Eddy Emck
2020-04-28 11:55:15 +02:00
gandzia44
e2d85e4b0f fixed my mistake in changing definition name 2020-04-18 21:39:57 +02:00
gandzia44
097c6805bd changed version of variants and names of files 2020-04-18 20:50:33 +02:00
Ghostkeeper
69b1c1fe74
Upgrade Deltacomb profiles to setting version 13
This would halve the maximum resolution setting, but they don't override that setting so there is no actual change to these profiles.
2020-04-07 23:55:31 +02:00
Ghostkeeper
309d3fc56f
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master
Conflicts:
	resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
2020-04-07 23:40:10 +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
Deltacomb
f61051e4e7 New Machines Fixes (3) 2020-03-26 10:28:05 +01:00
Deltacomb
16bd9f4f1d New Deltacomb Models and updates 2020-03-26 00:28:31 +01:00
Nino van Hooff
fefdef6781
Merge pull request #7136 from hussainsail2002/master
Adding Fabx Pro Machine
2020-03-24 16:54:14 +01:00
Hussain Bhavnagarwala
2108418397
Update fabxpro_pla_normal.inst.cfg 2020-03-24 13:24:18 +05:30
Hussain Bhavnagarwala
94bebdae17
Update fabxpro_pla_fine.inst.cfg 2020-03-24 13:23:47 +05:30
Hussain Bhavnagarwala
95daab37e0
Update fabxpro_pla_draft.inst.cfg 2020-03-24 13:23:25 +05:30
Hussain Bhavnagarwala
fda42406f3
Update fabxpro_abs_draft.inst.cfg 2020-03-24 13:23:08 +05:30
Hussain Bhavnagarwala
348b54ff81
Update fabxpro_abs_normal.inst.cfg 2020-03-24 13:22:53 +05:30
Hussain Bhavnagarwala
9a927ba363
Update fabxpro_abs_fine.inst.cfg 2020-03-24 13:22:36 +05:30
Hussain Bhavnagarwala
f6f4486b51
Update fabxpro_abs_draft.inst.cfg 2020-03-24 13:22:17 +05:30
Hussain Bhavnagarwala
dc028c3317
Add files via upload
Adding quality files for additional materials
2020-03-18 15:52:11 +05:30
Hussain Bhavnagarwala
a398c9c700
Update fabxpro_pla_normal.inst.cfg
Added redd brand
2020-03-18 12:44:25 +05:30
Hussain Bhavnagarwala
f9bb949a8d
Update fabxpro_pla_fine.inst.cfg
added redd brand
2020-03-18 12:41:53 +05:30
Hussain Bhavnagarwala
b3ed7dd1f2
Update fabxpro_pla_draft.inst.cfg
Added redd brand
2020-03-18 12:35:47 +05:30
Hussain Bhavnagarwala
ced64d6c3f
Update fabxpro_abs_normal.inst.cfg
Added redd brand
2020-03-18 12:34:13 +05:30
Hussain Bhavnagarwala
ebc293707b
Update fabxpro_abs_fine.inst.cfg
Added redd brand
2020-03-18 12:33:14 +05:30
Hussain Bhavnagarwala
3bfc3dfbc9
Update fabxpro_abs_draft.inst.cfg
Added filament brand
2020-03-18 12:29:39 +05:30
konskarm
39f41e8e74
Merge pull request #7112 from mehmetsutas/master
Update Rigid3D Printer Profiles
2020-03-17 16:37:58 +01:00
konskarm
c19a0c24a2
Merge pull request #7243 from oducceu/master
Add Flying Bear Printers
2020-03-16 09:08:18 +01:00
ODUCCEU
a5bdea75e0 Reduce redundant variants 2020-03-13 13:45:35 +03:00
ODUCCEU
68988c1d7b Change file names according to naming convention 2020-03-13 12:52:51 +03:00
Hussain Bhavnagarwala
c40048bb1d
Update fabxpro_pla_normal.inst.cfg 2020-03-12 11:19:46 +05:30
Hussain Bhavnagarwala
e4890e9dbf
Update fabxpro_pla_fine.inst.cfg 2020-03-12 11:19:12 +05:30
Hussain Bhavnagarwala
d0d2fe1669
Update fabxpro_pla_draft.inst.cfg 2020-03-12 11:18:45 +05:30
Hussain Bhavnagarwala
d7fa66f138
Update fabxpro_abs_normal.inst.cfg 2020-03-12 11:17:47 +05:30
Hussain Bhavnagarwala
e7fd4d0316
Update fabxpro_abs_fine.inst.cfg 2020-03-12 11:17:21 +05:30
Hussain Bhavnagarwala
e1cefc4edf
Update fabxpro_abs_draft.inst.cfg 2020-03-12 11:16:52 +05:30
Ghostkeeper
466964cf41
Change the sign of comparing against density
Contributes to issue CURA-7287.
2020-03-09 12:48:07 +01:00
Ghostkeeper
287e31554b
Merge branch 'master' into Skin_Edge_Settings 2020-03-09 12:47:13 +01:00
ODUCCEU
1ccf73d11e Add Flying Bear Ghost 4S Printer 2020-03-08 18:37:48 +03:00
Hussain Bhavnagarwala
292873bea9
Update fabxpro_pla_normal.inst.cfg 2020-03-04 19:10:30 +05:30
Hussain Bhavnagarwala
4546ad9c60
Update fabxpro_pla_fine.inst.cfg 2020-03-04 19:10:09 +05:30
Hussain Bhavnagarwala
049db913e4
Update fabxpro_pla_draft.inst.cfg 2020-03-04 19:09:46 +05:30
Hussain Bhavnagarwala
dbe35a7825
Update fabxpro_abs_normal.inst.cfg 2020-03-04 19:09:23 +05:30
Hussain Bhavnagarwala
1b2e031c7c
Update fabxpro_abs_fine.inst.cfg 2020-03-04 19:09:06 +05:30
Hussain Bhavnagarwala
59d66741a1
Update fabxpro_abs_draft.inst.cfg 2020-03-04 19:07:18 +05:30
Hussain Bhavnagarwala
3cadf69514
Update fabxpro_pla_normal.inst.cfg 2020-02-20 17:32:51 +05:30
Hussain Bhavnagarwala
42a494bfd3
Update fabxpro_pla_fine.inst.cfg 2020-02-20 17:32:38 +05:30
Hussain Bhavnagarwala
e24479abd6
Update fabxpro_pla_draft.inst.cfg 2020-02-20 17:32:17 +05:30
Hussain Bhavnagarwala
5c6270d613
Update fabxpro_abs_normal.inst.cfg 2020-02-20 17:31:57 +05:30