GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-25 07:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,148 Commits 291 Branches 265 Tags
Commit Graph

12148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
a82717f65c Added views to top bar 
Closes #73 and CURA-38 #close
 2015-07-31 17:05:44 +02:00
Tamara Hogenhout
783b75bcd9 combines work on the wizard by Jaime and myself 
contributes to #128
 2015-07-31 16:42:57 +02:00
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
825349b47b Add RemovableDrive plugin that has been moved from Uranium 
Since it now depends on GCodeWriter we should put it somewhere where
GCodeWriter actually exists.
 2015-07-30 17:14:22 +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
e84322ed82 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-07-30 15:10:48 +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
Tim Kuipers
294c7c0f09 new back end call, following new command line parsing 2015-07-30 15:05:07 +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
53e0f681a0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-07-29 16:23:16 +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
Jaime van Kessel
5897237710 removed debug code 2015-07-29 16:13:12 +02:00
Tim Kuipers
f7899931e3 adhesion_extruder_nr 2015-07-29 13:13:37 +02:00
Arjen Hiemstra
7c3e53f714 Merge branch 'output_device' of github.com:Ultimaker/cura into output_device 2015-07-29 11:11:17 +02:00
Arjen Hiemstra
d6b3044c79 Update GCodeWriter to the new API 2015-07-28 17:57:08 +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
awhiemstra
9c90a1abcd Add log file information 2015-07-28 10:16:49 +02:00
Jaime van Kessel
c1b2ad8a86 Update README.md 2015-07-28 09:15:32 +02:00
Arjen Hiemstra
9d3b36e3ae Fix USB printer detection and reconnect after firmware update on MacOSX 
Rather than sending an M105 only after receiving a line with T:, always
send M105 when we are trying to detect baudrate, otherwise we can end
up in an undefined state.

Contributes to #82
1.15.06.03 15.06.03 		2015-07-27 18:50:10 +02:00
Arjen Hiemstra
b4596b1ae8 Correct the icon for the Cura .desktop file 
Contributes to Ultimaker/Uranium#42
 2015-07-27 16:45:44 +02:00
Arjen Hiemstra
b22b79dcb6 Bump version 2015-07-27 16:39:05 +02:00
Jaime van Kessel
4318b7e5ab Original center is now used for merging 2015-07-27 14:36:24 +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
37433d2a8a Updated protocol & refactoring 2015-07-24 15:58:41 +02:00
Jaime van Kessel
453047df1f Fix to grouped one at a time 2015-07-24 10:55:59 +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
7349e28b84 Added gantry height check 2015-07-22 12:08:38 +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
Jaime van Kessel
5c54a260f3 Merge pull request #165 from bq/BQ_profiles_update 
Updated BQ printer profiles structure.
 2015-07-22 08:52:02 +02:00