GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 02:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,329 Commits 295 Branches 268 Tags
Commit Graph

20329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
446f87ec59
Merge branch '4.2' 2019-07-10 12:58:52 +02:00
Ghostkeeper
be86576ff9
Improve wording and name of 'Ignore Small Z Gaps' 
Hopefully it'll be a bit more clear what this setting does, now.
 2019-07-10 12:58:35 +02:00
ChrisTerBeke
99e2939801 Add defense for when active printer is None 2019-07-10 12:55:12 +02:00
ChrisTerBeke
f1df7b93c4 Fix printer and print job ordering, add back 'move to top' 2019-07-10 12:42:01 +02:00
Simon Edwards
146f78e658
Merge pull request #5992 from Ultimaker/CS-134_hide_move_to_top 
Hide 'move to top' option from actions
 2019-07-09 13:03:42 +02:00
Ghostkeeper
b87a0a7e82
Merge branch 'CURA-6590_continue_fix_diameter_reset' 2019-07-09 09:11:31 +02:00
ChrisTerBeke
9ad89017d0 Add text about cloud connection when no printer can be reached on monitor 2019-07-09 09:09:08 +02:00
ChrisTerBeke
b6a00b9f7f Hide 'move to top' opion from actions 2019-07-09 08:26:44 +02:00
Ghostkeeper
6941af0022
Merge branch 'CURA-6590_continue_fix_diameter_reset' 2019-07-08 15:05:20 +02:00
Lipu Fei
3d410cceb9 Fix change material diameter binding 
CURA-6590
 2019-07-08 13:40:08 +02:00
Lipu Fei
b36d040ba9 Use rejected instead of visibility hack 
CURA-6590
 2019-07-08 13:01:42 +02:00
Lipu Fei
1f542d1bc8 Merge remote-tracking branch 'origin/master' into CURA-6590_continue_fix_diameter_reset 2019-07-08 12:49:58 +02:00
Ghostkeeper
21241c1914
Mark DeltaBot as a custom printer 
Because that's what it is.
 2019-07-08 10:27:06 +02:00
Ghostkeeper
c0297ceee5
Spelling correction 
Noticed this when I was developing the settings guide.
 2019-07-05 23:05:16 +02:00
Remco Burema
52d4875a68
Merge pull request #5967 from Ultimaker/CURA-6625-Remove-Max-Z-Speed-Overide 
Remove the max-z-speed-override
 2019-07-04 16:17:41 +02:00
Lipu Fei
178f73ec62 Fix CURA_CLOUD_ACCOUNT_API_ROOT config 2019-07-04 15:58:27 +02:00
Remco Burema
a495d71a14 Fill in manufacturers previously set to unknown/'not applicable'. 2019-07-04 14:39:28 +02:00
DragonJe
b55d0b3230
Create nwa3d_a31_e.inst.cfg 2019-07-03 17:41:27 -05:00
DragonJe
6428e9185c
Create nwa3d_a31_best.inst.cfg 2019-07-03 17:40:38 -05:00
DragonJe
62fa11f182
Create nwa3d_a31_fast.inst.cfg 2019-07-03 17:39:34 -05:00
DragonJe
225a34ae30
Create nwa3d_a31_normal.inst.cfg 2019-07-03 17:38:50 -05:00
DragonJe
abc980e3d6
Create nwa3d_a31_06.inst.cfg 2019-07-03 17:37:38 -05:00
DragonJe
87193da472
Create nwa3d_a31_04.inst.cfg 2019-07-03 17:37:12 -05:00
DragonJe
348b7cd9d8
Create nwa3d_a31_extruder_0.def.json 2019-07-03 17:35:39 -05:00
DragonJe
56b39d0b33
Create nwa3d_a31.def.json 2019-07-03 17:34:12 -05:00
Remco Burema
fea8262656 Listen to 'material-changed' since it doesn't update immediately. 
part of CURA-6590
 2019-07-03 16:14:08 +02:00
Jaime van Kessel
7d446722a9 Remove the max-z-speed-override 
CURA-6625
 2019-07-03 16:13:21 +02:00
