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

5457 Commits

Author SHA1 Message Date
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
Arjen Hiemstra
fec2207b50 Merge branch '15.06' 
* 15.06:
  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.
  tiniest detail concerning the padding of the layer count label
  Adds layer count
 2015-07-10 13:10:15 +02:00
Tamara Hogenhout
ae89ef37c0 Enlarge the zone where you can use scrolling to look trough the layer mode. 
Also make it more visible

fixes #118
 2015-07-09 16:27:31 +02:00
Tim Kuipers
43d1aead76 included retraction_extra_prime_amount 2015-07-09 11:38:15 +02:00
Arjen Hiemstra
078295d6e1 Write to the right device after changes in Uranium API 2015-07-08 22:04:50 +02:00
Arjen Hiemstra
c2e672591c Remove the output_device related stuff from CuraApplication and fix the qml 
This is now properly handled by the Output Device API in Uranium
 2015-07-08 21:42:20 +02:00
Arjen Hiemstra
baf4ea9523 Use the OutputDeviceModel for selecting output device 
Replaces the stuff in CuraApplication which really should not be there
 2015-07-08 21:26:54 +02:00
simonCor
ace5641f76 Added GRR neo profile 
Adds the machine profile for the German Reprap NEO printer.
 2015-07-08 20:25:02 +02:00
Tamara Hogenhout
ab07b0205f tiniest detail concerning the padding of the layer count label 
Fixes #117
 2015-07-08 18:05:50 +02:00
Tamara Hogenhout
53a94c23e1 Adds layer count 
Brings back the layer count, the min & max. And it does not display these untill Cura is done slicing.

Fixes #117
 2015-07-08 18:01:03 +02:00
Tim Kuipers
1c72041df0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-07-08 17:03:22 +02:00
Tim Kuipers
f00568ecd8 feature: draft protection screen 2015-07-08 17:02:42 +02:00
Arjen Hiemstra
032e27c68c Merge branch '15.06' 2015-07-08 13:03:05 +02:00
Jaime van Kessel
9a3669b643 Added witbox profile posted on UM forum by datmos 2015-07-08 12:27:27 +02:00