3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
28446 commits 305 branches 272 tags 787 MiB
Commit graph

28446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
76dfb5e718 Renamed generic key to um_network_key 
CURA-49
 2016-06-28 11:48:54 +02:00
Simon Edwards
47de254f97 Fixed up the 3MF reader to use the changed MeshBuilder and MeshData. 
CURA-1633 OverflowError: cannot convert float infinity to integer (loading larger models)
 2016-06-28 11:43:02 +02:00
Jaime van Kessel
1543e4a6e0 Merge branch 'feature_zhop_over_other_material' of github.com:Ultimaker/Cura 2016-06-28 11:34:25 +02:00
Ghostkeeper
ae9c84c4fb Merge pull request #828 from Ultimaker/thopiekar-print-via-usb-text 
Better call it "Print via USB"
 2016-06-28 11:21:54 +02:00
Jaime van Kessel
0a3f64ef51 Switching stack now removes focus from all elements 
Fixes CURA-1778
 2016-06-28 10:55:20 +02:00
fieldOfView
05ff256af4 Add an icon for the experimental category 
CURA-1284
 2016-06-28 08:56:55 +02:00
Aldo Hoeben
605354272d Merge pull request #830 from thopiekar/master-CURA-1284-new 
CURA-1284: Changing icon for experimental category
 2016-06-28 08:47:34 +02:00
Aldo Hoeben
d1b1741d67 Merge pull request #822 from Ultimaker/feature_print_monitoring 
Print monitor
 2016-06-28 08:13:50 +02:00
Thomas Karl Pietrowski
fa36197574 CURA-1284: Changing icon for experimental category 
Needs an icon in resources/themes/cura/icons
 2016-06-27 23:21:07 +02:00
fieldOfView
b8fddf6527 Tweak codestyle and styling 
CURA-336
 2016-06-27 17:49:47 +02:00
Aldo Hoeben
f55cdbb8eb Merge pull request #1 from Ultimaker/feature_autostart_discovery 
Automatically start discovery
 2016-06-27 17:44:14 +02:00
fieldOfView
53c1c738d5 Fix error 
CURA-49
 2016-06-27 16:51:29 +02:00
fieldOfView
8deb0dc274 Make machine action button translatable 
CURA-336
 2016-06-27 15:49:29 +02:00
Tim Kuipers
214ffbb0bd JSON fix: all retraction settings now only retrievable per extruder (CURA-303) 2016-06-27 15:22:45 +02:00
fieldOfView
7af7748fff Make machine action button translatable 
CURA-336
 2016-06-27 14:40:07 +02:00
Arjen Hiemstra
68a8bcb009 Fix width of materials properties tab 2016-06-27 13:33:38 +02:00
Ghostkeeper
0e053838b8
Add definition for Mankati Fullscale XT+ 
Provided by Tinkerman on http://www.thingiverse.com/thing:1643782 and translated for use in Cura 2.2.
 2016-06-27 10:38:30 +02:00
fieldOfView
0860fc6cf5 Automatically start discovery 
CURA-336
 2016-06-27 10:32:56 +02:00
fieldOfView
612888c9fb Remove remnant code 
CURA-1036
 2016-06-27 10:25:02 +02:00
fieldOfView
b48f4ff8a2 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-06-27 09:58:57 +02:00
fieldOfView
260694f233 Code style, typos and minute style tweak 
CURA-336
 2016-06-27 09:58:40 +02:00
Thomas Karl Pietrowski
d376719500 Better call it "Print via USB" 
I think this sounds better, because I understand "USB" as an technology. So you wouldn't say "Print with USB", but would fit if you say "Print with USB cable". So "Print via USB" should be more correct here.
 2016-06-27 09:48:16 +02:00
Ghostkeeper
e8f3619c1b Merge pull request #825 from TZanke/patch-1 
support prints up to 15cm width with GRR NEO Printer
 2016-06-27 01:12:15 +02:00