Jaime van Kessel
d43415191b Merge branch 'CURA-6635_add_printer_by_manufacturer' of github.com:Ultimaker/Cura 2019-07-03 14:29:26 +02:00
Ghostkeeper
cfa059fb81
Remove removed prime tower settings 
The prime tower is now always circular. This fixes a unit test.
 2019-07-03 12:48:29 +02:00
Ghostkeeper
12e2e47e72
Make corrections to manufacturer fields 
When it's categorised by manufacturer these mistakes become more apparent.

Contributes to issue CURA-6635.
 2019-07-03 11:27:19 +02:00
Ghostkeeper
0678d47dad
Make 'Ultimaker B.V.' preferred manufacturer rather than 'Ultimaker' 
Ultimaker was the category. Ultimaker B.V. is the manufacturer, which is now used as the section property.

Contributes to issue CURA-6635.
 2019-07-03 11:12:41 +02:00
Ghostkeeper
e6f25884f8
Categorise printers by manufacturer 
This should make it easier to find the printer you want.

Contributes to issue CURA-6635.
 2019-07-03 10:56:19 +02:00
Ghostkeeper
365d725e42
Add escape as hotkey to exit full screen 
Should be easier to discover.

Fixes #5956.
 2019-07-03 10:32:00 +02:00
Lipu Fei
e8c08b77e5
Merge pull request #5961 from Ultimaker/trouch-fix/creawsomemod 
Import CreawsomeMod profiles and implement version upgrade
 2019-07-03 09:42:05 +02:00
Ghostkeeper
d449ec9266
Really don't make creality_base a visible printer 
It's not a printer. It's a base profile. Every printer in the list of printers should coincide with a physical printer, with the one exception of Custom FFF Printer.
If we find settings that work for all printers we should apply it to fdmprinter so that we do apply it to every printer.

Contributes to issue CURA-6554.
 2019-07-03 09:31:10 +02:00
Ghostkeeper
d9b3f1fee9
Merge branch 'trouch-fix/creawsomemod' of github.com:trouch/Cura into trouch-fix/creawsomemod 2019-07-03 09:22:59 +02:00
Lipu Fei
63171508c9 Fix profiles 2019-07-03 09:18:39 +02:00
Lipu Fei
7f824b06bb Fix typing 2019-07-03 09:09:23 +02:00
trouch
8081e32ebf Change creality_base name to "Creawsome Custom" 2019-07-02 20:08:31 +02:00
trouch
0f79376547 fix ender purge line going out of bed 2019-07-02 19:39:20 +02:00
trouch
8911aa5cbb Update creality_base def with last Creawsome one 2019-07-02 19:26:59 +02:00
Jaime van Kessel
4428c32df3 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-02 17:59:50 +02:00
Jaime van Kessel
2cd6b73d12 Ensure that the material selection gets reset when diameter is changed 
CURA-6590
 2019-07-02 17:59:27 +02:00
Ghostkeeper
a57304b603
Fix typo: Retracation -> Retraction 
Contributes to issue CURA-6631.
 2019-07-02 17:46:06 +02:00
Ghostkeeper
02b925388a
Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX 
Conflicts:
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg -> Deleted in branch, but modified for setting version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/variants/tizyx_evy_dual_direct_drive.inst.cfg -> Modified in branch for new settings, in master for settings version
 2019-07-02 17:35:07 +02:00
Jaime van Kessel
758a8a0078 Merge branch 'CURA-6583_fix_ortho_side' of github.com:Ultimaker/Cura 2019-07-02 16:50:00 +02:00
Remco Burema
5ea2b0e073 Make stripes closer togheter in striped shader. 
part of CURA-6583
 2019-07-02 16:49:27 +02:00
Ghostkeeper
bb6e9da526
Fix upgrading custom quality profiles for Creality printers 
Quite a lot of logic necessary... Oh well.

Contributes to issue CURA-6554.
 2019-07-02 16:39:56 +02:00
Remco Burema
a61e7ea7df Fix striped (off-buildplate) shader for ortho-view. 
part of CURA-6583
 2019-07-02 16:20:12 +02:00
Ghostkeeper
d5da6e34be
Add version upgrade for Creality printers and CreawsomeMod 
This should work for both.

Contributes to issue CURA-6554.
 2019-07-02 16:00:06 +02:00