GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 10:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,955 Commits 294 Branches 267 Tags
Commit Graph

9955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alekseisasin
37eb74e99e Fixed quality file names 
CURA-4128
 2017-08-31 13:16:08 +02:00
alekseisasin
1c73841fae Merge branch 'master' of github.com:Ultimaker/cura 2017-08-31 13:03:23 +02:00
alekseisasin
d23e9cafe4 Merge pull request #2162 from FABtotum/master 
FABtotum Personal Fabricator
 2017-08-31 12:56:24 +02:00
Ghostkeeper
18a07b6eee
Change support Z offset to 2*layer_height 
The materials team found this to work better.
 2017-08-31 11:49:24 +02:00
Ghostkeeper
582a17c6af
Sort all UM2+ profiles 
This will make it easier to modify these profiles in the future.
 2017-08-31 11:48:41 +02:00
alekseisasin
225a213181 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-31 10:35:08 +02:00
alekseisasin
fa61f5c2ad Merge pull request #2340 from Ultimaker/feature_license_for_plugins 
Let user accept/decline a plugin license if present
 2017-08-31 10:26:40 +02:00
krios-fabteam
b4ae52b4c3 added 2 more variants 
improved quality profiles
 2017-08-30 17:17:39 +02:00
alekseisasin
01c7b5307f Merge branch 'feature_license_for_plugins' 
CURA-4222
 2017-08-30 17:11:27 +02:00
alekseisasin
088092c7bc Added min and max dialog size 
CURA-4222
 2017-08-30 17:07:43 +02:00
Jaime van Kessel
053fdd679d Don't send duplicated materials to printer 
CURA-4199
 2017-08-30 15:52:31 +02:00
Jaime van Kessel
8830fa7e10 Merge branch '2.7' of github.com:Ultimaker/Cura 2017-08-30 15:12:56 +02:00
Jaime van Kessel
3b2c528595 If no licence text is set, use empty string 
It doesn't really matter that much, but QT complaining about it annoyed me.
CURA-4222
 2017-08-30 15:07:58 +02:00
Jaime van Kessel
6d40882bdc Ensure that installing files works on non Windows os'es as well 
CURA-4222
 2017-08-30 15:06:08 +02:00
Lipu Fei
23544ad1fe Only fall back to use fdmprinter when the quality profiles for the current machine cannot be found 
CURA-4139

UM2 family don't have machine material, but they do have their dedicated
profiles. When Cura searches for quality profiles, it should only fall
back to use "fdmprinter" as the definition if no quality profile can be
found for the current machine.
 2017-08-30 14:59:12 +02:00
Lipu Fei
e8e8081215 Add quality_definition for UM2ex and UM2go 
CURA-4139

UM2ex and UM2go should share the same set of quality profiles as UM2.
 2017-08-30 14:58:07 +02:00
Lipu Fei
f426a0aa62 Add quality files for UM2 
CURA-4139

Add dedicated quality files for UM2 so they won't get profiles with
layer height higher than 0.25mm
 2017-08-30 14:56:38 +02:00
Lipu Fei
679c7dcfda Let user accept/decline a plugin license if present 
CURA-4222

If a downloaded plugin contains a license file, a dialog which contains
the license information will pop up. The user has to accept the license
before he/she can install the plugin.

If a plugin doesn't have a license file, after it is downloaded, it will
be installed directly just like before.
 2017-08-30 14:09:51 +02:00
Ghostkeeper
2c7c29dc71
Merge branch 'master' into quarter_cubic_infill 2017-08-30 11:03:04 +02:00
Ghostkeeper
611ed083a0
Merge branch 'probonopd-patch-5' 2017-08-30 10:27:50 +02:00
Ghostkeeper
aed0c59cda
Merge branch 'patch-5' of https://github.com/probonopd/Cura into probonopd-patch-5 2017-08-30 10:23:44 +02:00
alekseisasin
ac6f50e686 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-29 18:24:47 +02:00
alekseisasin
472b9fc779 Setting was not visible because was applied wrong settings scope 
CURA-4192
 2017-08-29 18:23:35 +02:00
