Ultimaker community

~ultimaker/ultimaker/+git/cura-binary-data:materials_test

  1. Git
  2. lp:~ultimaker/ultimaker/+git/cura-binary-data
  3. materials_test
Last commit made on 2016-06-02
Get this branch:
git clone -b materials_test https://git.launchpad.net/~ultimaker/ultimaker/+git/cura-binary-data

Branch merges

Branch information

Name:
materials_test
Repository:
lp:~ultimaker/ultimaker/+git/cura-binary-data

Recent commits

c127f33... by Ruben D

Merge branch '2.1'

Conflicts:
 cura/resources/i18n/nl/LC_MESSAGES/fdmprinter.json.mo

85cbef5... by Ruben D

Update translations with Initial Layer Z Overlap

A new setting was added.

Contributes to issue CURA-1549.

9177d06... by Ruben D

Revert 2 commits for UM2+ builds

Both of these have some commits concerning new materials that shouldn't be included yet.

Contributes to issue CURA-1544.

26172d8... by Ruben D

Merge branch '2.1'

Conflicts:
 cura/resources/i18n/nl/LC_MESSAGES/fdmprinter.json.mo

45ba8f4... by Ruben D

Update UMO and UM2 firmware

12 new commits in the UM2 firmware.

UMO firmware is just a date bump, but this is just the result of my build script.

787e664... by Ghostkeeper <email address hidden>

Update dutch translations

With my own improvements.

Contributes to issue CURA-1190.

00791a4... by Ghostkeeper <email address hidden>

Update translations

Updated with the newest strings.

Contributes to issue CURA-1190.

4e683f4... by Ghostkeeper <email address hidden>

Update translation files

Conforming to new .po files after fixing translations for CURA-1190.

0be6f5f... by Arjen Hiemstra <email address hidden>

Rename "vcredist_x86" to "vcredist_x32" to simplify architecture handling

Contributes to CURA-734

7dcd9f0... by Ghostkeeper <email address hidden>

Update firmware for Ultimaker printers (proper compiler)

UMO firmware was updated to Ultimaker/Marlin commit a2a5ba2042a3c38b62501d541b204e29775a2789.
UMO with heated bed firmware was updated to Ultimaker/Marlin commit dc0092e1410ef105091df2807c426ef0fe6781ee.
UMO+ firmware was updated to Ultimaker/Marlin commit af88a3bb2e812ce4bd9f004ef5d172cca597021d.
UM2 firmware was updated to Ultimaker/Ultimaker2Marlin commit 12b4cb9fad232411dd2b1cafe821547ee5f1e272.
UM2ex firmware was updated to Ultimaker/Ultimaker2Marlin commit 75f889933c912bf150855b40d5da965c92b30183.
UM2go firmware was updated to Ultimaker/Ultimaker2Marlin commit ce3f095a3f04c9c46abeb4fd263d02580248507a.
UM2+ firmware was updated to Ultimaker/UM2.1-Firmware commit a50078d83710739771dbe5fc3d4ee8da6ada30c5.
UM2ex+ firmware was updated to Ultimaker/UM2.1-Firmware commit 21df8ed57771523809c3801ca76cb4c9b9003a20.
These are all the latest versions as of today, 2016-2-18. They were built with avr-gcc 4.8.3 which fixes the printers not being able to read their SD cards any more.

Contributes to issue CURA-440.