fieldOfView
6907c8921e
Add (non-functional) extruder selection dropdown to simplemode for multi-extrusion printers
...
CURA-790
2016-04-27 10:20:11 +02:00
fieldOfView
a20193a13b
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-04-26 17:19:04 +02:00
fieldOfView
75f4a91800
Tweak button icon size to make the icons look a bit less "chunky"
2016-04-26 17:18:40 +02:00
Ghostkeeper
d65a0a302a
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-04-26 12:00:24 +02:00
Ghostkeeper
fe68be4f62
Merge branch 'connection_rework'
2016-04-26 11:51:09 +02:00
fieldOfView
a2ff775c08
Limit the max_value for extruders to the number of extruders
...
CuraEngine would crash if instructed to use an extruder that it knows nothing about. Extruders start counting at 0, so max_value is set to machine_extruder_count - 1.
Fixes the crash outlined in CURA-965
2016-04-26 11:19:56 +02:00
Ghostkeeper
27aef006a8
Remove retraction settings from ulti-profile
...
Paul agreed, this should not be dependent on the quality. It was meant to allow a bit slower prints due to the time it takes to do a retraction, but that is not the bottleneck here. Material hardness is the bottleneck. Grinding is.
Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
c67ae0f1c9
Remove retraction settings from machine definitions
...
These should be different per material, not per machine.
Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
58d08f2b8d
Change default retraction for nozzle switch
...
This should get overridden by the heat zone length anyway.
Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
b5f00ffd80
Removed superfluous override from UM2+ definition
...
The default is line_width * 2 but this defined it as machine_nozzle_size * 2. I talked it over with Tom (who added that line) and he said it was only copied from Paul's profiles. It should've been line width. Makes more sense. It's line_width * 2 so that it can go from an outer wall to the infill without retracting.
Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
43dff1296c
Move retraction distance to material settings
...
I've discussed this with Tom, Kristel, Diana, Marvin and Oscar. This setting should really be dependent on material since the material influences the speed it can handle the most.
Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
ceb9df8c5d
Ignore PyCharm IDE files
2016-04-25 16:23:36 +02:00
Ghostkeeper
4548c38af6
Structure gitignore
2016-04-25 16:23:36 +02:00
fieldOfView
cde23edfed
Prevent wizard pages from closing when they are "accepted" by pressing return.
...
Also removes some code replication in wizard pages.
CURA-1354
2016-04-25 13:51:22 +02:00
Ghostkeeper
134867f833
Fix indenting tabs -> spaces
...
Contributes to issue CURA-695.
2016-04-20 17:18:10 +02:00
Tim Kuipers
4913f89b9b
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-04-20 15:25:38 +02:00
Tim Kuipers
6799a76a7c
JSON fix: combing mode default enum value (CURA-694)
2016-04-20 15:25:23 +02:00
Ghostkeeper
067dda821f
Merge pull request #711 from thopiekar/master-marker-for-nvidia-workaround
...
[master] Adding marker for the Nvidia workaround
2016-04-20 09:36:04 +02:00
Thomas-Karl Pietrowski
37ba88351a
Adding marker for the Nvidia workaround
2016-04-19 20:24:56 +02:00
Arjen Hiemstra
c2ac0e8217
Fix resource paths after Uranium API change
...
Contributes to CURA-1390
2016-04-19 18:11:11 +02:00
Tim Kuipers
3e94c37f57
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-04-19 17:39:46 +02:00
Tim Kuipers
e7e4512fd0
JSON: fix: moved line distance computation from engine to frontend (CURA-1317)
2016-04-19 17:39:30 +02:00
Arjen Hiemstra
c329c2e12d
Do not try to recreate the socket when we are shutting down anyway
...
This prevents issues where closing the socket triggers socket creation
and then a deadlock occurs.
Contributes to CURA-1391
2016-04-19 16:52:22 +02:00
Jaime van Kessel
02e02a8f98
Added way to update the head position
...
CURA-1339
2016-04-19 15:30:34 +02:00
Jaime van Kessel
d33a75906a
Progress is now only emitted if it changed
...
CURA-1339
2016-04-19 12:04:22 +02:00
fieldOfView
919e2f55e9
Replace "notice" icon with an icon that is less jarring and differs more in shape with the "reset" icon
...
Contributes to CURA-1176
2016-04-18 17:39:28 +02:00
Tim Kuipers
083c6dc630
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-04-18 16:49:12 +02:00
Tim Kuipers
1ffcb8419a
JSON: Enable Combing ==> Combing Mode (CURA-694)
2016-04-18 16:49:02 +02:00
Jaime van Kessel
232e447a74
Added bq firmware (which caused merge issue)
2016-04-18 15:48:20 +02:00
Jaime van Kessel
6abeac5c44
Added comment about us violating the API
...
CURA-1339
2016-04-18 15:26:24 +02:00
Jaime van Kessel
71b4c983d0
Merge pull request #700 from thopiekar/master-bq_hephestos2-firmware
...
USBPrinting: Adding entry for BQ Hephestos 2 firmware
2016-04-18 15:21:49 +02:00
Jaime van Kessel
2c489ed054
Connection state signal is now connected before connect is called
...
CURA-1339
2016-04-18 15:05:21 +02:00
Jaime van Kessel
8a47903374
Changed namespace of usbprintermanager (QML) to Cura from UM
...
CURA-1339
2016-04-18 15:03:13 +02:00
Jaime van Kessel
a59c113887
Added busy & error state to ConnectionState
...
CURA-1339
2016-04-18 14:47:51 +02:00
Jaime van Kessel
fb52d39936
Changed enum values to lowerCamelCase
...
CURA-1339
2016-04-18 14:43:04 +02:00
Jaime van Kessel
96e821cc3d
PrinterOutputDevice now uses safer super().__init
...
CURA-1339
2016-04-18 13:27:36 +02:00
Jaime van Kessel
0939262ffe
Removed stray debug code
...
CURA-1339
2016-04-18 11:47:23 +02:00
Jaime van Kessel
b31106a666
Added missing (renamed) file
...
CURA-1339
2016-04-18 11:45:14 +02:00
Jaime van Kessel
6ad926b9b8
connect & close are now pure virtual
...
CURA-1339
2016-04-18 11:38:57 +02:00
Jaime van Kessel
0015d9d027
Documented signals
...
CURA-1339
2016-04-18 11:37:08 +02:00
Jaime van Kessel
94d3309a35
Removed duplicate bedTemperature declaration
...
CURA-1339
2016-04-18 11:33:43 +02:00
Jaime van Kessel
8a94739de0
Raft line widths now inherit from line_width
...
CURA-695
2016-04-15 16:08:23 +02:00
Jaime van Kessel
ef9be8a2d8
Merge branch '2.1' of https://github.com/Ultimaker/Cura
2016-04-15 14:56:24 +02:00
Jaime van Kessel
d606d6dfe4
Merge pull request #701 from THeijmans/2.1
...
UM2+ profile improvements
2016-04-15 14:43:06 +02:00
Tom Heijmans
7ce5c6c6bc
Fixed inheritance issues
2016-04-15 14:36:13 +02:00
Tom Heijmans
00305f1c53
Updated inheritance functions for um2+
2016-04-15 13:35:25 +02:00
Tom Heijmans
3776d3c6d2
Updated material & UM2+ profiles
2016-04-15 13:33:30 +02:00
Thomas-Karl Pietrowski
efb5c668fe
USBPrinting: Adding entry for BQ Hephestos 2 firmware
2016-04-14 17:13:29 +02:00
Jaime van Kessel
c2b1753d25
Updated documentation
...
CURA-1339
2016-04-14 15:59:10 +02:00
Jaime van Kessel
6f7b80299e
Added warning logging
...
CURA-1339
2016-04-14 15:46:16 +02:00