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

9931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ghostkeeper
4b4f971222
Make 'other' the default category 
This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out.
 2017-08-25 09:17:55 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Lipu Fei
50a7e8146f Add a dedicated stack class for per-object settings 
CURA-4186

Add a dedicated stack class PerObjectContainerStack for per-object
settings to evaluate limit_to_extruder values correctly.
 2017-08-24 17:09:28 +02:00
Lipu Fei
365379f735 Add missing context in getProperty() in global and extruder stacks 
CURA-4186

All getProperty() calls should use the provided context.
 2017-08-24 17:01:03 +02:00
Lipu Fei
2ec7c14422 Fix PerObjectSettingsPanel.qml 
CURA-4186

- The UI shouldn't be bound to the limit_to_extruder stack, it should
  always be bound to the per-object stack.
- The ActiveTool.getValue() calls cannot be bound in QML, so use a
  Connections to update the values based on signals.
 2017-08-24 16:57:12 +02:00
Mark Burton
2db96f02f4 Revised minimum_value and minimum_value_warning values. 
Now just constrains z_offset_taper_layers to be >= 0 as that needs to be positive.
 2017-08-24 15:24:10 +01:00
Ghostkeeper
557173e799
Merge branch '2.7' 2017-08-24 15:33:01 +02:00
Ghostkeeper
a1fdcd0e48
Update prime tower settings for PVA 
This reduces the jerk considerably and makes use of the new prime tower purge settings.
 2017-08-24 15:32:41 +02:00
Ghostkeeper
4caad8f3b9
Add Creality CR10S4 and S5 definitions 
They use the same settings as the normal one but they are larger printers.
 2017-08-24 14:53:15 +02:00
Ghostkeeper
c43b7f6f1b
Update Creality CR10 Beta definition 
The printer was also renamed to a more specific name. These are updates I'm getting from Michael.
 2017-08-24 14:42:39 +02:00
Ghostkeeper
bef1611e98
Merge branch 'kemiq3d-patch-9' 2017-08-24 09:17:25 +02:00
Ghostkeeper
ccf6d12283
Merge branch 'patch-9' of https://github.com/kemiq3d/Cura into kemiq3d-patch-9 2017-08-24 09:17:18 +02:00
Ghostkeeper
5c66beb082
Merge branch 'kemiq3d-patch-8' 2017-08-24 09:15:26 +02:00
Ghostkeeper
548d17390e
Merge branch 'patch-8' of https://github.com/kemiq3d/Cura into kemiq3d-patch-8 2017-08-24 09:15:20 +02:00
Ghostkeeper
df4cd98406
Merge branch 'kemiq3d-patch-7' 2017-08-24 09:14:06 +02:00
Ghostkeeper
6a40264f9a
Merge branch 'patch-7' of https://github.com/kemiq3d/Cura into kemiq3d-patch-7 2017-08-24 09:13:55 +02:00
Ghostkeeper
222c9b66d8
Merge branch 'kemiq3d-patch-6' 2017-08-24 09:12:16 +02:00
Ghostkeeper
a12c569281
Merge branch 'patch-6' of https://github.com/kemiq3d/Cura into kemiq3d-patch-6 2017-08-24 09:12:00 +02:00