GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 21:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 290 Branches 260 Tags
Commit Graph

4678 Commits

Author SHA1 Message Date
Jaime van Kessel
ed5244bcb0 Merge branch 'feature_concentric_3d_infill' of github.com:Ultimaker/Cura 2016-11-04 14:53:57 +01:00
Ghostkeeper
ccd0daee12
Set layer start position defaults 
Originally this was only extruder_prime_pos_x and _y, but that setting is different per extruder. So now it computes the average prime position.

Contributes to issue CURA-1112.
 2016-11-04 11:36:20 +01:00
Ghostkeeper
871a19091d
Merge branch 'feature_start_layer_far_away' 2016-11-04 10:52:38 +01:00
Tim Kuipers
1b853de981 Revert "JSON refactor: support_mesh ==> overhang_mesh (CURA-2077)" 
This reverts commit d675ffe6e9765e5118b85585502aee7a1cb3283c.
 2016-11-03 20:22:22 +01:00
Tim Kuipers
1787b1e65b JSON refactor: support_mesh ==> overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
b840711960 JSON feat: support_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
2c87cddd3c JSON refactor: anti_support_mesh ==> anti_overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
09a64c7ba0 JSON feat: anti support meshes (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
c430980536 JSON feat: wall_0_wipe_dist (CURA-1698) 2016-11-03 20:15:24 +01:00
Ghostkeeper
0f374a2e23
Merge branch 'feature_infill_support' 2016-11-03 13:37:26 +01:00
Ghostkeeper
612ef1c0c6
Fix spelling and grammar of Remove Mesh Intersection 
'objecs' to 'objects'.
Removed superfluous 'is'.

Contributes to issue CURA-2712.
 2016-11-02 14:54:19 +01:00
Ghostkeeper
24f78a7ee6
Capitalise setting name for Hollow Objects 
This is in line with other setting names.

Contributes to issue CURA-2748.
 2016-11-01 16:31:42 +01:00
Ghostkeeper
6fa36f7c09
Merge branch '2.3' 2016-11-01 16:07:18 +01:00
Ghostkeeper
073c219233
Use spaces instead of tabs 
As per our code standards.
 2016-11-01 12:50:06 +01:00
Tim Kuipers
bce6a6fed4 refactor: move infill_hollow to experimental category (CURA-2748) 2016-11-01 11:06:56 +01:00
Tim Kuipers
06d2f01075 Merge branch 'master' into feature_infill_support 2016-11-01 11:04:05 +01:00
Ghostkeeper
0db7cf2453
Revert 'Added a comment' and 'Set horizontal expansion' 
This horizontal expansion messes prints with very thin parts. It was probably the wrong solution for the problem. We'll revert the change until we hear more from tests at the materials team.

Contributes to issue CURA-2845.
 2016-11-01 10:28:09 +01:00
Simon Edwards
1fbd179aaa Merge branch '2.3' 2016-10-31 13:30:20 +01:00
Simon Edwards
8c25a91e02 Added a comment to help provide some kind of explaination for this magic value. 
CURA-2845 Prints are slightly oversized
 2016-10-31 11:45:59 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Ghostkeeper
00890abe30
Set horizontal expansion to -0.14mm 
The material team observed that the size of prints was slightly too big. They decided that this adjustment was the best solution.

Contributes to issue CURA-2845.
 2016-10-31 10:55:08 +01:00
fieldOfView
6e683dffc5 Fix printrbot simple mesh alignment to buildplate grid 2016-10-27 23:35:29 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Jaime van Kessel
b381186331 Set um2+ height to same as um2 2016-10-27 13:02:38 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Arjen Hiemstra
30e14478af Replace quality profiles with optimised versions of Ruben's script 
With the global quality profiles merged this now works properly.

CURA-2645
 2016-10-25 15:40:52 +02:00
fieldOfView
29b357894d Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-25 11:57:15 +02:00
fieldOfView
c0824260a3 Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-24 14:45:26 +02:00
Chris Pearson
9686c9db1c Add definition for Printrbot Play with heated bed upgrade. 2016-10-22 17:36:21 +01:00
Chris Pearson
8330b953e8 Add definition and mesh for Printrbot Play. 2016-10-22 16:36:06 +01:00
Tim Kuipers
0bc50523d6 JSON feat: retract_at_layer_change (CURA-2780) 2016-10-22 16:20:20 +02:00
fieldOfView
0597610388 Add known manufacturers, make capitalization consistent 2016-10-22 15:37:28 +02:00
Tim Kuipers
a58c247016 JSOn feat: material_print_temperature_layer_0 (CURA-2736) 2016-10-22 14:27:56 +02:00
Tim Kuipers
e1409c4f83 julia machine definition 2016-10-22 12:15:29 +02:00
Tim Kuipers
48b5632fdc all machines from legacy Cura 2016-10-22 01:10:42 +02:00
Tim Kuipers
8fb52d86e4 JSOn feat: material_bed_temperature_layer_0 (CURA-2781) 2016-10-21 18:21:38 +02:00
Tim Kuipers
d01f0053bf JSOn feat: start_layers_at_same_position, layer_start_x, layer_start_y (CURA-1112) 2016-10-21 17:46:16 +02:00
Tim Kuipers
981907d26a Revert "Revert "JSON feat: carve_multiple_volumes (CURA-2712)"" 
This reverts commit 2bff94ba9f6c0293b4f6c6a1fd79548422639a4d.

reapplies 8ee22738bc75353aa9d12f1dcdf8bf41a3881602
 2016-10-21 16:21:08 +02:00
Tim Kuipers
2bff94ba9f Revert "JSON feat: carve_multiple_volumes (CURA-2712)" 
This reverts commit 8ee22738bc75353aa9d12f1dcdf8bf41a3881602.
 2016-10-21 16:20:39 +02:00
Tim Kuipers
8ee22738bc JSON feat: carve_multiple_volumes (CURA-2712) 2016-10-21 16:07:03 +02:00
Tim Kuipers
c17ee18ccb JSON feat: concentric 3D infill (CURA-2772) 2016-10-21 14:16:00 +02:00
Ghostkeeper
3c9ebfab8f
Merge branch '2.3' 
Conflicts:
	resources/definitions/fdmprinter.def.json
	resources/materials/generic_abs.xml.fdm_material
	resources/materials/generic_cpe.xml.fdm_material
	resources/materials/generic_nylon.xml.fdm_material
	resources/materials/generic_pla.xml.fdm_material
	resources/materials/ultimaker_abs_black.xml.fdm_material
	resources/materials/ultimaker_abs_blue.xml.fdm_material
	resources/materials/ultimaker_abs_green.xml.fdm_material
	resources/materials/ultimaker_abs_grey.xml.fdm_material
	resources/materials/ultimaker_abs_orange.xml.fdm_material
	resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material
	resources/materials/ultimaker_abs_red.xml.fdm_material
	resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_abs_white.xml.fdm_material
	resources/materials/ultimaker_abs_yellow.xml.fdm_material
	resources/materials/ultimaker_cpe_black.xml.fdm_material
	resources/materials/ultimaker_cpe_blue.xml.fdm_material
	resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_green.xml.fdm_material
	resources/materials/ultimaker_cpe_light-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_red.xml.fdm_material
	resources/materials/ultimaker_cpe_transparent.xml.fdm_material
	resources/materials/ultimaker_cpe_white.xml.fdm_material
	resources/materials/ultimaker_cpe_yellow.xml.fdm_material
	resources/materials/ultimaker_nylon_black.xml.fdm_material
	resources/materials/ultimaker_nylon_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_black.xml.fdm_material
	resources/materials/ultimaker_pla_blue.xml.fdm_material
	resources/materials/ultimaker_pla_green.xml.fdm_material
	resources/materials/ultimaker_pla_magenta.xml.fdm_material
	resources/materials/ultimaker_pla_orange.xml.fdm_material
	resources/materials/ultimaker_pla_pearl-white.xml.fdm_material
	resources/materials/ultimaker_pla_red.xml.fdm_material
	resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_pla_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_white.xml.fdm_material
	resources/materials/ultimaker_pla_yellow.xml.fdm_material

Contributes to issue CURA-2737.
 2016-10-20 12:41:31 +02:00
Ghostkeeper
aa9516451d Merge branch '2.3.1' into 2.3 2016-10-20 11:04:28 +02:00
Tim Kuipers
e0b6679b91 JSON feat: infill_hollow (CURA-2748) 2016-10-19 18:14:03 +02:00
Tim Kuipers
fd50d9e316 JSON fix: added comment in cool_min_layer_time description about Minimum Speed (CURA-2720) 2016-10-19 14:44:58 +02:00
Ghostkeeper
06ff2a9da6
Publish Ultimaker 3 definitions and profiles 
The Ultimaker 3 is now released, so we can make this data public. These are the Ultimaker 3 definition files (with their physical properties as Cura requires them, such as build volume) as well as its extruders, print cores, quality profiles and build plate mesh. And also for the Ultimaker 3 Extended. Modifications to the material profiles will be published in the fdm_materials repository.

Contributes to issue CURA-2737.
 2016-10-19 13:35:00 +02:00
Tim Kuipers
c7c3d24974 fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707) 2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) 2016-10-19 13:14:06 +02:00
Tim Kuipers
9780895812 JSON fix: retraction_hop_after_extruder_switch only visible for dual extrusion (CURA-2727) 2016-10-19 13:05:10 +02:00
Tim Kuipers
aad3da85e9 JSON refactor: move retraction_hop_after_extruder_switch to Travel category (CURA-2727) 2016-10-19 12:59:28 +02:00