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

9502 Commits

Author SHA1 Message Date
GregValiant
5bbdf5efc6 Merge remote-tracking branch 'upstream/main' into DisplayInfoOnLCD 2023-10-27 12:19:48 -04:00
Jaime van Kessel
9a410d2c16
Merge branch '5.5' of github.com:Ultimaker/Cura 2023-10-24 10:55:39 +02:00
c.lamboo
fa1f5a7c89 Boyscouting 
CURA-11189
 2023-10-20 15:10:39 +02:00
c.lamboo
7d6e96d1d3 Boyscouting 
CURA-11189
 2023-10-20 15:09:16 +02:00
GregValiant
cd6e583f43 Update DisplayInfoOnLCD.py 
Add pause count notification

Update DisplayInfoOnLCD.py

Moved some line insertions to accommodate newer Creality firmware.

Change DisplayFIlename and DIsplayProgress

Add messages to use DIsplay Info and add exit code.

Update DisplayInfoOnLCD.py

Some changes
 2023-10-20 09:07:10 -04:00
c.lamboo
0e1262126a Fix memory leak issues in minitor page 
Issue was that QT (incorrectly?) asserted that there was a binding loop between width and height in the `NetworkMJPGImage` component. This caused the height to evalualte to `infinity`, making QT create a buffer with an infinite amount of memory. Solved by calculating a serpeate `img_scale_factor` which both the width and height uses.

CURA-11180
 2023-10-19 11:53:41 +02:00
saumya.jain
8ca005f804 Updated upgrade script. removed update of materials other than: 
abs
 pla
 petg and
 tough-pla

CURA-11151
 2023-10-16 14:13:12 +02:00
Jaime van Kessel
5f998f0ab4
Merge branch 'main' of github.com:Ultimaker/Cura 2023-10-16 12:07:38 +02:00
Jaime van Kessel
9c38514824
Merge branch '5.5' of github.com:Ultimaker/Cura 2023-10-16 12:07:30 +02:00
Jaime van Kessel
dc66732150
Revert "Fix certain 3mf models not restoring properly" 
This reverts commit 7e38927a8cb76d3789fde21482aeff1e254cc636.
 2023-10-16 12:07:17 +02:00
Saumya Jain
15b75b7327
Merge branch 'main' into CURA-11155-formulas-in-start-end-code 2023-10-16 10:58:58 +02:00
Jaime van Kessel
7e38927a8c
Fix certain 3mf models not restoring properly 
CURA-11164
 2023-10-16 10:56:57 +02:00
Jaime van Kessel
67c11bf7f8
Fix certain 3mf models not restoring properly 
CURA-11164
 2023-10-16 10:56:07 +02:00
saumya.jain
7880cb5bde remove debug statement 
CURA-9755
 2023-10-13 11:29:44 +02:00
saumya.jain
277d48bd51 3mf Meshes load in correct location 
CURA-9755
 2023-10-13 09:27:57 +02:00
c.lamboo
e98240fb2c Cleanup code in GcodeStartEndFormatter 
CURA-11155
 2023-10-13 07:36:45 +02:00
c.lamboo
14afd73c19 Make sure default variables are available in start/end code 
The following properties are not settings-names, but could previously be used as template variables
- material_id
- time
- date
- day
- initial_extruder_nr
- material_id
- material_name
- material_type
- material_brand
- time
- date
- day
- initial_extruder_nr
These properties are _awkwardly_ propogated through the kwargs of the `get_value` method of `GcodeStartEndFormatter`. I don't quite like implementing it like this, but to avoid API breaks I couldn't change abusing the kwargs arg for this purpose.

CURA-11155
 2023-10-12 21:09:10 +02:00
c.lamboo
c3f3a86385 Extend start/end gcode templates feature with support for formula's 
CURA-11155
 2023-10-12 16:53:39 +02:00
GregValiant
c40dad5119 Update DisplayInfoOnLCD.py 
Added Print Finish Time option.  Changed a couple of if statements to "line.startswith".
 2023-10-11 19:47:57 -04:00
Remco Burema
1433c38374
Merge pull request #16805 from GregValiant/LimitXYAccelJerk 
Update LimitXYAccelJerk
 2023-10-04 13:50:09 +02:00
Remco Burema
cd73befc06
Merge pull request #15883 from GregValiant/PostProcPlugin 
Update PostProcessingPlugin.py
 2023-10-04 13:41:16 +02:00
Jaime van Kessel
aafe38aa16
Merge pull request #11917 from tapir/master 
Fix thumbnail format
 2023-10-04 13:01:39 +02:00
GregValiant
716fe5c507 Update LimitXYAccelJerk.py 
Changed ALL to PASS
Changed "Griffon" to "UltiGcode" and "Griffin".
 2023-09-27 14:43:43 -04:00
