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

11203 Commits

Author SHA1 Message Date
Ghostkeeper
79ec71ca4c
Move top/bottom settings to separate category 
Implements CURA-8006.
 2021-02-05 14:59:38 +01:00
Kostas Karmas
ee22be74b9 Properly check whether the file should be added to recent 
When importing only the models of a project file, Cura wasn't checking whether the file should
be added to the recent files list. This commit fixes that.

CURA-7996
 2021-02-05 12:14:01 +01:00
Jaime van Kessel
b30bacc9f8
Merge branch 'master' of https://github.com/RFBomb/Cura 2021-02-04 14:46:29 +01:00
Remco Burema
06666bddca
Fix recent files hint when file opens via dialoges. 2021-01-29 14:49:32 +01:00
Remco Burema
fd1b816981
Clean up: No max value needed, remove cache file. 
CURA-7956
 2021-01-27 12:28:05 +01:00
Remco Burema
0ddb2d5ea8
Merge branch 'master' of https://github.com/OpusMcN/Cura into OpusMcN-master 2021-01-27 12:14:17 +01:00
Jaime van Kessel
b219f57b22
Merge branch 'dev' of https://github.com/BasF0/Cura 2021-01-27 10:56:35 +01:00
Jaime van Kessel
4586a50af2
Merge branch 'master' of github.com:Ultimaker/Cura 2021-01-26 10:39:28 +01:00
Jaime van Kessel
464c19f592
Show print weight with single decimal in the details view 
Fixes #9176
CURA-7992
 2021-01-26 10:29:55 +01:00
RFBomb
79e9250715
Update fdmprinter.def.json 2021-01-25 23:14:23 -05:00
Konstantinos Karmas
c64ab40fb8
Merge pull request #9069 from HUNIBEST-HyVISION/master 
[CUBICON] Add device(Style NEO-A31) & Update start gcode.
 2021-01-25 17:00:38 +01:00
Ghostkeeper
b864c8e026
Specify 'adhesion structures' rather than just adhesion 
After changing this with fvrmr together I read back on the commit and realised that the sentence was literally saying that it affects adhesion, and then that it doesn't affect adhesion. I hope this clarifies that a bit better by giving examples.
 2021-01-25 11:06:36 +01:00
fvrmr
d92b126b09 Initial layer speed does not affect build plate adhesion 2021-01-25 11:01:14 +01:00
Remco Burema
538ccf5e21
Actually show 'on buildplate' color when z=0. 
CURA-7871
 2021-01-22 18:47:45 +01:00
Remco Burema
497bfa4c68
Merge branch 'master' into CURA-7871_lowest_print_height 2021-01-22 18:40:39 +01:00
Ghostkeeper
63deea4721
Fix model to use for comboboxes to check if they are empty 
This was checking against the wrong model, it seems.

Contributes to issue CURA-7865.
 2021-01-22 13:52:27 +01:00
Opus
db61bf0fd2 Made label more descriptive for overhang hole size option 2021-01-21 21:56:23 +13:00
Opus
c55d4f7532 Option for area check when using make overhang printable. Keeps recesses in the base of the model that are smaller than the given size 2021-01-21 21:43:54 +13:00
bas
1033133355 undo irrelevant change 2021-01-20 21:56:33 +01:00
Kostas Karmas
cdedb56a9a Restore arguments in the SaveProjectMenu 
Or else the LocalFileOutputDevice will output a mesh 3mf file and not a Cura 3mf project when
being called from the 'File -> Save Project -> To Disk' submenu item.

CURA-7865
 2021-01-20 21:13:36 +01:00
Remco Burema
0ba3833995
Merge pull request #9153 from Ultimaker/CURA-7865_Save_file_in_existing_project_mvp 
CURA-7865 Save file in existing project mvp
 2021-01-20 19:18:39 +01:00
freejoe
1463aba346 modified for longer base and cube2 machine 2021-01-20 14:51:44 +08:00
freejoe
4222444731 add LONGER fdm printer series 2021-01-20 10:37:51 +08:00
Kostas Karmas
b7e613a271 Remove file_type argument from the saveWorkspaceDialog 
Because we also want to export ufp files, which are not workspace files.

CURA-7865
 2021-01-19 21:39:16 +01:00
Jaime van Kessel
888abdac33
Merge branch 'master' of github.com:Ultimaker/Cura 2021-01-19 09:48:51 +01:00
Ghostkeeper
0a7dc34a9c
Update start g-code for BIBO2 Dual 
This is a correction supplied by braden0202 in the issue thread #8977.
 2021-01-18 18:52:01 +01:00
Kostas Karmas
f1e152955c Correct the Menu title 
CURA-7865
 2021-01-18 18:00:05 +01:00
Jaime van Kessel
ffccd687ac
Merge branch 'fix_machinesettings_floats' of https://github.com/fieldOfView/Cura 2021-01-18 15:53:57 +01:00
maihde
770dcd1cf0 feat: add snapmaker 2.0 definitions 2021-01-18 07:57:07 -05:00
Kostas Karmas
fc718892d9 Add default text in the ComboBox 
The Cura.ComboBox component can now display a default text when there are no items in its model
and another text when there is no item selected.

CURA-7865
 2021-01-18 12:10:15 +01:00
