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

2600 Commits

Author SHA1 Message Date
Lipu Fei
3a46a337ff In SliceInfo, use the global stack if it is a single-extrusion machine 
CURA-4167

Single extrusion machines don't have extruder stacks in the current
architecture.
 2017-08-15 14:19:23 +02:00
Ghostkeeper
59058ad77f
Merge branch '2.7' 2017-08-15 11:24:00 +02:00
Lipu Fei
026244fb53 Add comments for conflict detection 
CURA-4143
 2017-08-15 10:49:11 +02:00
Lipu Fei
9ff6ae010a Use findInstanceContainers() for definition_changes 
CURA-4167
 2017-08-15 10:44:23 +02:00
Ghostkeeper
6349f1b5e6
Add context for 'Browse plugins' translated text 
So that the translator knows what sort of text this is. It's the menu item in the application menu.

Contributes to issue CURA-4113.
 2017-08-14 14:55:50 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated 
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
 2017-08-14 13:54:11 +02:00
Thomas Karl Pietrowski
599009f176 PluginBrowser: Send also OS and architecture 
Orientated a bit on the way how browsers are sending their strings.
No idea, whether there is a standard on this or not.
Needs to be discussed I guess..
 2017-08-13 19:31:39 +02:00
Ghostkeeper
76e0156076
Merge branch '2.7' 2017-08-11 11:18:15 +02:00
Ghostkeeper
b03847447f
Take manufacturer from XML profile if available 
Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string).

Contributes to issue CURA-4157.
 2017-08-11 11:13:23 +02:00
Lipu Fei
0a76e5c38f Merge branch '2.7' 2017-08-09 16:59:56 +02:00
Lipu Fei
66b26bafd4 Show quality name in project loading summary 
CURA-4142

In case the quality changes container is not there, show the quality
name of the quality profile.
 2017-08-09 13:27:00 +02:00
Lipu Fei
98b72fb971 Merge branch '2.7' 2017-08-09 13:16:43 +02:00
Lipu Fei
ccabbd8ca0 Mark definition changes container found instead of conflict 
CURA-4143

Reverts 65554b60e19507635c79048dc73862e6b25ec0ec
 2017-08-09 13:12:06 +02:00
Lipu Fei
65554b60e1 Mark definition_changes conflict if it is not found 
CURA-4143
 2017-08-09 13:06:18 +02:00
Ghostkeeper
80cbdd03bb
Merge branch '2.7' 2017-08-07 11:06:12 +02:00
Lipu Fei
76e8090dbd Remove duplicated function createDefinitionChangesContainer() 
CURA-4107
 2017-08-07 10:59:24 +02:00
Lipu Fei
7cb8e675cf Remove redundant createDefinitionChangesContainer() in UMOUpgradeSelection 2017-08-04 11:14:56 +02:00
Lipu Fei
b4be6fcb9f Use Label for LayerView legend texts 
CURA-3799
 2017-08-03 16:18:58 +02:00
Ghostkeeper
9837537120
Merge branch '2.7' 2017-08-03 15:55:08 +02:00
Ghostkeeper
d85fd63795
Mention Neotko as the originator of Ironing 
As promised.

Contributes to issue CURA-4114.
 2017-08-03 15:53:32 +02:00
alekseisasin
2990333d1d
Updated the Change log (added 2.6.2 and 2.7.0) 
CURA-4114
 2017-08-03 14:00:55 +02:00
alekseisasin
c4d23437f2 Updated the Change log (added 2.6.2 and 2.7.0) 
CURA-4114
 2017-08-03 13:19:49 +02:00
Lipu Fei
ddee562129
Fix typo in LayerView.qml 
CURA-3799
 2017-08-03 13:06:20 +02:00
alekseisasin
b984b99c30
Translated text overlaps GUI 
CURA-3799
 2017-08-03 13:05:53 +02:00
fieldOfView
d6d4617356 Resize camera image to fit small windows if necessary 2017-08-03 10:56:21 +02:00
Lipu Fei
3ffa274050 Fix typo in LayerView.qml 
CURA-3799
 2017-08-02 10:24:28 +02:00
Lipu Fei
6e06837084 Remove duplicated function createDefinitionChangesContainer() 
CURA-4107
 2017-08-02 08:50:32 +02:00