Ghostkeeper
f5e0db5e2a
Add missing period 
Spotted a small mistake in the translations by accident.
 2017-08-29 17:23:17 +02:00
Ghostkeeper
f7def41df8
Enable prime tower for CPE+ 0.8 Fast Print 
The prime tower is enabled for the other two quality profiles but not for this one, so we're making this consistent (with confirmation from the Materials team).
2.7.0 		2017-08-29 15:27:10 +02:00
krios-fabteam
be4fa98638 removed quality duplicates 2017-08-29 11:34:21 +02:00
krios-fabteam
56bab36869 added generic label for materials 2017-08-28 17:56:01 +02:00
Ghostkeeper
a29c9307de
Merge branch '2.7' 2017-08-28 16:46:42 +02:00
Ghostkeeper
08f69d168d
Add Chinese language entry to change log 
Contributes to issue CURA-4000.
 2017-08-28 16:46:26 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Jaime van Kessel
8a0f6d969e Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7 2017-08-28 16:05:59 +02:00
Ghostkeeper
3dbf91eb18
Fix mistakenly translated replace key 
Bad translator. Baaaaaaad.

Contributes to issue CURA-3999.
 2017-08-28 15:42:12 +02:00
Ghostkeeper
1401d90bd0
Update Chinese translations for 2.7 
These are the files I got from Bothof.

Contributes to issue CURA-3999.
 2017-08-28 15:41:27 +02:00
alekseisasin
788e42d294 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-28 15:38:48 +02:00
Ghostkeeper
eeea30f2d1
Update translation templates for 2.7 
New strings get empty translations. This is generated by calling 'make i18n-update-po-zh_CN'.

Contributes to issue CURA-3999.
 2017-08-28 15:32:36 +02:00
alekseisasin
6c280fff9a Merge pull request #2271 from Ultimaker/thopiekar-plugin-browser-send-more-info 
PluginBrowser: Send also OS and architecture
 2017-08-28 15:30:49 +02:00
Ghostkeeper
22b808afb3
Merge branch 'master' of https://github.com/PCDotFan/Cura into PCDotFan-master 2017-08-28 15:29:45 +02:00
Lipu Fei
b84500f742 Import Application instead of inline import CuraApplication 
CURA-4186
 2017-08-28 14:35:36 +02:00
Lipu Fei
37414e7bc7 Fix code style: double quotes instead of single quotes 
CURA-4186
 2017-08-28 14:34:53 +02:00
alekseisasin
977911169e Merge branch 'master' of github.com:Ultimaker/cura 2017-08-28 11:23:43 +02:00
alekseisasin
ae63060d75 Merge branch 'mb-z-offset' of https://github.com/smartavionics/Cura 2017-08-28 10:43:53 +02:00
fieldOfView
61442e512f Fix setting the Gantry height setting in Machine Settings 2017-08-28 10:13:06 +02:00
fieldOfView
2ac67a7d34 Fix setting the Gantry height setting in Machine Settings 2017-08-27 22:04:46 +02:00
Lipu Fei
141aad5513 Trigger to re-evaluate default settings in per-object settings when the active stack gets changed. 
CURA-4186

Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
 2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first 
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
 2017-08-25 12:19:05 +02:00
Lipu Fei
414901ae84 Force update the provider when the setting's limit_to_extruder gets changed 
CURA-4186

In the per-object settings, when a setting's limit_to_extruder gets
changed, its value should be updated too.
 2017-08-25 11:58:40 +02:00
Lipu Fei
c44e527305 Remove warning in /PerObjectContainerStack 
CURA-4186
 2017-08-25 11:57:52 +02:00
Ghostkeeper
ff4fb0dea0
Merge branch 'patch-4' of https://github.com/probonopd/Cura into probonopd-patch-4 2017-08-25 09:41:59 +02:00
Ghostkeeper
9cea356a18
Replace tabs with spaces 
As per our code style standard.
 2017-08-25 09:22:47 +02:00
Ghostkeeper
90583bd56d
Replace tabs with spaces 
And fix the alignment while we're at it.
 2017-08-25 09:22:07 +02:00