GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 21:46:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,694 Commits 290 Branches 260 Tags
Commit Graph

3694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
31f97e0f61 Another set of fixes due to merge issues 2016-07-08 13:33:09 +02:00
Jaime van Kessel
6e7c263557 Improved logging 2016-07-08 13:31:54 +02:00
Jaime van Kessel
91a3e90dfe Merge branch 'feature_ux_dialogs' of github.com:Ultimaker/Cura 2016-07-08 13:23:44 +02:00
Jaime van Kessel
27d47b5c9c Fixes some issues due to merge 2016-07-08 13:22:40 +02:00
Ghostkeeper
21ae73fca0
Capitalise Euclidean dimension names 
X, Y and Z.

Contributes to issue CURA-1816.
 2016-07-08 11:53:58 +02:00
fieldOfView
fc74b53877 Add documentation 
CURA-1850
 2016-07-08 11:44:20 +02:00
fieldOfView
bf529c6425 Apply a flood control on messages about materials/hotends changed on the printer 
CURA-1850
 2016-07-08 11:26:24 +02:00
fieldOfView
c129b4b8b5 Let the user opt out of changing to the material/nozzle reported by the printer 
CURA-1850
 2016-07-08 11:25:31 +02:00
fieldOfView
475277069f Add optional arguments to reusable messagebox 
Contributes to CURA-1850
 2016-07-08 11:25:31 +02:00
fieldOfView
4a9de156cb Ask the user about keeping current settings when switching quality profiles 
CURA-1730
 2016-07-08 11:25:30 +02:00
fieldOfView
6eb502730c Add reusable messagebox based on QML MessageDialog 
Contributes to CURA-1730 and CURA-1850
 2016-07-08 11:24:37 +02:00
fieldOfView
2f3ffe2a18 Fix tabs when automatically switching to the monitor tab (on print start) 
CURA-1036
 2016-07-08 11:22:07 +02:00
Tim Kuipers
802e0b14b2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-08 00:01:20 +02:00
Tim Kuipers
6cdab33eb6 JSON fix: negative angles for conical overhang are possible (CURA-1412) 2016-07-07 23:59:19 +02:00
fieldOfView
08f2143790 Simplify showing each material length individually 
CURA-1687
 2016-07-07 23:58:14 +02:00
fieldOfView
c4a2e659e3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 22:17:55 +02:00
fieldOfView
9c492342cb Show each material length individually 
CURA-1687
 2016-07-07 22:17:35 +02:00
Tim Kuipers
df780023ed JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:22:44 +02:00
Tim Kuipers
91082404be JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:18:46 +02:00
Tim Kuipers
4349f6c75b fix: make infill_mesh visible by default because it's the only setting which is only visible in the per-object settings menu which is not normally visible (CURA-833) 
Because it should never show up in the normal global/extruder settings tab, people might forget about this setting. It's one of the reasons per-object settings is awesome ^^.
 2016-07-07 21:18:25 +02:00
Tim Kuipers
d6c25fcd10 JSON feat: infill mesh (CURA-833) 2016-07-07 21:04:23 +02:00
fieldOfView
c36af13daf Fix PerObjectSettings, which were broken due to the material editing merge 
CURA-342
 2016-07-07 18:25:20 +02:00
fieldOfView
8d56d25a8e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 18:11:29 +02:00
fieldOfView
a774f06237 Hide checks if the printer is not connected, hide bed temperature if no bed is installed 
CURA-1385
 2016-07-07 17:54:43 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing 
Material Editing Support
 2016-07-07 17:34:57 +02:00
Arjen Hiemstra
6b9689c2c7 Use clearer styling of disabled entry fields on the materials page 
Contributes to CURA-342
 2016-07-07 17:32:49 +02:00
Arjen Hiemstra
7df5008d3c Disable spool weight etc. fields since they are not yet functional 
Contributes to CURA-342
 2016-07-07 17:32:11 +02:00
Arjen Hiemstra
975106b90e Also update description and adhesion info when they change 
Contributes to CURA-342
 2016-07-07 17:31:12 +02:00
Arjen Hiemstra
571523e0ef Ensure an XML material always has a description and adhesion_info metadata entry 
Contributes to CURA-342
 2016-07-07 17:30:39 +02:00
fieldOfView
66dd4a7a50 Add exception logging 
CURA-1385
 2016-07-07 17:08:03 +02:00
Jaime van Kessel
bea9f7590c Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 17:02:59 +02:00
Jaime van Kessel
0477955974 Sidebar stuff is now properly done in a loader (and in seperate files) 
CURA-1036
 2016-07-07 17:02:29 +02:00
Jack Ha
6374eee7b4 Fix LayerView cursor issue. 
CURA-1381
 2016-07-07 16:55:56 +02:00
Jack Ha
3e869048fd Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:23:53 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small. 
CURA-1671
 2016-07-07 16:23:27 +02:00
Jaime van Kessel
c38797b4fe Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:15:12 +02:00
Jaime van Kessel
a76f6375c7 Added way to stop the heating of bed / hotend in checkup 
CURA-1385
 2016-07-07 15:56:14 +02:00
Ghostkeeper
9d1ea28b49
Remove old commented-out code 
The function it calls no longer exists. The protobuf message it listens to was renamed and the renamed message is properly listened to in the line above.

Contributes to issue CURA-1687.
 2016-07-07 15:51:25 +02:00
Jaime van Kessel
67938b5739 Merge branch 'feature_versionupgrade' of github.com:Ultimaker/Cura 2016-07-07 15:42:08 +02:00
Ghostkeeper
8f5e56c66e
Make documentation specify filename without extension 
Contributes to issue CURA-844.
 2016-07-07 15:22:27 +02:00
Tim Kuipers
7fc37e7a74 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 15:18:57 +02:00
Tim Kuipers
101b22528b JSOn feat: nozzle startup prime location (CURA-1816) 2016-07-07 15:15:22 +02:00
Ghostkeeper
e6efba3868
Make version upgrade also translate file names 
This was required since Cura 2.1 produced files with the same filename (bar extension). This then resulted in two containers with the same ID. If you had bad luck, an instance container was chosen as global container (depending on which was first in the unordered dictionary). This gives the current settings the postfix _current_settings, fixing that issue.

Contributes to issue CURA-844.
 2016-07-07 15:13:58 +02:00
Ghostkeeper
1b0974ba9f Rename translation dicts to plural form 
This is more in line with the rest of the code.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
19b4ec655e Move some things to metadata section 
Why there is a difference between 'general' and 'metadata', only His Noodleness knows. Also put in a default for the type. It should apparently be 'quality' unless it is a user profile.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
8f34186a9b Rename settings section to values 
It should be called 'values' in the new version.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
b841738b76 Translate variants in profile 
Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
c50619e363 Add additional settings transformations since 2.1 
These should be all the settings that were changed since Cura 2.1.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
93041191c2 Move translateVariant to VersionUpgrade21to22 
Also make it a dictionary look-up, like the rest, instead of a series of if-statements.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
439629d0b5 Translate variants and machine names 
I'm not quite pleased with the variant translation being inside this function, so I'll move it to VersionUpgrade21to22 soon I think.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00