GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 18:59:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 290 Branches 260 Tags
Commit Graph

5951 Commits

Author SHA1 Message Date
Lipu Fei
1675ad4ba5
Merge pull request #4487 from fieldOfView/fix_marlin_press_to_resume 
Fix "press to resume" message after heating bed when usb is connected
 2018-10-23 10:27:40 +02:00
Diego Prado Gesto
94ef0b92fe Fix typo in the getCompatibleMaterialDiameter function. 
Contributes to CURA-5834.
 2018-10-23 10:25:13 +02:00
Ian Paschal
9a16d45be5 Round divisions 
Contributes to CL-1051, CL-897, CL-1111
 2018-10-22 16:02:55 +02:00
Ian Paschal
34abc48a1a Remove binding loops 
Contributes to CL-1051
 2018-10-22 15:31:38 +02:00
Lipu Fei
ea9aa2c777 Add doc for using setCompatibleMaterialDiameter() in QML 
CURA-5834
 2018-10-22 10:56:11 +02:00
griehsler
5ae5dfd3ad added x_position and y_position to postprocessing filamentchange parameters 2018-10-20 01:28:48 +02:00
Ian Paschal
817899686a Dark mode theme improvements 
Contributes to CL-1111
 2018-10-19 16:23:16 +02:00
fieldOfView
68c3023a46 Make sure firmware name is only requested once 2018-10-19 14:38:25 +02:00
fieldOfView
71d365c0c6 Fix case where Cura and the firmware could be waiting for eachother 2018-10-19 14:37:20 +02:00
Lipu Fei
97e6354c13 Fix material update upon extruder-compatible diameter change 
CURA-5834

Material models and the material container on an extruder need to be
updated when the extruder's compatible diameter gets changes.
 2018-10-19 13:48:52 +02:00
Aleksei S
22db3cb32b Show retraction for G92 command 
CURA-5769
 2018-10-19 13:18:42 +02:00
Lipu Fei
ea10d5e608 Rename to comptabileMaterialDiameter 
CURA-5834

This property returns the material diameter an extruder is compatible
with, so this makes it more clear.
 2018-10-19 11:36:12 +02:00
Ghostkeeper
2eb9b111fc
Fix changing flow rate in dual extrusion 
This potentially set the flow rate to -1, since it was changing the flow rate to the old['flowrateTwo'] which was left at -1 since initialisation because it didn't update here.
 2018-10-19 09:55:23 +02:00
Ghostkeeper
9aa7b76dbe
Update change log with 3.5.1 changes 
Too little, too late. But at least you'll be able to look back on it.
 2018-10-19 07:55:39 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they 
do.

Contributes to CURA-5772.
 2018-10-18 17:13:15 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00
fieldOfView
777470db7f Don't force sending M105 requests without OK 
This prevents serial buffer overflow on the printer.
 2018-10-18 15:47:25 +02:00
fieldOfView
f4c88aff0f Merge branch 'master' into fix_marlin_press_to_resume 2018-10-18 15:35:57 +02:00
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Ian Paschal
1ad008f45c Style improvements 
Contributes to CL-897 and CL-1051
 2018-10-17 16:32:30 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Ian Paschal
6f33c4410c Review tweaks 
Contributes to CL-897 and CL-1051
 2018-10-17 14:39:42 +02:00
Ian Paschal
2dcfc049ba Remove skeleton loading after print jobs received 
Contributes to CL-1051
 2018-10-17 14:28:17 +02:00
alekseisasin
a7be605b9d Typing error in CI CURA-5769 2018-10-17 09:50:22 +02:00
Aleksei S
20fa7f4dd8 Display retractions lines for the loaded Gcode files 
CURA-5769
 2018-10-16 16:47:05 +02:00
Ian Paschal
b99bc06d1c Clean up more errors 
Contributes to CL-1051
 2018-10-16 09:34:50 +02:00
Ian Paschal
1fa7a8880b Clean up some QML warnings 
Contributes to CL-1051
 2018-10-15 17:02:27 +02:00