Lipu Fei
05d7e15d4c Merge remote-tracking branch 'upstream/2.7' 2017-08-02 08:48:15 +02:00
alekseisasin
d6c1a231ac Translated text overlaps GUI 
CURA-3799
 2017-08-01 15:50:55 +02:00
Lipu Fei
05879e0dfc EngineBackend should trigger auto-slice on changes 
CURA-4107

CuraEngineBackend should trigger auto-slice on value changes, not
changes on the active extruder.
 2017-08-01 09:39:35 +02:00
Jaime van Kessel
b5a94e3f3b Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-27 13:59:09 +02:00
Lipu Fei
ddaac2fbbc Revert "Add SolidWorks plugin" 
This reverts commit 1c39c90494a664fafdfdd127ace578bd274b19eb.
 2017-07-27 13:02:49 +02:00
Jaime van Kessel
92679818ed Added min width & height 
FIXES #600
 2017-07-27 12:55:12 +02:00
Lipu Fei
1c39c90494 Add SolidWorks plugin 
CURA-3823
 2017-07-27 12:36:34 +02:00
Lipu Fei
439f3e5029 When an error check finishes, only trigger auto-slicing if needed 
CURA-4092

Many things can trigger an error check, but Cura should only auto-slice
if the error check was scheduled due to a value change.
 2017-07-27 10:20:06 +02:00
Lipu Fei
c16bfa8949 Remove unnecessary if checks 
CURA-4048
 2017-07-27 09:54:30 +02:00
Lipu Fei
9fca677d40 Fix comment location 
CURA-4048
 2017-07-27 09:52:05 +02:00
Jaime van Kessel
e636dbdd10 Merge pull request #2107 from fieldOfView/feature_pyserial_usb_detection 
Use pyserial to list serial ports
 2017-07-27 09:31:35 +02:00
Lipu Fei
d9d39c41df Fix auto-slicing upon value changes and error checks 
CURA-4092

- Keep the error check finished signal.
- Restore the old way of triggering an auto-slicing which depends on a
  setting value change singal.
- Add a mechanism to make sure that if there is an error check, the
  auto-slicing will only be triggered after the check finishes.
 2017-07-27 09:03:06 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Lipu Fei
686ca803ee Set correct machine name when creating a new machine from a project 
CURA-4074
 2017-07-26 15:08:15 +02:00
Lipu Fei
9c1d23fe5b Make sure MachineManager initializes after ContainerRegistry does 
CURA-4084

When MachineManager gets created, it will find and set the current
active machine. This requires the ContainerRegistry to be initialized
first.
 2017-07-26 14:09:18 +02:00
Lipu Fei
93731b8d1f Trigger auto-slice based on stackValidation instead of stack/setting changes 
CURA-4084

Stack error checks are scheduled with a delay, and when a container is
changed (e.g. Quality), the auto-slice may get triggered before the
error check is done. Because the error check result is cached, the
auto-slicing will use the previous result instead of new. So, the
auto-slicing should be triggered when a stack validation is finished
instead of when a stack/setting gets changed.
 2017-07-26 14:09:18 +02:00
Thomas Karl Pietrowski
fe3bccaf5f LayerView: Set color for comp. mode text 
Before it was using the system's default, which is not that nicely visible, if you are using a dark theme.
 2017-07-25 09:35:42 +02:00
Jaime van Kessel
24f89e3714 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-24 17:18:56 +02:00
Jaime van Kessel
a8a475a1a7 Only stop the camera if the timer is actually running 
CURA-4081
 2017-07-24 17:18:04 +02:00
Ghostkeeper
89cd11e62a
Upgrade g-code flavour Volumatric to Volumetric 
Contributes to issue CURA-3998.
 2017-07-24 16:19:59 +02:00
Lipu Fei
3aabbab11f Correctly handle IndexError for defaultColors 
CURA-4072

defaultColors is a list, so it's not KeyError but IndexError.
 2017-07-21 16:03:11 +02:00
Lipu Fei
3d378ebc5f Merge remote-tracking branch 'upstream/CURA-4057' 2017-07-21 14:14:27 +02:00
Lipu Fei
ed91bf816f Correct definition_changes location in 2.6 to 2.7 upgrade script 
CURA-4053
 2017-07-21 11:36:47 +02:00