Tobias Zanke
11cb37bd11 support prints up to 15cm width 
NEO Firmware moves head 1cm to the right after Y endstop is pressed. This shrinks build volume to 14cm width. With this extra commands, the head moves back to the endstop. Now 15cm width builds are possible.
 2016-06-26 17:05:53 +02:00
fieldOfView
629feec3d3 Remove hack 
i18nCatalog was being abused to do text replacement on HTML
 2016-06-25 09:45:27 +02:00
fieldOfView
d0f100c03c Show relevant message on splash screen during startup 2016-06-25 09:45:11 +02:00
fieldOfView
2ee745e1f9 Remove hack 
i18nCatalog was being abused to do text replacement on HTML
 2016-06-25 09:40:22 +02:00
fieldOfView
a4eee2dce6 Show relevant message on splash screen during startup 2016-06-25 09:38:10 +02:00
Jaime van Kessel
7d9777bc89 Actually return ID of quality container (as implied by pyqtslot sig) 2016-06-24 16:55:18 +02:00
Thomas Karl Pietrowski
93cdce7b33 GCodeProfileReader: Fixing read of profiles from GCode 2016-06-24 16:01:47 +02:00
Thomas Karl Pietrowski
d49ba80117 GCodeWriter: Getting always the correct container with the currently used profile. 2016-06-24 16:00:38 +02:00
Jaime van Kessel
696f904f3e isGlobalStack valid no longer remains false after it has been invalid once 2016-06-24 15:59:31 +02:00
Jaime van Kessel
727c34b535 HasUser settings now returns False when no container stack is found 2016-06-24 15:45:11 +02:00
Tim Kuipers
4eaf09e982 JSON fix: the height of the extruder switch z hop is now equal to the zhop height (CURA-1506 CURA-1061) 
making the height configurable is quite difficult with how retraction currently works and there is not a lot of added value
 2016-06-24 15:25:18 +02:00
fieldOfView
55af0af755 Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	resources/qml/Cura.qml
 2016-06-24 14:55:12 +02:00
fieldOfView
8bc2c6e042 Tweak styling 
CURA-1036
 2016-06-24 14:41:52 +02:00
fieldOfView
f6e31cd97a Fix updating monitored values 
Though the PrintMonitorModel was a nicer solution, it broke the binding of values coming from the PrinterOutputDevices

CURA-1036
 2016-06-24 14:35:31 +02:00
Jaime van Kessel
07c25edb0f Removed unused code 2016-06-24 13:47:52 +02:00
fieldOfView
00ad7b23ff Prevent QML warnings when there is no connected printer 
CURA-1036
 2016-06-24 13:39:24 +02:00
Tim Kuipers
3e67291e41 Merge branch 'master' into feature_zhop_over_other_material 2016-06-24 13:30:59 +02:00
Tim Kuipers
ccd97f1994 JSON feat: (bool) retraction_hop_after_extruder_switch (CURA-1506 CURA-1061) 2016-06-24 13:29:40 +02:00
fieldOfView
beff54e5b1 Refactor print monitor as styleable listview 
Listview updates when print monitor values becomes available.

CURA-1036
 2016-06-24 12:50:39 +02:00
fieldOfView
2143fc14ab Add print job name 
CURA-1036
 2016-06-23 21:58:45 +02:00
fieldOfView
d613863d83 Tweak colors and icons for print monitor 
CURA-1036
 2016-06-23 21:50:51 +02:00
Thomas Karl Pietrowski
1fdf835c19 GCodeProfileReader: Increasing the setting version 2016-06-23 19:40:52 +02:00
Thomas Karl Pietrowski
6a1942c254 GCodeWriter: Exporting the data as done on regualar exports 2016-06-23 19:40:00 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
Arjen Hiemstra
b2ef607cb6 Fix the material setting list to use a simple placeholder 
Contributes to CURA-342
 2016-06-23 17:34:35 +02:00
Arjen Hiemstra
1cb836aea5 Add a ReadOnlySpinBox control that provides a spinBox with a readOnly property 
Contributes to CURA-342
 2016-06-23 17:33:55 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page 
Contributes to CURA-342
 2016-06-23 17:31:50 +02:00