3dg-Lester
c55986e583 Update sapphirepro_platform.stl 2021-01-16 10:27:16 +08:00
3dg-Lester
9e0f2a2db0 Update TPU Print setting 2021-01-16 10:07:31 +08:00
3dg-Lester
7b37a6d4dd Update def 2021-01-16 07:51:37 +08:00
3dg-Lester
82b867086b Update two_trees_sapphireplus.def.json 2021-01-16 07:48:19 +08:00
Kostas Karmas
2774ec7bdf Remove unnecessary kwargs 
CURA-7865
 2021-01-15 17:42:42 +01:00
Kostas Karmas
a45af1da25 Add save projects submenu 
CURA-7866
 2021-01-15 09:50:23 +01:00
Ghostkeeper
263e1ae3a7
Show 'connect top/bottom polygons' also when initial layer bottom pattern is concentric 
Fixes CURA-7962.
Fixes #9106.
 2021-01-12 11:39:50 +01:00
3dg-Lester
afc8065ae7 Adding Twotrees Full range printer profiles 
Profile for:
Bluer / Bluer Plus / Sapphire Pro / Sapphire Plus

Nozzle size : 0.2mm to 1mm

Material: PLA / ABS / PETG / TPU
 2021-01-12 11:59:39 +08:00
Jelle Spijker
d16c5f1991
Merge pull request #9012 from Ultimaker/CURA-7868_Introduce_file_provider_plugin_type 
CURA-7868: Introduce the file provider plugin type
 2021-01-11 18:24:18 +01:00
Kostas Karmas
fd3c985440 Fix ambiguous Ctrl+O shortcut not opening the local file dialog 
Ctrl+O was assigned as a shortcut in two places:
  1. To the "File->Open File(s)" menu item, which is visible when only the local file
	 provider is enabled (i.e. the DF file provider is disabled)
  2. To the "File->Open File(s)->From Disk" menu item, which is visible when there are
     more than one file providers enabled.

This was creating an ambiguous shortcut, thus never opening the local file dialog.

This is now fixed by disabling the shortcuts when the respective items are not visible.

CURA-7868
 2021-01-11 17:50:26 +01:00
skilescm
8ce0dbe9cc
Added Maker Made 300x Printer (#8901) 
* Add files via upload

* Add files via upload

* Update maker_made_300x.def.json

* Update maker_made_300x_extruder_0.json

* Update maker_made_300x_extruder_0.json

* Update maker_made_300x.def.json

* Update maker_made_300x.def.json

* Update maker_made_300x.def.json

* Update resources/extruders/maker_made_300x_extruder_0.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/maker_made_300x.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/maker_made_300x.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update maker_made_300x.def.json

* Rename maker_made_300x_extruder_0.json to maker_made_300x_extruder_0.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-01-11 09:15:17 +01:00
cataclism
a2e5ce6680
Adding the MINGDA D2 (#8872) 
* Added the configuration files for the Artillery Printers

Added the configuration files for the Artillery Printers

* Changed version file

* Updated versions, removed machine_head_polygon

* fixed version in some files

* Added generic PLA,PETG,ABS,TPU

* Update resources/definitions/artillery_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/artillery_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* 1st batch of update

* Apply suggestions from code review

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* 2nd batch of changes

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Added the MINDA definition and the MINGDA D2

* Update mingda_d2.def.json

Inserted artillery genius plate for the moment

* Update mingda_d2.def.json

Updated machine dimension

* Added the mesh for the D2 & updated the offsets

* Update resources/definitions/mingda_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Apply suggestions from code review

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Apply suggestions from code review

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-01-11 09:07:35 +01:00
Konstantinos Karmas
7574b3e2c7
Merge pull request #8924 from Eryone/master 
Added Eryone ER20 3d printer
 2021-01-08 14:00:23 +01:00
Kostas Karmas
96c4d66029 Revert making the open file dialog a separate LocalFileProvider plugin 
This reverts commits 00de7497a4c2986cf8fd13be8f598a0f615f3d63 to 5f6b3b52c1848416c98f7d276fe02f08d067f675

CURA-7868
 2021-01-07 16:35:40 +01:00
Kostas Karmas
606ec587fe Change the row height in the table view 
CURA-7868
 2021-01-06 11:51:29 +01:00
Kostas Karmas
adcdf7bad9 Remove unnecessary QML imports 
CURA-7868
 2021-01-05 14:54:28 +01:00
Kostas Karmas
dc02038513 Add a Cura-themed, re-usable TableView component 
CURA-7868
 2021-01-05 14:47:46 +01:00
Ghostkeeper
5f6b3b52c1
Don't trigger open menu upon starting Cura 
That would be very annoying.

Contributes to issue CURA-7868.
 2021-01-04 18:13:18 +01:00
Ghostkeeper
b266904d76
Replace other references to the open action with the file provider model 
This adds a function 'triggerFirst' to the file provider that triggers the first file provider in the model. That should then be the local file provider, but if the plug-in is disabled for some reason it would use another plug-in.

Contributes to issue CURA-7868.
 2021-01-04 18:12:15 +01:00
Ghostkeeper
de80461954
Remove open action, fixing ambiguous overload of Ctrl+O 
The action was no longer in the menu, but the hotkey still functioned. Then there were two actions for Ctrl+O, which was ambiguous to Qt.

Contributes to issue CURA-7868.
 2021-01-04 18:11:00 +01:00