3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 00:37:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
3049 commits 302 branches 270 tags 770 MiB
Commit graph

3049 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
7dea2506b6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-11 11:55:04 +01:00
Jaime van Kessel
5fbf4f336e Removed profile settings that already were on default 2016-03-11 11:54:31 +01:00
fieldOfView
e56347501d Make setting category headers bold 
Special request from Martijn
 2016-03-10 17:13:07 +01:00
Jaime van Kessel
a3eb212d68 Platform adhesion is now handled by inherit function 
Based on suggestion by ghostkeeper CURA-1068
 2016-03-10 15:09:15 +01:00
Jaime van Kessel
9f29af82b5 Fixed issues caused by 3b6aedd585 2016-03-10 14:07:03 +01:00
fieldOfView
83e4385e7e Revert "Reimport default profiles from 15.04.04" because I did not oversee 
the implications at the time

This reverts commit ce562713c3.
 2016-03-10 13:45:00 +01:00
fieldOfView
d8b082071d Merge branch 'feature_profilesorting' 2016-03-10 13:44:38 +01:00
Tim Kuipers
3b6aedd585 JSON: disabled top_bottom_thickness, shell_thickness and remove_overlapping_wall_parts_0_enabled (CURA-1099) 2016-03-10 12:43:07 +01:00
Tim Kuipers
e872d29636 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-10 12:08:17 +01:00
Tim Kuipers
3a377a616b profiles: machine_nozzle_size ==> line_width (CURA-1097) 2016-03-10 12:08:06 +01:00
fieldOfView
cdc9ece474 Show separator between readonly profiles and custom profiles in profiles menu and sidebar profiles dropdown 
Contributes to CURA-855
 2016-03-10 11:57:47 +01:00
Ghostkeeper
3690eafb72 Add filter_by_machine parameter to USBPrinting 
This was an oversight. When the filter_by_machine feature was added, we didn't think of the USB printing output device. The feature has no meaning here, since USB printing only supports g-code. Just ignore it.
 2016-03-10 10:46:54 +01:00
Jaime van Kessel
e8c99f6b9f Increased readability 
CURA-1087
 2016-03-09 17:12:53 +01:00
Jaime van Kessel
7be8fa1fe3 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-09 16:22:45 +01:00
Jaime van Kessel
ffbc3e8da3 Added min size to printjob name 
CURA-1107
 2016-03-09 16:09:12 +01:00
Jaime van Kessel
37418be317 Merge pull request #658 from thopiekar/2.1-i18n-de-spelling 
[2.1] i18n: de: Correcting tooltip
 2016-03-09 15:37:00 +01:00
fieldOfView
a911471206 Add weights to standard profiles for sorting 
Contributes to CURA-1059

Conflicts:
	resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
	resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
	resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
	resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
	resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
	resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
 2016-03-09 15:33:51 +01:00
Thomas-Karl Pietrowski
09612f49c8 i18n: de: Correcting tooltip 
Just found another translation error.
This commit corrects "Bereit zum Über USB drucken" into "Bereit zum Drucken über USB".
It is almost related to another set of corrections I sent before, but didn't found this one as I didn't had my printer connected.
 2016-03-09 15:30:27 +01:00
Jaime van Kessel
9731d189be UM2Go and UMO now have brim as default platform adhesion 
CURA-1068
 2016-03-09 14:53:10 +01:00
Jaime van Kessel
31d0a1651a Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-09 10:14:32 +01:00
Jaime van Kessel
733215ef3e Selection is no longer ignored by push free 
Fixes CURA-1086
 2016-03-09 10:11:42 +01:00
Ghostkeeper
ca1e9f6e52 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-03-09 09:38:18 +01:00
Ghostkeeper
ae0cb70d25
Tweak infill wipe distance 
This wasn't taken over correctly from Paul's spreadsheet.

Contributes to issue CURA-892.
 2016-03-09 09:38:02 +01:00
Ghostkeeper
a1f3429ce6 Merge pull request #654 from thopiekar/2.1-cura-rename 
[2.1] Renaming cura_app.py to cura on Linux
 2016-03-09 09:21:44 +01:00
fieldOfView
48a181d0b5 Add weights to standard profiles for sorting 
Contributes to CURA-1059
 2016-03-08 17:45:00 +01:00
