Lipu Fei 94e89ad4ac Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

..

__init__.py

…

MachineSettingsAction.py

Fix typing

2019-09-19 14:39:03 +02:00

MachineSettingsAction.qml

Fix small display issue where a line was drawn between the tabs

2019-04-03 17:03:39 +02:00

MachineSettingsExtruderTab.qml

Allow negative values for nozzle offsets and print head shape

2019-05-28 17:10:32 +02:00

MachineSettingsPrinterTab.qml

Merge branch '4.3'

2019-09-23 11:25:31 +02:00

plugin.json

…