1873 Commits

Author SHA1 Message Date
Lipu Fei
173f125d3e Fix merge conflicts 2019-01-24 14:55:29 +01:00
Jaime van Kessel
aac82a0852 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-23 11:18:27 +01:00
Remco Burema
ecaa1bc110 Enable prime-tower-brim to work with all adhesion-types except 'Raft' instead of just 'None'. [CURA-5864] 2019-01-22 19:36:33 +01:00
Byeon Ho cheol
7492122a54 4904 cubicon device (#4963)
* Add Cubicon 3D Printer device profiles.
 - 3DP-110F
 - 3DP-210F
 - 3DP-310F
Cubicon: http://www.3dcubicon.com/en/cubicon/

* Add missed profile file.

* Remove platform mesh files.
Do not necessary platform mesh in Cubicon devices.
2019-01-22 16:44:04 +01:00
Jaime van Kessel
3d1351c2c3 Merge branch 'master' of https://github.com/jbkim/Cura 2019-01-22 16:20:53 +01:00
Remco Burema
eda7ec492e 'Prime-tower brim' setting only visible when adhesion is set to 'None'. Also fix spelling. [CURA-5864] 2019-01-22 13:32:38 +01:00
Jinbuhm Kim
18cea54780 Fix material menu issue 2019-01-22 21:22:28 +09:00
Jinbuhm Kim
d1d344d739 change the extruder name & file name 2019-01-22 20:56:44 +09:00
Jinbuhm Kim
db17116b37 Fix Json error 2019-01-22 11:56:18 +09:00
Remco Burema
ccfa6ebb92 Set proper maximum values for brim width and line-count. [CURA-6094] 2019-01-21 17:47:01 +01:00
Jaime van Kessel
490d933923
Merge pull request #4895 from matshch/wanhao_d9
Added definitions for Wanhao Duplicator 9
2019-01-18 11:11:39 +01:00
Jaime van Kessel
cbcbbb8516
Merge pull request #5093 from pinchies/add-a-u20
fix start gcode on alfawise u20
2019-01-18 11:03:32 +01:00
Nicolas NSSM
057c30f86e Create alfawise_u30.def.json (#5083)
* Create alfawise_u30.def.json

I basically took the base from https://github.com/Ultimaker/Cura/blob/master/resources/definitions/alfawise_u20.def.json and compiled it with the old Cura ini given by Alfawise on the SD card.
I don't know anything about Cura config so double check it real good!

* Update alfawise_u30.def.json

* Create alfawise_u30_extruder_0.def.json

* Update alfawise_u30.def.json

* Update alfawise_u30.def.json

* Update alfawise_u30.def.json

* Update alfawise_u30.def.json

Turn off the fan at the end of a print
2019-01-18 10:40:59 +01:00
Jaime van Kessel
bff1796f91
Merge pull request #5003 from DanTup/patch-1
Add Monoprice Ultimate based on Wanhao D6
2019-01-18 09:59:03 +01:00
DragonJe
0b69d655db Adding NWA3D A5 printer (#5118)
* Add files via upload

* Add files via upload

* Create nwa3d_a5_normal.inst.cfg

* Add files via upload

* Add files via upload

* Delete nwa3d_a5.def.json

* Create nwa3d_a5.def.json

* Delete nwa3d_backplate.png

* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/extruders/nwa3d_a5_extruder_0.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
2019-01-17 17:39:00 +01:00
Diego Prado Gesto
dacc161745
Merge pull request #4961 from h0x91b/patch-1
default is 2650, not 2620, probably typo
2019-01-13 17:35:59 +01:00
pinchies
208811f383
fix start gcode on alfawise u20
small tweak to fixestart gcode to avoid default position of bed clamps
2019-01-02 02:58:19 +11:00
Ghostkeeper
542a0cb2d1
Merge branch 'gMax-1.5+-Cura-3.5.1' of https://github.com/gordo3di/Cura into gordo3di-gMax-1.5+-Cura-3.5.1
Conflicts:
	resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg -> Profile weight vs. new global property
2018-12-27 16:20:37 +01:00
Remco Burema
4065c83188 Show settings prime-tower-only brim depends on when active. [CURA-5864] 2018-12-21 17:57:47 +01:00
Remco Burema
f62e8b4bb2 Create 'brim for prime tower only' option (see also backend PR). [CURA-5864] 2018-12-21 17:38:30 +01:00
alekseisasin
4d135c13bb Cura used wrong firmware version for UMO+. The firmware was from UMO.
The reason of this issue because it used a heated firmware from his
parent(UMO) printer. To avoid this case we need to define externally
the firmware_hbk_file property in umo+ defintion file
CURA-5994
2018-12-17 16:46:02 +01:00
Danny Tuppeny
46c950a5b9
Add Monoprice Ultimate based on Wanhao D6
The default values on my Monoprice Ultimate are way different to what Cura has the Wanhao Duplicator 6 as. I'm guessing that Monoprice have changed these (if not, then maybe the Duplicator 6 file is wrong?). Without this profile, I had a 4hr print estimate for a piece that's only 55% through after 4hours. With this profile, it estimates 7:22 (which seems very accurate).

I got the default values from the printer when I connected Octoprint to it:

```
  21:20:56: Attempting to connect to printer
  21:20:56: Connection opened
< 21:20:57: start
> 21:20:57: N1 M110 *2
< 21:20:57: echo:Marlin 1.0.0
> 21:20:57: N2 M110 *1
< 21:20:57: echo: Last Updated: Jun 26 2016 12:14:19 | Author: Version DEV 3.01
> 21:20:57: N3 M115 *5
< 21:20:57: Compiled: Jun 26 2016
< 21:20:57: echo: Free Memory: 1961  PlannerBufferBytes: 1232
< 21:20:57: echo:Stored settings retrieved
< 21:20:57: echo:Steps per unit:
< 21:20:57: echo:  M92 X80.04 Y80.04 Z400.48 E94.30
< 21:20:57: echo:Maximum feedrates (mm/s):
< 21:20:57: echo:  M203 X300.00 Y300.00 Z5.00 E25.00
< 21:20:57: echo:Maximum Acceleration (mm/s2):
< 21:20:57: echo:  M201 X3000 Y3000 Z100 E500
< 21:20:57: echo:Acceleration: S=acceleration, T=retract acceleration
< 21:20:57: echo:  M204 S800.00 T800.00
< 21:20:57: echo:Advanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s),  Z=maximum Z jerk (mm/s),  E=maximum E jerk (mm/s)
< 21:20:57: echo:  M205 S0.00 T0.00 B20000 X10.00 Z0.40 E1.00
< 21:20:57: echo:Home offset (mm):
< 21:20:57: echo:  M206 X0.00 Y0.00 Z0.40
```
2018-12-16 19:57:43 +00:00
Jinbuhm Kim
546aa5fb82 Added definition for Creatable D3
https://creatablelabs.com/
2018-12-14 13:06:57 +09:00
Ghostkeeper
3d4da94b36
Remove obsolete description detail about old Cura versions
This setting had a detail in the description about how the setting used to behave in old Cura versions. Let's remove it since it is not relevant any more.

Fixes #4536.
2018-12-13 16:49:45 +01:00
Arseniy Pavlenko
e7ba4455e0
default is 2650, not 2620, probably typo 2018-12-10 19:42:23 +02:00
Ghostkeeper
f320000ce5
Change default profile of Aurora and Alfawise printers
Instead of the default layer height, we should change the default quality profile.
This is necessary because the 'normal' quality profile doesn't define a layer height, so that should inherit from the 0.1mm default layer height. But if the printer turned the default into a 0.15mm layer height then that is wrong.
Maybe we should let the normal quality profile overwrite it to 0.1mm, always?

Contributes to issue CURA-5902.
2018-12-03 17:23:44 +01:00
Jaime van Kessel
1a79372afd Fixed name of cocoon create
For some reason it was added as if it was 2 machines at once. Since we already have a wanhao I3, i've changed this one to only be a profile for the Cocoon.
2018-11-30 15:16:37 +01:00
Lipu Fei
b44ddec01f Change normal layer height of cocoon to 0.10
CURA-5902

So it's different from Fine 0.15, otherwise you get duplicates.
2018-11-29 08:35:40 +01:00
Artem Leshchev
6f5dfc4677 Added definitions for Wanhao Duplicator 9 2018-11-27 19:46:49 +03:00
Diego Prado Gesto
a6a364c337 Move material diameter and machine nozzle size to the extruder
definition.

Contributes to CURA-5902.
2018-11-27 13:12:47 +01:00
Diego Prado Gesto
0794a2c8c9 Remove not needed printer and extruder definitions.
Contributes to CURA-5902.
2018-11-27 13:03:36 +01:00
Diego Prado Gesto
39e1cfd6bc Fix indentation.
Contributes to CURA-5902.
2018-11-27 09:50:01 +01:00
Diego Prado Gesto
493b37b0fe Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20 2018-11-27 09:44:11 +01:00
Mark
7019afe21f
Merge pull request #4717 from forkineye/fix-wanhao_profiles
Fix Wanhao profiles to use speed_travel macro
2018-11-26 16:03:25 +01:00
Mark
39f123f8e0
Merge pull request #4670 from pinchies/add-cc-mm-2
Add Cocoon Create ModelMaker
2018-11-26 15:49:21 +01:00
Mark
88cedd25cf
Merge pull request #4664 from pinchies/master
Add JGAurora Z-603S
2018-11-26 15:47:28 +01:00
Mark
037bf8863e
Merge pull request #4666 from pinchies/add-jg-a5
Add JGAurora A5
2018-11-26 15:43:41 +01:00
Mark
734a8882b1
Merge pull request #4667 from pinchies/add-jg-a1
Add JGAurora A1
2018-11-26 15:41:30 +01:00
Mark
30c585f298
Merge pull request #4834 from mcmidget/master
Add BIBO2 printer (dual and single extruder settings)
2018-11-26 15:39:39 +01:00
Jaime van Kessel
d4e4e50741 Fix typo 2018-11-22 10:55:53 +01:00
Dario Minnucci
2f624cc78f Add BIBO2 printer (dual and single extruder settings) 2018-11-19 12:37:57 +01:00
Ghostkeeper
f10bd28c4a
Improve grammar and do similar fix for extruder end g-code
Contributes to issue CURA-5906.
2018-11-16 17:25:32 +01:00
Jaime van Kessel
240ac1f06b Clarify some setting descriptions 2018-11-16 13:03:45 +01:00
Aleksei S
2bf4354fed Removed minimum_value for the setting support_roof_offset and support_bottom_offset
CURA-5880
2018-11-15 15:57:34 +01:00
Remco Burema
13a9bb7eba Remove enables for min. support area in case of TreeSupport. [CURA-5903] 2018-11-13 17:03:27 +01:00
Remco Burema
6307784a79 Fix some English grammar. [CURA-5903] 2018-11-13 16:50:00 +01:00
Vlad Gribinchuk
d8d92eb4b0 Merge remote-tracking branch 'upstream/master' into feature_minimum_support_area 2018-11-09 20:45:37 +02:00
Ghostkeeper
6d66060222
Don't allow support interface offset greater than support offset
The support interface can't exceed the volume of the support now, so this is now a technical limitation.

Contributes to issue CURA-5880.
2018-11-08 13:03:37 +01:00
Ghostkeeper
f132adc135
Rename 'Offset' to 'Horizontal Expansion'
This is more consistent with other similar settings.

Contributes to issue CURA-5880.
2018-11-08 12:59:24 +01:00
Ghostkeeper
dcc6003a92
Allow negative support interface offsets
There is no technical reason why this is not allowed. You could save some material with this.

Contributes to issue CURA-5880.
2018-11-08 12:50:09 +01:00