GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 23:46:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,596 Commits 290 Branches 260 Tags
Commit Graph

1619 Commits

Author SHA1 Message Date
fieldOfView
35efea3d11 Show "ready" state when a printer is connected but jobstate is not yet set 
CURA-1036
 2016-07-07 09:52:53 +02:00
fieldOfView
d5d09f32b7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-06 14:32:49 +02:00
fieldOfView
bdd3ecbc1a Update GUID for PLA to match the GUID in the official repository 
CURA-491
 2016-07-06 14:32:37 +02:00
Jaime van Kessel
a28a9ea86a Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 14:09:30 +02:00
Jaime van Kessel
a5ba68bae3 Ensure that the display matches with the backend active extruder data 2016-07-06 14:09:08 +02:00
fieldOfView
0e6754c0e2 Update UM2 Extended build volume height to value published in marketing materials 2016-07-06 14:06:14 +02:00
Jaime van Kessel
bf53baccee Merge branch 'feature_material_hotend_change' of github.com:Ultimaker/Cura 2016-07-06 13:39:07 +02:00
Ghostkeeper
a65bb14329
Capitalise setting label 
This is in line with the rest of the setting labels.
 2016-07-06 12:56:05 +02:00
Thomas Karl Pietrowski
be4cf00835 BQ Hephestos2: Heat up nozzle while leveling 
Saves time and preheats the nozzle to the correct temperature (set by Cura).
Btw. the BQ support explained me the reason why they are assuming 210°C needs to set here. The reason is that the printer is just meant to be used with PLA, so they are only expecting to use exactly 210°C. Just explained them why this is incorrect when think about the possibility that Cura can set the temperature on it's own.
 2016-07-05 18:22:56 +02:00
fieldOfView
8c002877c3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 18:36:28 +02:00
fieldOfView
7b4137ce20 Tweak color and icon logic (add "pre_print" state) 
CURA-1036
 2016-07-04 18:35:47 +02:00
Jaime van Kessel
b3adf8a271 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 17:11:50 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder 
CURA-1687
 2016-07-04 17:11:03 +02:00
fieldOfView
bff23598c6 Fix simple mode infill to work with multiple extruders 
CURA-1778
 2016-07-04 16:23:07 +02:00
fieldOfView
6933430185 Flow MachineActions on the manage Printes page. 
CURA-1385
 2016-07-04 12:47:16 +02:00
Tim Kuipers
f679b1ef68 JSON fix: merge went wrong: forgotten comma 2016-07-04 12:24:26 +02:00
Tim Kuipers
43f220278a Merge branch 'feature_retraction_settings_per_extruder' 2016-07-04 12:09:04 +02:00
fieldOfView
8e58e88511 Update GUIDs to match the GUIDs in the official repository 
CURA-491
 2016-07-04 11:50:15 +02:00
Jaime van Kessel
1242d6bf52 Added UMO upgrade selection 
CURA-1385
 2016-07-04 11:24:31 +02:00
Thomas Karl Pietrowski
cd14a15040 Using the correct placeholder 
Thanks to Ruben!
 2016-07-03 15:17:40 +02:00
Ghostkeeper
afe0104dc7 Merge pull request #838 from thopiekar/master-bq-hephestos2-preheat-workaround 
BQ Hephestos2 - Preheating temperature fix
 2016-07-03 12:41:17 +02:00
Thomas Karl Pietrowski
19a718205d BQ Hephestos2 - Preheating temperature fix 
When starting a print with the "custom" GCode by BQ, the printer resets
the nozzle temperature to 210°C when printing via SD card (no matter
what you set on Cura) and only preheats the nozzle to 180°C when
printing via USB.
So currently the printer begins to print via USB at 180°C and reaches
the correct temperature eg.g while printing the brim.
 2016-07-01 21:27:36 +02:00
fieldOfView
b7906c9ce7 Fix warning about missing color in theme 
CURA-1036
 2016-07-01 15:26:24 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print 
CURA-1036
 2016-07-01 15:06:49 +02:00
fieldOfView
c9b2a1d938 Properly prevent warning when no printer is connected. 
CURA-1036
 2016-07-01 11:51:46 +02:00
Jaime van Kessel
095dbaaa8d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-01 11:04:54 +02:00
Jaime van Kessel
91bfd2de27 Force focus instead of requesting it. 
Fixes CURA-1778
 2016-07-01 11:04:23 +02:00
fieldOfView
58ae1e923c Prevent warning when no printer is connected. 
CURA-1036
 2016-06-30 19:13:46 +02:00
fieldOfView
dc2384c92d Disable monitor buttons when there is no job running 
CURA-1036
 2016-06-30 11:15:32 +02:00
fieldOfView
3ea4983a23 Move message stack "above" the viewport overlay 
CURA-1036
 2016-06-30 11:02:15 +02:00
fieldOfView
7ec605579e Introduce printing/busy status and make monitor i18n-aware 
CURA-1036
 2016-06-30 10:20:19 +02:00
fieldOfView
7d962e97c4 Change monitor progress to percentages 
CURA-1036
 2016-06-30 10:18:10 +02:00
Tim Kuipers
4885238103 JSON feat: machine_min_cool_heat_time_window (CURA-1783) 2016-06-29 14:53:13 +02:00
Tim Kuipers
911f80f237 JSON refactor: OCD told me to mode the 'label' property to the top of each machine setting 2016-06-29 14:52:39 +02:00
Ghostkeeper
ac0f743855
Clarify descriptions of jerk settings 
This description was established after discussion with several mechanics guys as well as BagelOrb, FieldOfView and RobinMDH.
 2016-06-28 17:28:44 +02:00
fieldOfView
9ac5b0ecf7 Fix warning about property id of null in Cura.qml 
CURA-1585
 2016-06-28 17:04:28 +02:00
fieldOfView
540cc55b65 Fix warning about unknown property "index" in SidebarHeader 
CURA-333
 2016-06-28 16:59:00 +02:00
fieldOfView
e6bc28c30c Replace "Shell" category icon 2016-06-28 16:08:38 +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
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
Tim Kuipers
214ffbb0bd JSON fix: all retraction settings now only retrievable per extruder (CURA-303) 2016-06-27 15:22:45 +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
612888c9fb Remove remnant code 
CURA-1036
 2016-06-27 10:25:02 +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
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