Merge branch '3.3'

plugins/ChangeLogPlugin/ChangeLog.py

@@ -23,9 +23,9 @@ class ChangeLog(Extension, QObject,):
         self._changelog_context = None
         version_string = Application.getInstance().getVersion()
         if version_string is not "master":
-            self._version = Version(version_string)
+            self._current_app_version = Version(version_string)
         else:
-            self._version = None
+            self._current_app_version = None
 
         self._change_logs = None
         Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
@@ -76,7 +76,7 @@ class ChangeLog(Extension, QObject,):
                     self._change_logs[open_version][open_header].append(line)
 
     def _onEngineCreated(self):
-        if not self._version:
+        if not self._current_app_version:
             return #We're on dev branch.
 
         if Preferences.getInstance().getValue("general/latest_version_changelog_shown") == "master":
@@ -91,7 +91,7 @@ class ChangeLog(Extension, QObject,):
         if not Application.getInstance().getGlobalContainerStack():
             return
 
-        if self._version > latest_version_shown:
+        if self._current_app_version > latest_version_shown:
             self.showChangelog()
 
     def showChangelog(self):

resources/definitions/fdmprinter.def.json

@@ -5008,7 +5008,7 @@
                     "unit": "mm³",
                     "default_value": 0,
                     "minimum_value": "0",
-                    "maximum_value_warning": "1",
+                    "maximum_value_warning": "2.5",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },

resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg

@@ -12,6 +12,7 @@ material = generic_cpe
 variant = AA 0.25
 
 [values]
+prime_tower_purge_volume = 1
 prime_tower_size = 12
 prime_tower_wall_thickness = 0.9
 retraction_extrusion_window = 0.5

resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg

@@ -16,6 +16,7 @@ material_print_temperature = =default_material_print_temperature + 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 skin_overlap = 20
 speed_print = 60
 speed_layer_0 = 20

resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg

@@ -17,6 +17,7 @@ material_print_temperature = =default_material_print_temperature + 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 speed_print = 60
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 60)

resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg

@@ -19,6 +19,7 @@ material_print_temperature = =default_material_print_temperature - 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 speed_print = 50
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 50)

resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg

@@ -17,6 +17,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 speed_print = 55
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)

resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg

@@ -17,6 +17,7 @@ line_width = =machine_nozzle_size * 0.875
 material_print_temperature = =default_material_print_temperature + 15
 material_standby_temperature = 100
 prime_tower_enable = True
+prime_tower_purge_volume = 1
 speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)

resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg

@@ -18,6 +18,7 @@ line_width = =machine_nozzle_size * 0.875
 material_print_temperature = =default_material_print_temperature + 20
 material_standby_temperature = 100
 prime_tower_enable = True
+prime_tower_purge_volume = 1
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)

resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg

@@ -18,6 +18,7 @@ line_width = =machine_nozzle_size * 0.875
 material_print_temperature = =default_material_print_temperature + 17
 material_standby_temperature = 100
 prime_tower_enable = True
+prime_tower_purge_volume = 1
 speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)

resources/variants/ultimaker3_bb0.8.inst.cfg

@@ -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)

resources/variants/ultimaker3_bb04.inst.cfg

@@ -9,6 +9,7 @@ type = variant
 hardware_type = nozzle
 
 [values]
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
 acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
@@ -21,7 +22,8 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-prime_tower_purge_volume = 1
+prime_tower_purge_volume = 2
+prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
@@ -30,6 +32,7 @@ retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
+speed_prime_tower = =math.ceil(speed_print * 10 / 35)
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)

resources/variants/ultimaker3_extended_bb0.8.inst.cfg

@@ -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)

resources/variants/ultimaker3_extended_bb04.inst.cfg

@@ -9,6 +9,7 @@ type = variant
 hardware_type = nozzle
 
 [values]
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
 acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
@@ -21,7 +22,8 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-prime_tower_purge_volume = 1
+prime_tower_purge_volume = 2
+prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
@@ -30,6 +32,7 @@ retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
+speed_prime_tower = =math.ceil(speed_print * 10 / 35)
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)