Commit graph

9400 commits

Author SHA1 Message Date
Jaime van Kessel
b34bb26a1a Fixed broken getInstance caused by refactor 2017-02-15 13:51:53 +01:00
Jack Ha
94badb1b9f Fix auto slice after startup. CURA-3214 2017-02-15 13:51:24 +01:00
Jaime van Kessel
b187cf89a5 Fixed broken logging 2017-02-15 13:50:02 +01:00
MaukCC
1833dd5a5d Update cartesio_0.25.inst.cfg 2017-02-15 12:59:00 +01:00
Jack Ha
ca84fdd767 Merge branch 'master' into feature_auto_slice 2017-02-15 12:42:09 +01:00
Jack Ha
aab17608ff Fixed shader bugs, lines are now nice and smooth again. CURA-3273 2017-02-15 11:53:20 +01:00
Jack Ha
ce226ebbea Fix layerview checkboxes. CURA-3273 2017-02-15 11:35:49 +01:00
jack
8fc88f763b Merge pull request #1288 from Ultimaker/layer_view3_cleanup
Layer View 3D, with detection of OpenGL context versions.
2017-02-15 11:11:42 +01:00
Jack Ha
78de5412a2 Merge branch 'master' into layer_view3_cleanup 2017-02-15 10:57:24 +01:00
Jack Ha
9e973732f5 Fixed remember coloring type in Layer View. CURA-3273 2017-02-15 10:50:21 +01:00
Jack Ha
4e65a7034f Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214 2017-02-15 10:32:38 +01:00
MaukCC
603fc6d95d Update cartesio_0.4.inst.cfg 2017-02-15 10:05:15 +01:00
MaukCC
64a5a55c87 Update cartesio_extruder_0.def.json 2017-02-15 10:02:22 +01:00
MaukCC
14e6e4073f Update cartesio_extruder_0.def.json 2017-02-15 10:01:37 +01:00
MaukCC
6ab579db72 Update cartesio_extruder_0.def.json 2017-02-15 10:01:09 +01:00
MaukCC
e9dec8daf6 Update cartesio_extruder_1.def.json 2017-02-15 10:00:44 +01:00
MaukCC
f4fed560fc Update cartesio_extruder_3.def.json 2017-02-15 10:00:04 +01:00
MaukCC
0d28b28539 Update cartesio_extruder_2.def.json 2017-02-15 09:59:55 +01:00
MaukCC
c0b8678a89 Update cartesio_extruder_1.def.json 2017-02-15 09:59:45 +01:00
MaukCC
87802a1cf8 Update cartesio_extruder_0.def.json 2017-02-15 09:59:32 +01:00
MaukCC
dfff2e193f Update cartesio_extruder_0.def.json 2017-02-15 09:58:58 +01:00
MaukCC
3f502d3d6d Update cartesio_extruder_1.def.json 2017-02-15 09:58:48 +01:00
MaukCC
c2ee3efc72 Update cartesio_extruder_1.def.json 2017-02-15 09:58:31 +01:00
MaukCC
a69c331b26 Update cartesio_extruder_0.def.json 2017-02-15 09:58:12 +01:00
MaukCC
a0059f372d Update cartesio_extruder_1.def.json 2017-02-15 09:57:26 +01:00
MaukCC
f1a9e18642 Update cartesio_extruder_1.def.json 2017-02-15 09:56:57 +01:00
MaukCC
8f3ced5791 Update cartesio.def.json 2017-02-15 09:55:35 +01:00
MaukCC
758a810e9b Update cartesio_0.8.inst.cfg 2017-02-15 09:44:55 +01:00
MaukCC
88e9be1ade Update cartesio_0.4.inst.cfg 2017-02-15 09:44:39 +01:00
MaukCC
9c71735d1a Update cartesio_0.25.inst.cfg 2017-02-15 09:44:23 +01:00
MaukCC
48331a2579 Update cartesio.def.json 2017-02-15 09:40:55 +01:00
Mark Burton
0237a5a386 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles
# Conflicts:
#	cura/CuraApplication.py
2017-02-15 08:20:45 +00:00
Simon Edwards
60d4e6e4fd Make the run_mypy.py script find Uranium via the PYTHONPATH env var. 2017-02-15 08:53:18 +01:00
Ghostkeeper
42982b7a86
Fix link to UM.Version.Version
The Version object is no longer exposed via UM.__init__, so we have to dig inside the UM.Version module to get it.

Contributes to issue CURA-2917.
2017-02-14 17:03:37 +01:00
Ghostkeeper
b488441d81
Fix link to ContainerRegistry
This one was forgotten because it is in a comment.

Contributes to issue CURA-2917.
2017-02-14 17:00:33 +01:00
Ghostkeeper
5055c534c5
Fix links to ContainerRegistry
ContainerRegistry is no longer exposed in UM.Settings.__init__, so we must dig the class up from inside the module.

Contributes to issue CURA-2917.
2017-02-14 16:57:21 +01:00
Simon Edwards
4928c91942 Make run_mypy.py slightly more cross platform. 2017-02-14 13:47:37 +01:00
Simon Edwards
2451921604 Merge branch 'master' into python_type_hinting 2017-02-14 13:36:50 +01:00
Simon Edwards
cb400f0257 Fix for a recent merge problem. 2017-02-14 13:36:03 +01:00
awhiemstra
6d8df73401 Merge pull request #1429 from fieldOfView/fix_missing_label_color
Add missing label color
2017-02-14 11:52:41 +01:00
fieldOfView
25fb3fed16 Add missing label color
One of the labels in the newly redesigned printmonitor is lacking a color, thus making the hotend temperature unstylable.
2017-02-14 10:38:33 +01:00
Jaime van Kessel
a8853a992f Removed unused ID 2017-02-14 09:29:14 +01:00
Jaime van Kessel
b7176f0c62 Added basic profile for folgertech
As per info provided by Paul Bussiere
2017-02-13 19:51:21 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Tim Kuipers
935ee141d4 feat: spaghetti_flow setting (CURA-3238) 2017-02-13 15:44:29 +01:00
Tim Kuipers
647ff3403e feat: spaghetti_inset setting (CURA-3238) 2017-02-13 15:44:29 +01:00
Tim Kuipers
84b019393e JSON feat: Spaghetti infill settings (CURA-3238) 2017-02-13 15:44:29 +01:00
Jack Ha
e5cdc318f7 Added preference. CURA-3214 2017-02-13 14:29:34 +01:00
Jaime van Kessel
e6c8a11017 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-13 14:16:59 +01:00
Jaime van Kessel
e8c5f81c79 Merge branch 'feature_preheat_bed' of github.com:Ultimaker/Cura 2017-02-13 14:16:50 +01:00