Ghostkeeper
b5d8c1af6f
Merge branch 'master' into fieldOfView-feature_firmware_updater 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
 2018-10-15 16:52:22 +02:00
Ghostkeeper
c680050040
Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-15 15:41:17 +02:00
Ghostkeeper
95f89044c0
Merge branch 'CURA-5483_add_s5_to_firmware_checker' 2018-10-15 15:25:29 +02:00
Jaime van Kessel
cd5a0a84a8 Horizontally align the prepare menu bar 
CURA-5772
 2018-10-15 15:14:05 +02:00
Ghostkeeper
53dc28db89
Change URL of firmware update page for Ultimaker 3 and S5 
I just got word of a new page to read up about the firmware update. Apparently we now have to link to this one.

Contributes to issue CURA-5483.
 2018-10-15 15:12:42 +02:00
Ghostkeeper
56a383814b
Code style: Spaces around binary operators 
Contributes to issue CURA-5483.
 2018-10-15 14:48:18 +02:00
Jaime van Kessel
d2baef97c4 Fix tooltips for settings 
CURA-5772
 2018-10-15 11:07:03 +02:00
Remco Burema
2e3abbc904 Put the firmware-update meta-data in the 'normal' printer definitions and make the code handle that. 2018-10-13 21:55:33 +02:00
Remco Burema
931143ceaa Added FirmwareUpdateCheckerMessage, so no variables have to be hidden in the action of a plain Message. 2018-10-13 20:05:20 +02:00
Remco Burema
8c71a8855c FirmwareUpdateChecker: Remove superfluous 'version_parser' as a setting, since it broke lean principles. 2018-10-13 19:36:11 +02:00
Remco Burema
60408c14bc FirmwareUpdateChecker: Small refactors due to code review. 2018-10-13 19:21:22 +02:00
Ghostkeeper
1b7055f0f3
Fix spelling of error message 
Loopup -> Lookup.

Contributes to issue CURA-5483.
 2018-10-12 17:03:48 +02:00
Ghostkeeper
e3b05f0867
Code style: Spaces around binary operators 
Also removed the unused machines_json value.

Contributes to issue CURA-5483.
 2018-10-12 16:46:39 +02:00
Ghostkeeper
6ac10db582
Code style: Use double quotes for strings 
Contributes to issue CURA-5483.
 2018-10-12 15:37:43 +02:00
Ghostkeeper
99fc372b32
Update printer information when switching global container stacks 
This was just evaluated once during the creating of a USB connection. But you can switch out the printer without breaking/making a USB connection, so in that case we have to update it here.

Contributes to issue CURA-5749.
 2018-10-12 14:55:13 +02:00
Jaime van Kessel
7d5472b09f Moved the prepareMenu into the prepare stage plugin 
CURA-5772
 2018-10-12 13:29:57 +02:00
Ghostkeeper
287689a073
Don't cache the automatic firmware name 
The QML property was not updated when you change the printer. By not caching it, it gets the current printer's firmware file upon clicking the button. Simple and effective, and not that tough on computational power that it needs caching.

Contributes to issue CURA-5749.
 2018-10-12 13:25:34 +02:00
Ghostkeeper
85b835118d
Log which firmware file you're about to upload 
Kind of critical information, really.

Contributes to issue CURA-5749.
 2018-10-12 13:24:09 +02:00
Remco Burema
69cef98c30 FirmwareUpdateChecker: Small fixes (typing and lowercase input). 2018-10-12 10:11:46 +02:00
Remco Burema
f2b50c748c Fix typing in the FirmwareUpdateChecker plugin. 2018-10-11 21:54:27 +02:00
fieldOfView
6a50487bf0 Catch the one that got away 2018-10-11 19:16:10 +02:00
Remco Burema
839016d2f3 Merge branch 'master' into CURA-5483_add_s5_to_firmware_checker 2018-10-11 18:25:40 +02:00
Remco Burema
4ecac6e27f Set the right firmware-download-URL in the actual update-firmware-message. 2018-10-11 18:24:07 +02:00