Tamara Hogenhout
084bd25e02
Machine settings cleanup
...
added manufacturers and authors to the file and changed the id's to a string more usuable in combination with other files
2015-07-31 16:41:53 +02:00
Arjen Hiemstra
a8c36282fb
Merge branch 'master' into output_device
...
* master: (22 commits)
Added grouping action
LayerData now works by using decorators
Do not cause "dictionary changed size during iteration" errors when changing view
Adds an idle-state for the layerview slider
Adds an idle-state for the safebutton
Sets the platform activity on true when a model is loaded
Sets the platform activity on true when a model is loaded
Create functions that get & set platform activity
Send M104 to set the temperature to 0
Do not store files that fail to load in recent files
feat: infill wipe dist; wireframe restructure & renaming; bugfix: draft_shield_height inherit_function
Also add the parent class' command line arguments
Only process the layer data if the layer view is active.
Write to the correct variable so bed temperature is properly updated
Correct a copy-paste error in getConnectionList
Properly close all open USB connections on shut down
Catch errors when trying to close the connection thread
Enlarge the zone where you can use scrolling to look trough the layer mode.
included retraction_extra_prime_amount
tiniest detail concerning the padding of the layer count label
...
2015-07-31 12:15:18 +02:00
Tamara Hogenhout
b4a8973975
cleanup
2015-07-30 19:36:05 +02:00
Tamara Hogenhout
8596c08a80
Adds a generic wizard
...
contributes to #128
2015-07-30 19:11:48 +02:00
Arjen Hiemstra
3e024e1618
Add an icon for "save all" and only enable the action when it makes sense
2015-07-30 17:08:10 +02:00
Arjen Hiemstra
619e178f0c
Disable recent files if there are no recent files and add an icon
2015-07-30 17:07:46 +02:00
Arjen Hiemstra
db59954521
Properly implement Save Selection
2015-07-30 17:07:18 +02:00
Arjen Hiemstra
b5e8f01cfa
Return empty string so we get no errors about assigning undefined to string
2015-07-30 16:53:16 +02:00
Jaime van Kessel
7c2617133e
Updated how machine selection works; Id now identifies a type of machine so multiple variations of the same machine are possible without cluttering your selection
2015-07-30 15:09:50 +02:00
Jaime van Kessel
5188fcc44d
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-07-30 12:17:27 +02:00
Jaime van Kessel
3175788dd3
Updated code styling addmachine wizard
2015-07-30 12:17:17 +02:00
Arjen Hiemstra
68cde3f780
Update SaveButton to the changed OutputDevicesModel API
2015-07-30 09:31:28 +02:00
Tim Kuipers
b203c8e6cb
prime_tower_size, prime_tower_wipe_enabled, support_extruder_nr, support_roof_extruder_nr, category_dual (+icon), caterogy_shield icon
2015-07-29 16:21:54 +02:00
Tim Kuipers
f7899931e3
adhesion_extruder_nr
2015-07-29 13:13:37 +02:00
Tim Kuipers
2c010da555
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-07-28 15:20:22 +02:00
Tim Kuipers
1ef35a9a87
machine_extruder_count
2015-07-28 15:20:13 +02:00
Jaime van Kessel
54aeca603e
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-07-27 14:25:42 +02:00
Jaime van Kessel
19d711fb80
Added merging for multi material
2015-07-27 14:25:27 +02:00
Tim Kuipers
5123434b25
merge
2015-07-27 12:27:51 +02:00
Tim Kuipers
3df583a213
wrong indents
2015-07-27 12:25:18 +02:00
Jaime van Kessel
4c1d86d28c
Grouping & ungrouping is now in both context menus
2015-07-27 10:53:47 +02:00
Jaime van Kessel
03ca7142d5
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-07-24 09:06:12 +02:00
Jaime van Kessel
30b7f4da5d
Merge pull request #177 from bq/BQ_profiles_update
...
BQ profiles update
2015-07-23 17:18:45 +02:00
Nicanor Romero Venier
7475bd1af4
Changed default value for support.
2015-07-23 16:37:08 +02:00
Jaime van Kessel
ea66139751
Modifications to enable one at a time (still WIP)
2015-07-23 10:18:58 +02:00
Tim Kuipers
f846d3384c
bugfix? UM2 now has empty start-gcode and end-gcode
2015-07-23 10:18:19 +02:00
Nicanor Romero Venier
8f53ff4a0f
Changed end_gcode in Hephestos and Hephestos XL
...
At the end of the print, the extruder is moved up
10 mm instead of going all the way to the top.
2015-07-22 12:41:25 +02:00
Jaime van Kessel
68cf0c8b23
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-07-22 11:46:28 +02:00
Jaime van Kessel
78ebb13089
Changes required for printing one at a time
2015-07-22 11:46:12 +02:00
Tim Kuipers
9101415db6
support defaults to ZigZag instead of Lines
2015-07-22 09:39:33 +02:00
Jaime van Kessel
b3b14c44d7
Merge pull request #152 from simonCor/master
...
Added machine settings of German RepRap NEO machine
2015-07-22 08:52:45 +02:00
simonCor
8053df6057
Added custom build platform for grr neo
...
Added custom build platform 3d model of German Reprap NEO 3d printer.
2015-07-21 22:26:43 +02:00
Nicanor Romero Venier
bbe3a20e44
Updated BQ printer profiles.
...
Profiles have been updated to match the new JSON structure
of the printer profiles.
2015-07-21 18:19:12 +02:00
Jaime van Kessel
1ce7e78685
Added gantry height and head size with fans
2015-07-21 15:26:05 +02:00
Jaime van Kessel
a18f133e29
Head size & settings for one at a time & all at once printing
2015-07-21 11:13:38 +02:00
simonCor
1a37a0e7fd
Merge remote-tracking branch 'Ultimaker/master'
2015-07-17 23:18:26 +02:00
Tim Kuipers
49592ddf87
rename setting initial layer thickness to initial layer height
2015-07-16 13:48:44 +02:00
Tim Kuipers
3b533c653d
settings refactor: line widths together with layer height in the same category
2015-07-16 13:47:57 +02:00
Jaime van Kessel
d01279c115
Added ungrouping
2015-07-15 14:32:06 +02:00
Nicanor Romero Venier
8b6322fb5c
Updated the profiles for BQ printers.
...
The printer profiles for the BQ Witbox, BQ Prusa i3 Hephestos
and BQ Prusa i3 Hephestos XL have been updated to match the
new format of the Cura 15.06.
The settings have been adjusted for better quality results.
2015-07-15 11:29:52 +02:00
Arjen Hiemstra
a84a5d784a
Fix the platform activity check
...
Contributes to #128
2015-07-15 10:15:02 +02:00
Arjen Hiemstra
d659e5b8b8
Merge branch '15.06'
...
Conflicts:
cura/CuraApplication.py
2015-07-15 00:38:29 +02:00
Arjen Hiemstra
0bcd5d875d
Display the actual application version in the about dialog
...
This helps people reporting issues since they can report the proper
application version
2015-07-14 11:16:10 +02:00
Jaime van Kessel
2683fa0958
Added grouping action
2015-07-14 10:25:08 +02:00
Arjen Hiemstra
89b175bc5c
Merge branch '15.06'
...
* 15.06:
Do not cause "dictionary changed size during iteration" errors when changing view
Adds an idle-state for the layerview slider
Adds an idle-state for the safebutton
Sets the platform activity on true when a model is loaded
Sets the platform activity on true when a model is loaded
Create functions that get & set platform activity
Send M104 to set the temperature to 0
Do not store files that fail to load in recent files
2015-07-13 13:52:33 +02:00
Tamara Hogenhout
608283f5f4
Adds an idle-state for the layerview slider
...
When there is no model, the layerview slider goes back into the idle state
fixes #128
2015-07-10 19:28:19 +02:00
Tamara Hogenhout
81aa047ae3
Adds an idle-state for the safebutton
...
When there is no model, the safebutton goes back into the idle state
contributes to #128
2015-07-10 18:43:47 +02:00
Tamara Hogenhout
a687c9c89e
Sets the platform activity on true when a model is loaded
...
Also solved a problem with the deleteSelection trigger
contributes to #128
2015-07-10 18:41:24 +02:00
Tim Kuipers
6b48072140
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-07-10 13:14:05 +02:00
Tim Kuipers
968508b6e8
feat: infill wipe dist; wireframe restructure & renaming; bugfix: draft_shield_height inherit_function
2015-07-10 13:13:52 +02:00
