Hello community, here is the log from the commit of package cura-fdm-materials for openSUSE:Factory checked in at 2020-09-17 14:46:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cura-fdm-materials (Old) and /work/SRC/openSUSE:Factory/.cura-fdm-materials.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cura-fdm-materials" Thu Sep 17 14:46:46 2020 rev:5 rq:835123 version:4.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cura-fdm-materials/cura-fdm-materials.changes 2020-06-07 21:56:03.588816231 +0200 +++ /work/SRC/openSUSE:Factory/.cura-fdm-materials.new.4249/cura-fdm-materials.changes 2020-09-17 14:49:44.163847162 +0200 @@ -1,0 +2,9 @@ +Tue Sep 15 21:20:28 UTC 2020 - Stefan Brüns <[email protected]> + +- Update to version 4.7.1 + Release notes: + * https://github.com/Ultimaker/Cura/releases/tag/4.7.1 + * https://github.com/Ultimaker/Cura/releases/tag/4.7.0 + * https://github.com/Ultimaker/Cura/releases/tag/4.6.2 + +------------------------------------------------------------------- Old: ---- fdm_materials-4.6.1.obscpio New: ---- fdm_materials-4.7.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cura-fdm-materials.spec ++++++ --- /var/tmp/diff_new_pack.iygago/_old 2020-09-17 14:49:52.351854977 +0200 +++ /var/tmp/diff_new_pack.iygago/_new 2020-09-17 14:49:52.351854977 +0200 @@ -17,7 +17,7 @@ Name: cura-fdm-materials -Version: 4.6.1 +Version: 4.7.1 Release: 0 Summary: FDM material database License: CC0-1.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.iygago/_old 2020-09-17 14:49:52.391855015 +0200 +++ /var/tmp/diff_new_pack.iygago/_new 2020-09-17 14:49:52.391855015 +0200 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/Ultimaker/fdm_materials.git</param> <param name="scm">git</param> - <param name="revision">4.6.1</param> - <param name="version">4.6.1</param> + <param name="revision">4.7.1</param> + <param name="version">4.7.1</param> <param name="submodules">disable</param> </service> <service mode="disabled" name="set_version" /> ++++++ fdm_materials-4.6.1.obscpio -> fdm_materials-4.7.1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/.gitlab-ci.yml new/fdm_materials-4.7.1/.gitlab-ci.yml --- old/fdm_materials-4.6.1/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/.gitlab-ci.yml 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,32 @@ +# yamllint disable rule:line-length +# SPDX-License-Identifier: AGPL-3.0+ +# +# Copyright (C) 2019 Ultimaker B.V. + +include: + - project: ultimaker/embedded/prime-jedi + ref: master + file: /gitlab_ci_templates/jedi-gitlab-ci-template.yml + +# Prepare stage, prepares a Docker image based on the Docker file in /docker_env subfolder of the repository. +# To have early feedback when setting up your Docker image, make sure you implement a buildenv_check.sh script, +# see the exeample in this repository. +# ================================================================================== +prepare_environment: + extends: + - .jobs_common + - .environment_common + stage: prepare + variables: + GIT_STRATEGY: clone + script: + - ./make_docker.sh "${BUILD_PIPELINE_IMAGE}" + +XSD_test: + extends: + - .jobs_common + - .build_test_common + stage: test + script: + - git fetch origin master:master + - ./run_check_material_profiles_new_with_lxml.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/CMakeLists.txt new/fdm_materials-4.7.1/CMakeLists.txt --- old/fdm_materials-4.6.1/CMakeLists.txt 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/CMakeLists.txt 2020-07-23 12:46:57.000000000 +0200 @@ -29,23 +29,6 @@ # Determine version number find_package(Git) -set(GIT_VERSION "unknown") -if(GIT_FOUND) - execute_process( - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${GIT_EXECUTABLE} describe --tags --dirty - OUTPUT_VARIABLE GIT_VERSION - RESULT_VARIABLE GIT_RETURN_VALUE - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - - if(NOT GIT_RETURN_VALUE AND GIT_VERSION) - string(REPLACE "/" "_" GIT_VERSION ${GIT_VERSION}) - set(CPACK_PACKAGE_VERSION "${GIT_VERSION}") - endif() - message("Package version derived from git: ${GIT_VERSION}") -endif() - if (DEFINED ENV{GITHUB_ACTIONS}) set(CPACK_PACKAGE_VERSION "${GIT_VERSION}+$ENV{GITHUB_SHA}") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/CPackConfig.cmake new/fdm_materials-4.7.1/CPackConfig.cmake --- old/fdm_materials-4.6.1/CPackConfig.cmake 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/CPackConfig.cmake 2020-07-23 12:46:57.000000000 +0200 @@ -1,9 +1,9 @@ set(CPACK_PACKAGE_VENDOR "Ultimaker") set(CPACK_PACKAGE_CONTACT "Ultimaker <[email protected]>") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ultimaker Embedded services") -set(CPACK_PACKAGE_VERSION_MAJOR 9999) -set(CPACK_PACKAGE_VERSION_MINOR 99) -set(CPACK_PACKAGE_VERSION_PATCH 99) +set(CPACK_PACKAGE_VERSION_MAJOR 999) +set(CPACK_PACKAGE_VERSION_MINOR 999) +set(CPACK_PACKAGE_VERSION_PATCH 999) set(CPACK_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE all) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/build.sh new/fdm_materials-4.7.1/build.sh --- old/fdm_materials-4.6.1/build.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/build.sh 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,65 @@ +#!/bin/sh + +ARCH="armhf" + +# Common directory variables +SYSCONFDIR="${SYSCONFDIR:-/etc}" +SRC_DIR="$(pwd)" +BUILD_DIR_TEMPLATE="_build_${ARCH}" +BUILD_DIR="${BUILD_DIR:-${SRC_DIR}/${BUILD_DIR_TEMPLATE}}" + +# Debian package information +PACKAGE_NAME="${PACKAGE_NAME:-fdm-materials}" +RELEASE_VERSION="${RELEASE_VERSION:-999.999.999}" + +build() +{ + mkdir -p "${BUILD_DIR}" + cd "${BUILD_DIR}" || return + echo "Building with cmake" + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCPACK_PACKAGE_VERSION="${RELEASE_VERSION}" -DCPACK_PACKAGE_NAME="${PACKAGE_NAME}" -DCPACK_PACKAGE_ARCH="${ARCH}" +} + +create_debian_package() +{ + make package +} + +cleanup() +{ + rm -rf "${BUILD_DIR:?}" +} + +usage() +{ + echo "Usage: ${0} [OPTIONS]" + echo " -c Explicitly cleanup the build directory" + echo " -h Print this usage" + echo "NOTE: This script requires root permissions to run." +} + +while getopts ":hc" options; do + case "${options}" in + c) + cleanup + exit 0 + ;; + h) + usage + exit 0 + ;; + :) + echo "Option -${OPTARG} requires an argument." + exit 1 + ;; + ?) + echo "Invalid option: -${OPTARG}" + exit 1 + ;; + esac +done +shift "$((OPTIND - 1))" + +cleanup +build +create_debian_package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/build_for_ultimaker.sh new/fdm_materials-4.7.1/build_for_ultimaker.sh --- old/fdm_materials-4.6.1/build_for_ultimaker.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/build_for_ultimaker.sh 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,122 @@ +#!/bin/bash +# +# SPDX-License-Identifier: AGPL-3.0+ +# +# Copyright (C) 2019 Ultimaker B.V. +# +# SPDX-License-Identifier: LGPL-3.0+ + +set -eu + +ARCH="armhf" + +SRC_DIR="$(pwd)" +RELEASE_VERSION="${RELEASE_VERSION:-999.999.999}" +DOCKER_WORK_DIR="/build" +BUILD_DIR_TEMPLATE="_build_${ARCH}" +BUILD_DIR="${BUILD_DIR:-${SRC_DIR}/${BUILD_DIR_TEMPLATE}}" + +run_env_check="yes" +run_linters="yes" +run_tests="yes" + +# Make sure to pass an empty argument to make_docker, else any arguments passed to build_for_ultimaker is passed to make_docker instead! +. ./make_docker.sh "" + +env_check() +{ + run_in_docker "./docker_env/buildenv_check.sh" +} + +run_build() +{ + run_in_docker "./build.sh" "${@}" +} + +deliver_pkg() +{ + run_in_docker chown -R "$(id -u):$(id -g)" "${DOCKER_WORK_DIR}" + + cp "${BUILD_DIR}/"*".deb" "./" +} + +run_tests() +{ + echo "Testing!" + # These tests should never fail! See .gitlab-ci.yml + ./run_check_material_profiles_new_with_lxml.sh || echo "Material Profile Check with lxml Failed!" +} + +run_linters() +{ + run_shellcheck +} + +run_shellcheck() +{ + docker run \ + --rm \ + -v "$(pwd):${DOCKER_WORK_DIR}" \ + -w "${DOCKER_WORK_DIR}" \ + "registry.hub.docker.com/koalaman/shellcheck-alpine:stable" \ + "./run_shellcheck.sh" +} + +usage() +{ + echo "Usage: ${0} [OPTIONS]" + echo " -c Skip build environment checks" + echo " -h Print usage" + echo " -l Skip code linting" + echo " -t Skip tests" +} + +while getopts ":chlt" options; do + case "${options}" in + c) + run_env_check="no" + ;; + h) + usage + exit 0 + ;; + l) + run_linters="no" + ;; + t) + run_tests="no" + ;; + :) + echo "Option -${OPTARG} requires an argument." + exit 1 + ;; + ?) + echo "Invalid option: -${OPTARG}" + exit 1 + ;; + esac +done +shift "$((OPTIND - 1))" + +if ! command -V docker; then + echo "Docker not found, docker-less builds are not supported." + exit 1 +fi + +if [ "${run_env_check}" = "yes" ]; then + env_check +fi + +if [ "${run_linters}" = "yes" ]; then + run_linters +fi + +run_build "${@}" + +if [ "${run_tests}" = "yes" ]; then + run_tests +fi + +deliver_pkg + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/docker_env/Dockerfile new/fdm_materials-4.7.1/docker_env/Dockerfile --- old/fdm_materials-4.6.1/docker_env/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/docker_env/Dockerfile 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,12 @@ +FROM registry.hub.docker.com/library/debian:buster-slim + +LABEL Maintainer="[email protected]" \ + Comment="Ultimaker update-tools filesystem" + +RUN apt-get update && apt-get -y install cmake make python3 python3-pip git + +COPY docker_env/buildenv_check.sh buildenv_check.sh + +COPY fdm_requirements.txt fdm_requirements.txt + +RUN pip3 install -r fdm_requirements.txt \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/docker_env/buildenv_check.sh new/fdm_materials-4.7.1/docker_env/buildenv_check.sh --- old/fdm_materials-4.6.1/docker_env/buildenv_check.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/docker_env/buildenv_check.sh 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/sh + +set -eu + +CROSS_COMPILE="${CROSS_COMPILE:-""}" + +COMMANDS=" \ +cmake \ +make \ +python3 \ +pip3 \ +git \ +" +result=0 + +echo_line(){ + echo "--------------------------------------------------------------------------------" +} + +check_command_installation() +{ + for pkg in ${COMMANDS}; do + PATH="${PATH}:/sbin:/usr/sbin:/usr/local/sbin" command -V "${pkg}" || result=1 + done +} + +echo_line +echo "Verifying build environment commands:" +check_command_installation +echo_line + +if [ "${result}" -ne 0 ]; then + echo "ERROR: Missing preconditions, cannot continue." + exit 1 +fi + +echo_line +echo "Build environment OK" +echo_line + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_abs.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_abs.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_abs.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_abs.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -5,12 +5,13 @@ <brand>eMotionTech</brand> <material>ABS</material> <color>Generic</color> + <label>ABS</label> </name> <GUID>6039cd0c-dff1-4c51-9849-1cce0161430b</GUID> <version>14</version> <color_code>#8cb219</color_code> <description> </description> - <adhesion_info> </adhesion_info> + <adhesion_info>We recommend the use of DimaFix, preferablt "pen" style, don't forget applying it on COOL glass surface</adhesion_info> </metadata> <properties> <density>1.03</density> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_absx.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_absx.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_absx.xml.fdm_material 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_absx.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> + <metadata> + <name> + <brand>eMotionTech</brand> + <material>ABS</material> + <color>Generic</color> + <label>ABS-X</label> + </name> + <GUID>533effc5-31f9-4c02-9af7-a9cf268615cd</GUID> + <version>14</version> + <color_code>#8cb219</color_code> + <description>Zero warp technology</description> + <adhesion_info>We recommend the use of DimaFix, preferablt "pen" style, don't forget applying it on COOL glass surface</adhesion_info> + </metadata> + <properties> + <density>1.1</density> + <diameter>1.75</diameter> + <weight>2300</weight> + </properties> + <settings> + <setting key="print temperature">245</setting> + <setting key="heated bed temperature">100</setting> + <setting key="standby temperature">175</setting> + <setting key="retraction amount">1.4</setting> + <setting key="build volume temperature">45</setting> + <machine> + <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/> + <hotend id="Standard 0.4" > + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">240</setting> + <setting key="retraction amount">1.3</setting> + </hotend> + <hotend id="Standard 0.6" > + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">245</setting> + <setting key="retraction amount">1.4</setting> + </hotend> + <hotend id="Standard 0.8"> + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">250</setting> + <setting key="retraction amount">1.5</setting> + </hotend> + <!-- Commented out until eMotionTech adds their hotend profiles to Cura. + <hotend id="Standard 1.0"> + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">255</setting> + <setting key="retraction amount">1.6</setting> + </hotend> + <hotend id="Standard 1.2"> + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">260</setting> + <setting key="retraction amount">1.7</setting> + </hotend> + --> + </machine> + </settings> +</fdmmaterial> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_asax.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_asax.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_asax.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_asax.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -10,7 +10,7 @@ <version>14</version> <color_code>#159499</color_code> <description> </description> - <adhesion_info> </adhesion_info> + <adhesion_info>We recommend the use of DimaFix, preferablt "pen" style, don't forget applying it on COOL glass surface</adhesion_info> </metadata> <properties> <density>1.11</density> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_bvoh.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_bvoh.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_bvoh.xml.fdm_material 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_bvoh.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> + <metadata> + <name> + <brand>eMotionTech</brand> + <material>Soluble</material> + <color>Generic</color> + <label>BVOH</label> + </name> + <GUID>ea8a4d2d-dc52-454a-a1f3-60f50cd37df7</GUID> + <version>14</version> + <color_code>#D5D8DC</color_code> + <description>Water Soluble; Good bonding to PLA, PET-G, ABS, ASA, etc.</description> + <adhesion_info> </adhesion_info> + </metadata> + <properties> + <density>1.23</density> + <diameter>1.75</diameter> + <weight>750</weight> + </properties> + <settings> + <setting key="print temperature">210</setting> + <setting key="standby temperature">75</setting> + <setting key="retraction amount">1.3</setting> + <machine> + <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/> + <hotend id="Standard 0.4" > + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">195</setting> + <setting key="retraction amount">1.3</setting> + </hotend> + <hotend id="Standard 0.6" > + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">200</setting> + <setting key="retraction amount">1.3</setting> + </hotend> + <hotend id="Standard 0.8"> + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">205</setting> + <setting key="retraction amount">1.3</setting> + </hotend> + <!-- Commented out until eMotionTech adds their hotend profiles to Cura. + <hotend id="Standard 1.0"> + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">210</setting> + <setting key="retraction amount">1.4</setting> + </hotend> + <hotend id="Standard 1.2"> + <setting key="hardware compatible">yes</setting> + <setting key="print temperature">213</setting> + <setting key="retraction amount">1.5</setting> + </hotend> + --> + </machine> + </settings> +</fdmmaterial> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_hips.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_hips.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_hips.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_hips.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -3,14 +3,14 @@ <metadata> <name> <brand>eMotionTech</brand> - <material>HIPS</material> + <material>Soluble</material> <color>Generic</color> <label>HIPS</label> </name> <GUID>64046874-b7c1-45c2-befa-db2d1a6dec3d</GUID> <version>14</version> <color_code>#D5D8DC</color_code> - <description>Good bonding to styrene based materials, d-limonene soluble</description> + <description>D-Limonene Soluble; Good bonding to styrene based materials</description> <adhesion_info> </adhesion_info> </metadata> <properties> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_petg.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_petg.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_petg.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_petg.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -10,7 +10,7 @@ <version>14</version> <color_code>#f3a112</color_code> <description> </description> - <adhesion_info> </adhesion_info> + <adhesion_info>We recommend the use of 3DLac on the glass surface</adhesion_info> </metadata> <properties> <density>1.27</density> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_pla.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_pla.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_pla.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_pla.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -10,7 +10,7 @@ <version>14</version> <color_code>#ffc924</color_code> <description> </description> - <adhesion_info> </adhesion_info> + <adhesion_info>We recommend the use of 3DLac on the glass surface</adhesion_info> </metadata> <properties> <density>1.24</density> @@ -41,7 +41,7 @@ <setting key="retraction amount">1.4</setting> </hotend> <!-- Commented out until eMotionTech adds their hotend profiles to Cura. - <hotend id="Standard 1.0"> + <hotend id="Standard 1.0"> <setting key="hardware compatible">yes</setting> <setting key="print temperature">225</setting> <setting key="retraction amount">1.5</setting> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_pva-m.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_pva-m.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_pva-m.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_pva-m.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -3,14 +3,14 @@ <metadata> <name> <brand>eMotionTech</brand> - <material>PVA</material> + <material>Soluble</material> <color>Generic</color> <label>PVA-M</label> </name> <GUID>ee26b749-9c0a-4b8f-885e-db92fcdd23da</GUID> <version>14</version> <color_code>#D5D8DC</color_code> - <description>Good bonding to PLA, PET-G and ABS, thermally much more stable than a regular PVA</description> + <description>Water Soluble; Good bonding to PLA, PET-G</description> <adhesion_info> </adhesion_info> </metadata> <properties> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_pva-oks.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_pva-oks.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_pva-oks.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_pva-oks.xml.fdm_material 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> - <metadata> - <name> - <brand>eMotionTech</brand> - <material>PVA</material> - <color>Generic</color> - <label>PVA-OKS</label> - </name> - <GUID>ea8a4d2d-dc52-454a-a1f3-60f50cd37df7</GUID> - <version>14</version> - <color_code>#D5D8DC</color_code> - <description>Good bonding to PLA</description> - <adhesion_info> </adhesion_info> - </metadata> - <properties> - <density>1.23</density> - <diameter>1.75</diameter> - <weight>750</weight> - </properties> - <settings> - <setting key="print temperature">210</setting> - <setting key="standby temperature">75</setting> - <setting key="retraction amount">1.3</setting> - <machine> - <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/> - <hotend id="Standard 0.4" > - <setting key="hardware compatible">yes</setting> - <setting key="print temperature">200</setting> - <setting key="retraction amount">1.3</setting> - </hotend> - <hotend id="Standard 0.6" > - <setting key="hardware compatible">yes</setting> - <setting key="print temperature">200</setting> - <setting key="retraction amount">1.3</setting> - </hotend> - <hotend id="Standard 0.8"> - <setting key="hardware compatible">yes</setting> - <setting key="print temperature">205</setting> - <setting key="retraction amount">1.3</setting> - </hotend> - <!-- Commented out until eMotionTech adds their hotend profiles to Cura. - <hotend id="Standard 1.0"> - <setting key="hardware compatible">yes</setting> - <setting key="print temperature">210</setting> - <setting key="retraction amount">1.4</setting> - </hotend> - <hotend id="Standard 1.2"> - <setting key="hardware compatible">yes</setting> - <setting key="print temperature">213</setting> - <setting key="retraction amount">1.5</setting> - </hotend> - --> - </machine> - </settings> -</fdmmaterial> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_pva-s.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_pva-s.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_pva-s.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_pva-s.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -3,14 +3,14 @@ <metadata> <name> <brand>eMotionTech</brand> - <material>PVA</material> + <material>Soluble</material> <color>Generic</color> <label>PVA-S</label> </name> <GUID>bc356ea0-1791-479a-9272-40d228d0269a</GUID> <version>14</version> <color_code>#D5D8DC</color_code> - <description>Good bonding styrene based materials</description> + <description>Water Soluble; Good bonding styrene based materials</description> <adhesion_info> </adhesion_info> </metadata> <properties> @@ -26,23 +26,23 @@ <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/> <hotend id="Standard 0.4" > <setting key="hardware compatible">yes</setting> - <setting key="print temperature">240</setting> + <setting key="print temperature">230</setting> <setting key="retraction amount">1.3</setting> </hotend> <hotend id="Standard 0.6" > <setting key="hardware compatible">yes</setting> - <setting key="print temperature">240</setting> + <setting key="print temperature">235</setting> <setting key="retraction amount">1.4</setting> </hotend> <hotend id="Standard 0.8"> <setting key="hardware compatible">yes</setting> - <setting key="print temperature">245</setting> + <setting key="print temperature">240</setting> <setting key="retraction amount">1.4</setting> </hotend> <!-- Commented out until eMotionTech adds their hotend profiles to Cura. <hotend id="Standard 1.0"> <setting key="hardware compatible">yes</setting> - <setting key="print temperature">247</setting> + <setting key="print temperature">245</setting> <setting key="retraction amount">1.5</setting> </hotend> <hotend id="Standard 1.2"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/emotiontech_tpu98a.xml.fdm_material new/fdm_materials-4.7.1/emotiontech_tpu98a.xml.fdm_material --- old/fdm_materials-4.6.1/emotiontech_tpu98a.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/emotiontech_tpu98a.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -11,7 +11,7 @@ <version>14</version> <color_code>#B22744</color_code> <description> </description> - <adhesion_info> </adhesion_info> + <adhesion_info>We recommend the use of 3DLac on the glass surface</adhesion_info> </metadata> <properties> <density>1.16</density> @@ -40,7 +40,7 @@ <setting key="hardware compatible">yes</setting> <setting key="print temperature">230</setting> <setting key="retraction amount">1.4</setting> - </hotend> + </hotend> <!-- Commented out until eMotionTech adds their hotend profiles to Cura. <hotend id="Standard 1.0"> <setting key="hardware compatible">yes</setting> @@ -55,4 +55,4 @@ --> </machine> </settings> -</fdmmaterial> +</fdmmaterial> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/fdm_requirements.txt new/fdm_materials-4.7.1/fdm_requirements.txt --- old/fdm_materials-4.6.1/fdm_requirements.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/fdm_requirements.txt 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1 @@ +lxml \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/generic_abs_175.xml.fdm_material new/fdm_materials-4.7.1/generic_abs_175.xml.fdm_material --- old/fdm_materials-4.6.1/generic_abs_175.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/generic_abs_175.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -57,7 +57,23 @@ <setting key="heated bed temperature">70</setting> <setting key="print temperature">250</setting> </machine> - + <machine> + <machine_identifier manufacturer="Tronxy" product="tronxy_x" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_pro" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_400" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_500" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_d01" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy2" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy2pro" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy3" /> + <setting key="print cooling">0</setting> + <setting key="standby temperature">200</setting> + <setting key="retraction speed">35</setting> + <setting key="retraction amount">5</setting> + <setting key="print temperature">230</setting> + <setting key="heated bed temperature">80</setting> + </machine> <machine> <machine_identifier manufacturer="CreawsomeMod" product="creality_base" /> <machine_identifier manufacturer="Creality3D" product="creality_cr10" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/generic_cpe.xml.fdm_material new/fdm_materials-4.7.1/generic_cpe.xml.fdm_material --- old/fdm_materials-4.6.1/generic_cpe.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/generic_cpe.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -2,7 +2,7 @@ <!-- Generic CPE profile. The data in this file may not be correct for your specific machine. --> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Generic</brand> @@ -10,7 +10,7 @@ <color>Generic</color> </name> <GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID> - <version>24</version> + <version>25</version> <color_code>#159499</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -61,6 +61,8 @@ <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="AA 0.25"> <setting key="hardware compatible">yes</setting> <setting key="print temperature">230</setting> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/generic_cpe_plus.xml.fdm_material new/fdm_materials-4.7.1/generic_cpe_plus.xml.fdm_material --- old/fdm_materials-4.6.1/generic_cpe_plus.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/generic_cpe_plus.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -2,7 +2,7 @@ <!-- Generic CPE+ profile. The data in this file may not be correct for your specific machine. --> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Generic</brand> @@ -10,7 +10,7 @@ <color>Generic</color> </name> <GUID>e2409626-b5a0-4025-b73e-b58070219259</GUID> - <version>22</version> + <version>23</version> <color_code>#3633F2</color_code> <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description> <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info> @@ -63,7 +63,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> - + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/generic_petg_175.xml.fdm_material new/fdm_materials-4.7.1/generic_petg_175.xml.fdm_material --- old/fdm_materials-4.6.1/generic_petg_175.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/generic_petg_175.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -64,6 +64,22 @@ <setting key="retraction speed">45</setting> <setting key="retraction amount">5</setting> <setting key="print temperature">240</setting> + </machine> + <machine> + <machine_identifier manufacturer="Tronxy" product="tronxy_x" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_pro" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_400" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_500" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_d01" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy2" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy2pro" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy3" /> + <setting key="print cooling">75</setting> + <setting key="standby temperature">200</setting> + <setting key="retraction speed">35</setting> + <setting key="retraction amount">5</setting> + <setting key="print temperature">230</setting> <setting key="heated bed temperature">80</setting> </machine> </settings> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/generic_pla_175.xml.fdm_material new/fdm_materials-4.7.1/generic_pla_175.xml.fdm_material --- old/fdm_materials-4.6.1/generic_pla_175.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/generic_pla_175.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -96,12 +96,37 @@ <setting key="print temperature">200</setting> <setting key="heated bed temperature">50</setting> </machine> + <machine> - <machine_identifier manufacturer="IMADE3D" product="IMADE3D JellyBOX"/> + <machine_identifier manufacturer="Tronxy" product="tronxy_x" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_pro" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_400" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_500" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_d01" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy2" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy2pro" /> + <machine_identifier manufacturer="Tronxy" product="tronxy_xy3" /> - <setting key="print temperature">210</setting> + <setting key="print cooling">75</setting> + <setting key="standby temperature">180</setting> + <setting key="retraction speed">40</setting> + <setting key="retraction amount">5</setting> + <setting key="print temperature">200</setting> <setting key="heated bed temperature">55</setting> + </machine> + + <machine> + <machine_identifier manufacturer="Lotmaxx" product="lotmaxx_sc60"/> + <setting key="print temperature">200</setting> + <setting key="standby temperature">200</setting> + <setting key="heated bed temperature">50</setting> + </machine> + <machine> + <machine_identifier manufacturer="IMADE3D" product="IMADE3D JellyBOX"/> + <setting key="print temperature">210</setting> + <setting key="heated bed temperature">55</setting> <hotend id="0.4 mm" /> </machine> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/make_docker.sh new/fdm_materials-4.7.1/make_docker.sh --- old/fdm_materials-4.6.1/make_docker.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/make_docker.sh 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,43 @@ +#!/bin/sh +# +# SPDX-License-Identifier: AGPL-3.0+ +# +# Copyright (C) 2019 Ultimaker B.V. +# +# SPDX-License-Identifier: LGPL-3.0+ + +set -eu + +GIT_HASH="$(git rev-parse HEAD)" + +DOCKER_IMAGE_NAME="${1:-fdm-materials_${GIT_HASH}}" + +DOCKER_FILE_CHANGES=$(git diff docker_env/Dockerfile) + +if ! docker inspect --type=image "${DOCKER_IMAGE_NAME}" > /dev/null || [ -n "${DOCKER_FILE_CHANGES}" ]; then + + docker build --rm -f docker_env/Dockerfile -t "${DOCKER_IMAGE_NAME}" . + + if ! docker run --rm --privileged "${DOCKER_IMAGE_NAME}" "./buildenv_check.sh"; then + echo "Something is wrong with the build environment, please check your Dockerfile." + docker image rm "${DOCKER_IMAGE_NAME}" + exit 1 + fi +fi + +DOCKER_WORK_DIR="${WORKDIR:-/build}" +PREFIX="/usr" + +run_in_docker() +{ + echo "Running '${*}' in docker." + docker run \ + --rm \ + --privileged \ + -v "$(pwd):${DOCKER_WORK_DIR}" \ + -e "PREFIX=${PREFIX}" \ + -e "RELEASE_VERSION=${RELEASE_VERSION:-}" \ + -w "${DOCKER_WORK_DIR}" \ + "${DOCKER_IMAGE_NAME}" \ + "${@}" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/release.sh new/fdm_materials-4.7.1/release.sh --- old/fdm_materials-4.6.1/release.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/release.sh 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,113 @@ +#!/bin/bash +# Copyright (C) 2019 Ultimaker B.V. +# Copyright (C) 2019 Raymond Siudak <[email protected]> +# +# SPDX-License-Identifier: LGPL-3.0+ + +set -eu +set -o pipefail + +usage() +{ + echo "Usage: ${0} [OPTIONS] <release version>" + echo "Triggers the release of this package to the CloudSmith package storage, given the" + echo "release version passed as argument to the script, e.g. 6.0.1 or 6.0.1-dev." + echo "" + echo "This script wil create a tag and push that to origin, this triggers the CI job to release" + echo "to CloudSmith. The CI release job will differentiate between pushing to official release" + echo "storage or development release storage, pushing to development release storage is " + echo "triggerred by adding the '-dev' postfix to the release version e.g. 6.2.0-dev." + echo "" + echo " -h Print usage" +} + +is_tag_existing_locally() +{ + if git rev-parse "${TAG}" > /dev/null 2>&1; then + echo "WARNING: Local Git tag '${TAG}' already exists." + return 0 + fi + return 1 +} + + +is_tag_on_github() +{ + if ! git ls-remote origin ":refs/tags/${TAG}"; then + echo "WARNING: GitHub tag '${TAG}' already exists." + return 0 + fi + return 1 +} + +trigger_release() +{ + if is_tag_existing_locally; then + if ! git tag -d "${TAG}"; then + echo "Error: failed to clear local tag'${TAG}'." + exit 1 + fi + fi + + if ! git tag "${TAG}"; then + echo "Error: failed to tag with '${TAG}'." + exit 1 + fi + + if ! is_tag_on_github; then + if ! git push origin "${TAG}"; then + echo "Error: failed to push tag: '${TAG}'." + exit 1 + fi + return 0 + fi + + return 1 +} + +while getopts ":h" options; do + case "${options}" in + h) + usage + exit 0 + ;; + :) + echo "Option -${OPTARG} requires an argument." + exit 1 + ;; + ?) + echo "Invalid option: -${OPTARG}" + exit 1 + ;; + esac +done +shift "$((OPTIND - 1))" + +if [ "${#}" -ne 1 ]; then + echo "Too much or too little arguments, arguments should be exactly one: <release_version>." + usage + exit 1 +fi + +RELEASE_VERSION="${1}" +TAG="$(git rev-parse --abbrev-ref HEAD)-v${RELEASE_VERSION}" + +if echo "${RELEASE_VERSION}" | grep -E '^[0-9]{1,3}+\.[0-9]{1,3}+\.[0-9]{1,3}+(-dev)?$'; then + + if is_tag_on_github; then + echo "Error: Cannot continue, tag is already on GitHub." + exit 1 + fi + + if trigger_release; then + echo "Successfully triggered release '${RELEASE_VERSION}', follow the build at: http://34.90.73.76/dashboard."; + exit 0 + fi + + echo "Something went wrong triggering the release, please check the warnings and correct manually." +fi + +echo "Invalid release version: '${RELEASE_VERSION}' given." +usage + +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/run_check_material_profiles_new_with_lxml.sh new/fdm_materials-4.7.1/run_check_material_profiles_new_with_lxml.sh --- old/fdm_materials-4.6.1/run_check_material_profiles_new_with_lxml.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/run_check_material_profiles_new_with_lxml.sh 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,9 @@ +#!/bin/sh + +set -eu + +. ./make_docker.sh + +run_in_docker python3 scripts/check_material_profiles_new_with_lxml.py || echo "Failed!" + +exit 0 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/run_shellcheck.sh new/fdm_materials-4.7.1/run_shellcheck.sh --- old/fdm_materials-4.6.1/run_shellcheck.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/fdm_materials-4.7.1/run_shellcheck.sh 2020-07-23 12:46:57.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/sh +# +# Copyright (C) 2019 Ultimaker B.V. +# +# SPDX-License-Identifier: LGPL-3.0+ + +# This script is mandatory in a repository, to make sure the shell scripts are correct and of good quality. + +set -eu + +SHELLCHECK_FAILURE="false" + +# Add your scripts or search paths here +SHELLCHECK_PATHS=" \ +*.sh \ +./docker_env/*.sh \ +" + +# shellcheck disable=SC2086 +SCRIPTS="$(find ${SHELLCHECK_PATHS} -name '*.sh')" + +for script in ${SCRIPTS}; do + if [ ! -r "${script}" ]; then + echo_line + echo "WARNING: skipping shellcheck for '${script}'." + echo_line + continue + fi + + echo "Running shellcheck on '${script}'" + shellcheck -x -C -f tty "${script}" || SHELLCHECK_FAILURE="true" +done + +if [ "${SHELLCHECK_FAILURE}" = "true" ]; then + echo "WARNING: One or more scripts did not pass shellcheck." + exit 1 +fi + +echo "All scripts passed shellcheck." + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/scripts/check_material_profiles.py new/fdm_materials-4.7.1/scripts/check_material_profiles.py --- old/fdm_materials-4.6.1/scripts/check_material_profiles.py 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/scripts/check_material_profiles.py 2020-07-23 12:46:57.000000000 +0200 @@ -4,17 +4,18 @@ import os import sys import re +from typing import Optional class MaterialProfilesValidator: - def __init__(self, root_dir: str): + def __init__(self, root_dir: str) -> None: self._repo_dir = os.path.abspath(root_dir) self._materials_dir = self._repo_dir self._guid_pattern = re.compile(r"<GUID>.*</GUID>") - def _get_guid(self, content: str) -> str: + def _get_guid(self, content: str) -> Optional[str]: guid = None for line in content.splitlines(): line = line.strip() @@ -23,7 +24,7 @@ break return guid - def get_materials_dir(self, dirpath: str): + def get_materials_dir(self, dirpath: str) -> str: for root_dir, dirnames, filenames in os.walk(dirpath): has_materials_file = any(fn.endswith(".xml.fdm_material") for fn in filenames) if not has_materials_file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/scripts/update_version_by_one.py new/fdm_materials-4.7.1/scripts/update_version_by_one.py --- old/fdm_materials-4.6.1/scripts/update_version_by_one.py 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/scripts/update_version_by_one.py 2020-07-23 12:46:57.000000000 +0200 @@ -18,4 +18,3 @@ break with open(filename, 'w', encoding='utf-8') as f: f.writelines(lines) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_black.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_black.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_black.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_black.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Black</color> </name> <GUID>a8955dc3-9d7e-404d-8c03-0fd6fee7f22d</GUID> - <version>26</version> + <version>27</version> <color_code>#2a292a</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_blue.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_blue.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_blue.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_blue.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Blue</color> </name> <GUID>4d816290-ce2e-40e0-8dc8-3f702243131e</GUID> - <version>26</version> + <version>27</version> <color_code>#00a3e0</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_dark-grey.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_dark-grey.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_dark-grey.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_dark-grey.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Dark Grey</color> </name> <GUID>10961c00-3caf-48e9-a598-fa805ada1e8d</GUID> - <version>26</version> + <version>27</version> <color_code>#4f5250</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_green.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_green.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_green.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_green.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Green</color> </name> <GUID>7ff6d2c8-d626-48cd-8012-7725fa537cc9</GUID> - <version>26</version> + <version>27</version> <color_code>#78be20</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_light-grey.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_light-grey.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_light-grey.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_light-grey.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Light Grey</color> </name> <GUID>173a7bae-5e14-470e-817e-08609c61e12b</GUID> - <version>26</version> + <version>27</version> <color_code>#c5c7c4</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_plus_black.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_plus_black.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_plus_black.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_plus_black.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Black</color> </name> <GUID>1aca047a-42df-497c-abfb-0e9cb85ead52</GUID> - <version>23</version> + <version>24</version> <color_code>#0e0e10</color_code> <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description> <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info> @@ -62,6 +62,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_plus_transparent.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_plus_transparent.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_plus_transparent.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_plus_transparent.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Transparent</color> </name> <GUID>a9c340fe-255f-4914-87f5-ec4fcb0c11ef</GUID> - <version>23</version> + <version>24</version> <color_code>#d0d0d0</color_code> <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description> <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info> @@ -86,6 +86,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_plus_white.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_plus_white.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_plus_white.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_plus_white.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>White</color> </name> <GUID>6df69b13-2d96-4a69-a297-aedba667e710</GUID> - <version>23</version> + <version>24</version> <color_code>#f1ece1</color_code> <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description> <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info> @@ -62,6 +62,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_red.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_red.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_red.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_red.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Red</color> </name> <GUID>00181d6c-7024-479a-8eb7-8a2e38a2619a</GUID> - <version>26</version> + <version>27</version> <color_code>#c8102e</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_transparent.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_transparent.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_transparent.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_transparent.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Transparent</color> </name> <GUID>bd0d9eb3-a920-4632-84e8-dcd6086746c5</GUID> - <version>26</version> + <version>27</version> <color_code>#d0d0d0</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_white.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_white.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_white.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_white.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>White</color> </name> <GUID>881c888e-24fb-4a64-a4ac-d5c95b096cd7</GUID> - <version>26</version> + <version>27</version> <color_code>#f1ece1</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fdm_materials-4.6.1/ultimaker_cpe_yellow.xml.fdm_material new/fdm_materials-4.7.1/ultimaker_cpe_yellow.xml.fdm_material --- old/fdm_materials-4.6.1/ultimaker_cpe_yellow.xml.fdm_material 2020-03-24 16:57:04.000000000 +0100 +++ new/fdm_materials-4.7.1/ultimaker_cpe_yellow.xml.fdm_material 2020-07-23 12:46:57.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fdmmaterial xmlns="http://www.ultimaker.com/material"; version="1.3"> +<fdmmaterial xmlns="http://www.ultimaker.com/material"; xmlns:cura="http://www.ultimaker.com/cura"; version="1.3"> <metadata> <name> <brand>Ultimaker</brand> @@ -7,7 +7,7 @@ <color>Yellow</color> </name> <GUID>b9176a2a-7a0f-4821-9f29-76d882a88682</GUID> - <version>26</version> + <version>27</version> <color_code>#f6b600</color_code> <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description> <adhesion_info>Use glue.</adhesion_info> @@ -58,6 +58,8 @@ <machine> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/> <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/> + <cura:setting key="retraction_combing_max_distance">40</cura:setting> + <cura:setting key="retraction_combing">all</cura:setting> <hotend id="BB 0.4" /> <hotend id="BB 0.8" /> <hotend id="AA 0.25"> ++++++ fdm_materials.obsinfo ++++++ --- /var/tmp/diff_new_pack.iygago/_old 2020-09-17 14:49:52.611855225 +0200 +++ /var/tmp/diff_new_pack.iygago/_new 2020-09-17 14:49:52.611855225 +0200 @@ -1,5 +1,5 @@ name: fdm_materials -version: 4.6.1 -mtime: 1585065424 -commit: 33bbec927cefe830f5c577dcbcf1de38d1765065 +version: 4.7.1 +mtime: 1595501217 +commit: c7331d5ea09080457848e82792277b3a9b2cee1c
