Merge master into material marketplace

This commit is contained in:
Lipu Fei 2018-05-01 11:56:34 +02:00
commit 9a5fb47a6e
228 changed files with 125261 additions and 4020 deletions

View file

@ -10,6 +10,7 @@ hardware_type = nozzle
[values]
acceleration_enabled = True
acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
acceleration_print = 4000
acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
@ -39,7 +40,8 @@ material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_purge_volume = 1
prime_tower_purge_volume = 2
prime_tower_wall_thickness = 2.2
prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0
raft_airgap = 0
@ -61,6 +63,7 @@ retraction_min_travel = =line_width * 3
retraction_prime_speed = 15
skin_overlap = 5
speed_layer_0 = 20
speed_prime_tower = =math.ceil(speed_print * 7 / 35)
speed_print = 35
speed_support = =math.ceil(speed_print * 25 / 35)
speed_support_interface = =math.ceil(speed_support * 20 / 25)