Jaime van Kessel
eb677f5625
Merge branch 'feature_cutting_mesh' of github.com:Ultimaker/Cura
2017-05-09 10:20:27 +02:00
Lipu Fei
2887819153
Only enable "prime_blob_enable" for UM3
...
CURA-3634
2017-05-09 10:14:43 +02:00
Ghostkeeper
17ad6a34ca
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-08 16:50:46 +02:00
Tim Kuipers
e6cf4a4538
JSON Prime Blob description wording (CURA-3634)
2017-05-08 16:46:09 +02:00
Ghostkeeper
24f8404aeb
Merge branch 'maukcc-master'
2017-05-08 16:45:02 +02:00
Ghostkeeper
70749ee0ec
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-08 15:51:50 +02:00
Ghostkeeper
08857e3908
Rename Expand Upper/Lower Skins to Expand Top/Bottom Skins
...
Also in the description.
Contributes to issue CURA-3779.
2017-05-08 15:51:35 +02:00
Jaime van Kessel
bb0d534f4a
Revert "Set machine_extruder_count in sync with defined extruders"
...
This reverts commit b69f337ddb
2017-05-08 15:31:44 +02:00
Jaime van Kessel
ac39934336
Revert "Starting machineSettingAction no longer resets extruder count to 1"
...
This reverts commit 452a6a095c
2017-05-08 15:30:39 +02:00
Jaime van Kessel
488752d4e3
Merge branch 'feature_add_alya3dp' of https://github.com/fieldOfView/Cura
2017-05-08 15:18:15 +02:00
Jaime van Kessel
293f1ac029
Merge branch 'feature_um2_olsson' of https://github.com/fieldOfView/Cura
2017-05-08 14:35:37 +02:00
Jaime van Kessel
452a6a095c
Starting machineSettingAction no longer resets extruder count to 1
2017-05-08 14:25:13 +02:00
jack
7dfa46d351
Merge pull request #1713 from Ultimaker/feature_CURA-3634_optional_priming
...
CURA-3634: Make prime blob optional
2017-05-08 13:38:13 +02:00
Ghostkeeper
6f383d4cc4
Make extruder_nr settable per extruder
...
It is actually being set per extruder right now, since this is where the definition gets its extruder number from. If the setting is not settable per extruder, the ExtruderStack skips the setting entirely and defers to the global stack, which doesn't have the setting and so None is returned. This was giving errors.
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
MaukCC
570b8767e0
Update cartesio.def.json
2017-05-08 13:27:01 +02:00
Lipu Fei
48862ed2b2
Change to "prime_blob_enable" and update description
...
CURA-3634
2017-05-08 13:13:33 +02:00
Lipu Fei
887a9d377a
Use setting name "Prime Blob"
...
CURA-3634
2017-05-08 10:13:59 +02:00
Lipu Fei
319f5f73fe
Rename "prime_enable" to "prime_poop_enable"
...
CURA-3634
2017-05-08 08:12:49 +02:00
Shaische
d0e4554b59
Update delta_go.def.json
2017-05-06 18:24:35 -04:00
MaukCC
7ee1498962
Update cartesio.def.json
2017-05-04 14:11:00 +02:00
MaukCC
3c4d3779b1
Update cartesio.def.json
2017-05-04 13:47:14 +02:00
Lipu Fei
25be8d9abb
Fix default Line Width float value representation for UM3
2017-05-04 12:55:37 +02:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack'
...
Contributes to issue CURA-3497.
2017-05-03 17:11:55 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
...
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.
Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
Ghostkeeper
1778751397
Fix travel speed override
...
Was a typo by the contributor of this definition.
2017-05-03 15:39:20 +02:00
Jack Ha
a5033bae54
Enable Support settings that are applicable to support meshes. CURA-2747
2017-05-03 13:40:33 +02:00
Jack Ha
5d15d6e792
Merge branch 'master' into feature_multiextruder_machinesettings
2017-05-02 17:26:27 +02:00
Tim Kuipers
c69000da75
Merge branch 'feature_support_stair_width'
2017-05-02 13:22:19 +02:00
fieldOfView
4dea518c72
Add Upgraded Parts action for UM2 to add support for Olsson block
...
This adds a set of variants that just set the nozzle diameter and nozzle tip diameter. These variants are not used until the machine action sets the has_variants metadata entry.
2017-04-30 12:38:46 +02:00
fieldOfView
d12e323853
Add definition for Alya 3d printer
...
See https://github.com/Ultimaker/Cura/issues/1759
2017-04-30 10:53:23 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed'
...
Contributes to issue CURA-3491.
2017-04-25 16:46:30 +02:00
Lipu Fei
268a9c9bac
Add priming_enabled option into fdm_printer
...
CURA-3634
2017-04-25 16:07:32 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern
...
It was depending on support bottom extruder.
Contributes to issue CURA-3491.
2017-04-24 17:31:07 +02:00
Ghostkeeper
2eae1cdf22
Move support roof settings above support bottom settings
...
This was deemed the most logical ordering.
Contributes to issue CURA-3491.
2017-04-24 14:28:10 +02:00
fieldOfView
4d12ab1296
Merge branch 'master' into feature_multiextruder_machinesettings
2017-04-21 19:31:44 +02:00
MaukCC
6ecd780bea
Update cartesio.def.json
2017-04-20 14:47:43 +02:00
MaukCC
10233b2c02
Update cartesio.def.json
2017-04-20 11:53:05 +02:00
MaukCC
47aa044f7c
Update cartesio.def.json
2017-04-20 11:33:36 +02:00
MaukCC
4c9b8bdf0a
Update cartesio.def.json
2017-04-20 10:18:30 +02:00
MaukCC
91e0ab8fde
Update cartesio.def.json
2017-04-20 10:16:04 +02:00
MaukCC
ebcf1baae8
Update cartesio.def.json
2017-04-20 10:13:21 +02:00
MaukCC
5aee2556a1
Update cartesio.def.json
2017-04-20 08:45:48 +02:00
MaukCC
5a4475c7d9
Update cartesio.def.json
2017-04-20 08:42:47 +02:00
Ghostkeeper
16bc9db06d
Simplify gradual infill steps maximum formula
...
The case where it reaches '20' is incorrect, it should never give an error, so it should've been 999999 or something. This case is also overly complex.
Say that P is 'infill_line_distance > 0' and Q is 'spaghetti_enabled'...
Then it would be the logarithmic if (P and not Q)...
Then it would be 0 or 20 if (not (P and not Q)), which is ((not P) or Q)...
Then it would be 20 if (((not P) or Q) and not Q), which is (not P)...
And it would be 0 if (((not P) or Q) and Q), which is Q.
So therefore it can be simplified to: 20 if (not P) else 0 if Q else logarithmic. But 20 became 999999, hence the above formula.
Contributes to issue CURA-3700.
2017-04-19 16:24:39 +02:00
Tim Kuipers
50a99eb2b1
fix: dont err on gradual infill when printing hollow (CURA-3700)
2017-04-19 13:50:06 +02:00
Ghostkeeper
cc23c72124
Merge branch 'revise_jellybox_support' of github.com:IMADE3D/Cura into IMADE3D-revise_jellybox_support
2017-04-19 10:36:20 +02:00
Ghostkeeper
58bf3e7ab3
Merge branch 'master' of github.com:Rigid3D/Cura into Rigid3D-master
2017-04-19 09:27:54 +02:00
Filip Goc
3c85159b05
swap M109 for M104 in the start gcode
...
It’s necessary to preheat the nozzle before the auto bed leveling
procedure to loosen up leftover filament that may had hardened on the
nozzle.
2017-04-18 20:44:55 +02:00
Tim Kuipers
fdf20fcb15
fix: forgotten floor in descriptions (CURA-3491)
2017-04-18 13:49:55 +02:00
Ghostkeeper
e33d4693f0
Merge branch '2.5'
2017-04-18 10:30:01 +02:00