Jaime van Kessel
3df0b4de66 Fixed removable drive for OSX 2016-03-08 16:59:16 +01:00
fieldOfView
81a015015d Add "star" icon to profile dropdown when there are customised settings 
Contributes to CURA-909
 2016-03-08 12:06:21 +01:00
fieldOfView
00afebbc0d Add translate icon 
Contributes to CURA-838
 2016-03-08 12:04:39 +01:00
Thomas-Karl Pietrowski
617f591e55 Rename cura_app.py to cura in cura.desktop 2016-03-08 11:08:16 +01:00
Thomas Karl Pietrowski
368718e82b Make all install(*) commands multiline 
It makes the CMakeLists.txt (at least for me) easier to read.
 2016-03-08 11:07:50 +01:00
Thomas Karl Pietrowski
ce9f6077a2 Renaming cura_app.py into cura on Linux* 2016-03-08 11:07:35 +01:00
fieldOfView
06445ef3bb Add link to troubleshooting guide to simple mode 
Fixes CURA-536
 2016-03-07 15:19:27 +01:00
Jaime van Kessel
2ab999851c Toolbar correctly shows location of toolpanel when not triggered through QML 
Contributes to CURA-838
 2016-03-07 14:12:44 +01:00
Ghostkeeper
9bf12cf7b2
Remove double profile entry from D̩̙̹͈̜ͭ̌̃ͫ͊I̤̝̻͎̖̗͖͌̐̔C̪̐ͣ̅͛̆̇̅Ț̻̄͌̐ͪ̋ͨͫȈ̭̬̪͕̖̙̪̻̿ͥO̱͖̟͓̞͗ͧ͋ͮṆ̱̥͍̦͎̋ͭ̒͛A̻̯̳̩͈̱̤͎̽ͥͨ̋͐̀R̦̯̠ͩͮͮ̓̃ͭÝ̫̜̺̻̼̉̄̏͌ͭ̏͗̊ ̣̪̠̙̜͐ͥŐ͎̞̺̦̬̜͋̓F̩̣͖̤͇͍̍ͬ̽̉̏̿̾̓͒ͅ ̩̬̥̯ͮ̀ͮͮ͑̃̎ͅD͈̪ͧͣO̘̪̟̗̹͓̅̊ͅǑ͈M̟̦̭͙͈͕̖̊̅ͤ̓ͅ 2016-03-04 16:22:31 +01:00
Ghostkeeper
df9aac045b
Various improvements to desktop file 
Version number needs to be the version number of the desktop file format. The exec command needs to accept multiple files (capital F). The tryexec needs to accept no files. Added a comment.

Contributes to issue CURA-730.
 2016-03-04 15:38:59 +01:00
Ghostkeeper
a785c9a205
Fix merge conflict resolution 
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
 2016-03-04 11:23:35 +01:00
Jaime van Kessel
a9bd73f32a Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-03-04 10:59:40 +01:00
Tim Kuipers
24f1726585 JSOn/profiles: changed infill overlap to mm (CURA-786) 2016-03-03 17:28:45 +01:00
fieldOfView
317706bbeb Rename inventor_platform.stl to match the rest 2016-03-03 17:21:00 +01:00
fieldOfView
2c2640f38b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 17:18:02 +01:00
fieldOfView
2f9d505fdc Fix and move Innovo INVENTOR machine definition to machines folder 2016-03-03 17:17:36 +01:00
Tim Kuipers
b0befb6309 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 17:11:12 +01:00
Tim Kuipers
ff1cf02470 JSON: fix: magic surface mode had wrong default 2016-03-03 17:10:59 +01:00
fieldOfView
6d1a848e40 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 16:44:49 +01:00
fieldOfView
22fadf396a Fix 2 pixel space between save button and device selection menu button 2016-03-03 16:43:39 +01:00
fieldOfView
dfef811821 Update UM2+, UM2Ex and UM2Ex+ backplates 2016-03-03 16:19:24 +01:00
Ghostkeeper
a3115bc548
Also take points on Z=0 with convex hull 
Contributes to issue CURA-1009.
 2016-03-03 16:14:59 +01:00
Tim Kuipers
884de2a8ce JSON: fix: min_value should be a string also for third party printers :P 2016-03-03 13:09:28 +01:00
Tim Kuipers
b4b2267890 JSON: fix: rigidbot printers had duplicate id 2016-03-03 12:29:39 +01:00
Tim Kuipers
ff3cd59ed0 added prusai3_xl_platform.stl 2016-03-03 12:27:06 +01:00