GregValiant
4d5e4ce3c5 Update DisplayInfoOnLCD.py 
Add a line below the ";TIME:" line to convert "seconds" to Hours:Minutes
 2023-09-24 09:40:02 -04:00
GregValiant
cc48f06d96 Update LimitXYAccelJerk 
Add support for RepRap M566 Jerk command (in mm/min).
 2023-09-24 09:27:13 -04:00
c.lamboo
d4449c680f Find available port when starting backend plugin 
CURA-11067
 2023-09-20 11:24:28 +02:00
Jaime van Kessel
b56ad7de54
Merge pull request #16709 from Ultimaker/CURA-10972_fix_hang_serial 
Fix possible hang at startup/add printer
 2023-09-20 10:15:15 +02:00
Saumya Jain
ada29f3b85
Merge branch 'main' into main 2023-09-15 16:13:05 +02:00
Jaime van Kessel
6ae423361f
Merge branch 'CURA-8728_using-tab-in-per-model' of github.com:Ultimaker/Cura 2023-09-15 13:41:47 +02:00
Jaime van Kessel
fbefe42db3
Get abstract color property from metadata not from properties 
Otherwise all the abstract profiles are visible

CURA-10953
 2023-09-15 13:13:23 +02:00
saumya.jain
bfdfbbdbbd minor fixes 
CURA-8728
 2023-09-15 11:27:02 +02:00
saumya.jain
f3829c3ebe comments fix and clean code 
CURA-18869
 2023-09-15 10:56:48 +02:00
GregValiant
c2a541f5e1 Update DisplayInfoOnLCD.py 
Changed "name" variable to "file_name" to avoid any conficts.
 2023-09-14 22:16:28 -04:00
saumya.jain
c95481f6e7 tab button in per model setting 
CURA-18869
 2023-09-14 16:26:00 +02:00
Erwan MATHIEU
863f6fd43b
Merge branch 'main' into CURA-10915_open_projects_anyway 2023-09-13 16:21:25 +02:00
Jelle Spijker
45510d04ed
Added ability for backend plugins to determine their usability 
Modified BackendPlugin.py and StartSliceJob.py to allow plugins to decide when they should be used. The 'usePlugin'
method was added to enable a plugin to return a boolean indicating if it should be used or not, e.q.: start up and
connect to the services.

Contributes to CURA-11031
 2023-09-13 07:22:07 +02:00
Jelle Spijker
66ebdae825
Use the correct plugin name 
Contributes to CURA-10953
 2023-09-12 17:09:16 +02:00
Jelle Spijker
6ecb1c6b79
Applied code-review comments 
Contributes to CURA-10988
 2023-09-12 16:46:54 +02:00
Saumya Jain
28d3e1995b
Merge branch 'main' into main 2023-09-12 13:17:35 +02:00
Jelle Spijker
570d6ae916
Merge branch 'main' into CURA-10953_introduce_any_color_material 2023-09-11 15:52:13 +02:00
saumya.jain
43fddcf012 Opening the value of setting only if they are not in missing packages 
CURA-10915
 2023-09-11 13:37:08 +02:00
Erwan MATHIEU
03d8c61a98 Merge remote-tracking branch 'origin/main' into CURA-10972_fix_hang_serial 2023-09-11 11:23:24 +02:00
Erwan MATHIEU
8f4dec2c9d Fix possible hang at startup/add printer 
Remove the ISP leaving part which is *probably* unnecessary 99.99% of the times but may cause a hang when some USB devices are connected.

CURA-10972
 2023-09-11 10:31:04 +02:00
GregValiant
099cfe8294 Add 'Print Finish Time' estimate as a message 
Get the current print time estimate, adjust it by the Fudge Factor, and add it to the current time +10 minutes (to actually start the print.)

Update DisplayInfoOnLCD.py

Change message format for Finish Time Estimate.
 2023-09-10 09:20:04 -04:00
Remco Burema
fbd5569089 Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage 2023-09-08 18:39:27 +02:00
Jaime van Kessel
bcd9f9cbf9
Add all changed materials to version upgrade regex 
CURA-10953
 2023-09-08 13:02:32 +02:00
Jaime van Kessel
0141b750f5
Add version upgrader 
CURA-10953
 2023-09-08 11:04:13 +02:00
Jaime van Kessel
e899b9987c
Merge branch 'PP-245-high-speed-profiles' of github.com:Ultimaker/Cura into CURA-10953_introduce_any_color_material 2023-09-07 15:03:27 +02:00
Jaime van Kessel
fd887a877a
Don't sync invisible materials 
CURA-10953
 2023-09-07 13:48:36 +02:00
Jaime van Kessel
1a41f2650a
Don't show invisible materials in material selection 
CURA-10953
 2023-09-07 13:24:40 +02:00