Cura

~thopiekar/cura/+git/cura-thopiekar:master

  1. Git
  2. lp:~thopiekar/cura/+git/cura-thopiekar
  3. master
Last commit made on 2020-01-02
Get this branch:
git clone -b master https://git.launchpad.net/~thopiekar/cura/+git/cura-thopiekar

Branch merges

Branch information

Name:
master
Repository:
lp:~thopiekar/cura/+git/cura-thopiekar

Recent commits

c261065... by Jaime van Kessel <email address hidden>

Merge branch 'CURA-6959_collapse_categories' of github.com:Ultimaker/Cura

8dbd67f... by Nino van Hooff

Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories

# Conflicts:
# resources/qml/Menus/SettingVisibilityPresetsMenu.qml
# resources/qml/Settings/SettingView.qml

4097256... by Nino van Hooff

Clear settings search when pressing collapse all.

CURA-6959

56cf233... by Remco Burema <email address hidden>

First initialize error checking.

Change the order of initialization, so the MachineErrorChecker already has its signals attached when the first machine gets loaded.
The increased number of 'processEvents'-calls exposed this oversight by allowing it to run out of order.
(MachineErrorChecker initializes the has-errors field to True if no check has been done yet.)

261ee5b... by Remco Burema <email address hidden>

Fix SettingCheckbox.qml warning.

72497f4... by Nino van Hooff

Remove redundant brackets

CURA-6959

9de2b39... by Jaime van Kessel <email address hidden>

Fix the failing tests

CURA-6255

bb34094... by Jaime van Kessel <email address hidden>

Merge branch 'master' of github.com:Ultimaker/Cura

8b39331... by Jaime van Kessel <email address hidden>

Add "all" as a setting visibility preset

CURA-7082

90ded1a... by Ruben D

Remove useless override of bed temperature

The Generic PETG material also sets it to 70, as well as the eMotionTech and TiXYZ PETGs. The iMade3D bed temperature was 65, so for that one the temperature will change to 65 then which seems appropriate. I'll change the iMade3D thing in fdm_materials so that the settings are still the same.

Discovered during investigation of #6898.