From ab19941c534e17733147358f913562c01ad0cbba Mon Sep 17 00:00:00 2001
From: Mark <mark.suurmond@gmail.com>
Date: Wed, 14 Feb 2018 15:14:14 +0100
Subject: [PATCH 1/3] Update license and url-tags

---
 cura.appdata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cura.appdata.xml b/cura.appdata.xml
index 5c67814fae..2d8bff15ec 100644
--- a/cura.appdata.xml
+++ b/cura.appdata.xml
@@ -3,7 +3,7 @@
 <component type="desktop">
   <id>cura.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <project_license>AGPL-3.0 and CC-BY-SA-4.0</project_license>
+  <project_license>LGPL-3.0 and CC-BY-SA-4.0</project_license>
   <name>Cura</name>
   <summary>The world's most advanced 3d printer software</summary>
   <description>
@@ -15,7 +15,7 @@
     </p>
     <ul>
       <li>Novices can start printing right away</li>
-      <li>Experts are able to customize 200 settings to achieve the best results</li>
+      <li>Experts are able to customize 300 settings to achieve the best results</li>
       <li>Optimized profiles for Ultimaker materials</li>
       <li>Supported by a global network of Ultimaker certified service partners</li>
       <li>Print multiple objects at once with different settings for each object</li>
@@ -26,6 +26,6 @@
   <screenshots>
     <screenshot type="default" width="1280" height="720">http://software.ultimaker.com/Cura.png</screenshot>
   </screenshots>
-  <url type="homepage">https://ultimaker.com/en/products/cura-software</url>
+  <url type="homepage">https://ultimaker.com/en/products/cura-software?utm_source=cura&utm_medium=software&utm_campaign=resources</url>
   <translation type="gettext">Cura</translation>
 </component>

From 64ea2399a1e5d5681324c9c78f3efcd7fd8240a1 Mon Sep 17 00:00:00 2001
From: Mark <mark.suurmond@gmail.com>
Date: Wed, 14 Feb 2018 15:15:02 +0100
Subject: [PATCH 2/3] Add tags to urls

---
 plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py | 2 +-
 resources/qml/SidebarHeader.qml                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py
index 8e4c70517f..23a040f2e2 100644
--- a/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py
+++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py
@@ -20,7 +20,7 @@ i18n_catalog = i18nCatalog("cura")
 #  The plugin is currently only usable for applications maintained by Ultimaker. But it should be relatively easy
 #  to change it to work for other applications.
 class FirmwareUpdateChecker(Extension):
-    JEDI_VERSION_URL = "http://software.ultimaker.com/jedi/releases/latest.version"
+    JEDI_VERSION_URL = "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources"
 
     def __init__(self):
         super().__init__()
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 43bfa7b794..6c4731931e 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -421,7 +421,7 @@ Column
                         // open the material URL with web browser
                         var version = UM.Application.version;
                         var machineName = Cura.MachineManager.activeMachine.definition.id;
-                        var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName;
+                        var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName + "?utm_source=cura&utm_medium=software&utm_campaign=resources";
                         Qt.openUrlExternally(url);
                     }
                     onEntered: {

From 0b62a312c3a21ca67aec63b29e64a200744b3ae5 Mon Sep 17 00:00:00 2001
From: Ian Paschal <i.paschal@ultimaker.com>
Date: Wed, 14 Feb 2018 16:56:07 +0100
Subject: [PATCH 3/3] CURA-4869 Infill meshes influence layer count in layer
 view

If a layer is empty, don't add it to the total layer count!
---
 plugins/SimulationView/SimulationView.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py
index 253ece315e..35ce9cc37a 100644
--- a/plugins/SimulationView/SimulationView.py
+++ b/plugins/SimulationView/SimulationView.py
@@ -342,6 +342,11 @@ class SimulationView(View):
             min_layer_number = sys.maxsize
             max_layer_number = -sys.maxsize
             for layer_id in layer_data.getLayers():
+
+                # If a layer doesn't contain any polygons, skip it (for infill meshes taller than print objects
+                if len(layer_data.getLayer(layer_id).polygons) < 1:
+                    continue
+
                 # Store the max and min feedrates and thicknesses for display purposes
                 for p in layer_data.getLayer(layer_id).polygons:
                     self._max_feedrate = max(float(p.lineFeedrates.max()), self._max_feedrate)
@@ -634,4 +639,3 @@ class _CreateTopLayersJob(Job):
     def cancel(self):
         self._cancel = True
         super().cancel()
-