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

10639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
eb88ad5a3d Change mode to 0644 for all quality files 
CURA-3975
 2017-07-06 13:38:39 +02:00
Lipu Fei
4727e4aa95 Remove unused imports 
CURA-3975
 2017-07-06 12:13:30 +02:00
Lipu Fei
4e3ff1b770 Fix version upgrade for 2.5 to 2.6 
CURA-3975

- Preferences version is not set correctly
- The upgrade script should use a standalone version string because the
  CuraApplication.SettingVersion can change
 2017-07-06 12:11:28 +02:00
Lipu Fei
ead94a8456 Cura should register actual stack MIME types instead of the generic Uranium stack type 
CURA-3975

When the ContainerRegister loads all container files, it decides which
actual class to use based on the registered MIME type of that file.
Because Cura registers the GlobalStack and ExtruderStack files as the
generic Uranium MIME type, the register loads them as Uranium
ContainerStacks. This commit solves this problem.
 2017-07-06 11:30:05 +02:00
Jaime van Kessel
cd7c8bb753 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-06 10:46:59 +02:00
Jaime van Kessel
95cacb8300 Added missing translate to topbar 2017-07-06 10:46:29 +02:00
Lipu Fei
c196a4bf00 Fix stack file version number in VersionUpgrade26to27 
CURA-3975
 2017-07-06 10:42:26 +02:00
Lipu Fei
3d48024a47 Override getConfigurationTypeFromSerialized for GlobalStack 
CURA-3975

GlobalStack has metadata type "machine", which is different from what is
registered in the VersionUpgradeManager "machine_stack". This commit
makes sure that Cura can find the correct upgrade route for the
GlobalStack files.
 2017-07-06 10:26:02 +02:00
Lipu Fei
42858b4715 Add upgrade script for 2.6 to 2.7 to rename quality profiles 
CURA-3975
 2017-07-06 10:26:02 +02:00
Lipu Fei
16a078b9a6 Update SettingVersion to 2 for renaming the quality profiles 
CURA-3975

Update SettingVersion to 2 so we can create an upgrade to rename the
quality profiles.
 2017-07-06 10:25:51 +02:00
Lipu Fei
afb923401e Set versions correctly for container stacks and preferences 
CURA-3975

The upgrade for machine and extruder stacks and the preferences files
don't work because the current version registering doesn't take into
account the 1000000 multiplier and the settings_version.
 2017-07-06 10:25:50 +02:00
Lipu Fei
2cab097716 Rename "Not Supported" quality files 
CURA-3975

Rename quality profiles with name "Not Supported" to have actual quality
names. Note that the "Not Supported" only ones are renamed to "Fast_Print".
 2017-07-06 10:25:31 +02:00
Ghostkeeper
6cac15de7d
Use default parameter to obtain default colour 
There is a built-in mechanism for this, so we don't need to do this ourselves.
 2017-07-06 09:48:36 +02:00
Ghostkeeper
bb68f488db
Make material finding more robust 
The .findContainer technique is obsolete since we now just have a field for this.

Hopefully contributes to issue #2053.
 2017-07-06 09:41:28 +02:00
Mark Burton
8955249ea9 Change gcode flavor labels to make it obvious which firmwares they are targetting. 
Rename "RepRap (Marlin/Sprinter)" to "Marlin".
Rename "RepRap (Volumetric)" to "Marlin (Volumetric)".
Rename "RepRap (RepRap)" to "RepRap".
 2017-07-06 08:24:23 +01:00
Ghostkeeper
271d4a30f0
Set Support Z Distance equal to what it's at for UM3 
The old value was giving a warning and the new value was better tested for UM3. We knew that this was sorta wrong. Suggested by the materials team.
 2017-07-05 16:22:24 +02:00
Ghostkeeper
9dd3527504
Blur setting text fields when clicking buttons 
Otherwise the setting is not applied yet by the time you duplicate or export a profile.

Contributes to issue CURA-4011.
 2017-07-05 16:04:11 +02:00
Mark Burton
f81be9e627 Added RepRap (RepRap) gcode flavor. 2017-07-05 14:46:12 +01:00
Jaime van Kessel
0ad7096782 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-05 14:48:19 +02:00
Jaime van Kessel
ef51897b71 Fixed removable drive error spam on Windows 2017-07-05 14:48:02 +02:00
Tim Kuipers
7ff6857041 Merge pull request #1995 from smartavionics/mb-z-seam-relative 
Added z_seam_relative setting to determine whether z seam origin is relative to part or not.
(CURA-3971)
 2017-07-05 12:30:17 +02:00
Jaime van Kessel
289c9ed8ee Network printing now sees empty state as idle 2017-07-05 11:00:00 +02:00
Jaime van Kessel
84b522a4c8 Merge branch 'feature_pointing_rectangle_borders' of https://github.com/fieldOfView/Cura 2017-07-05 10:22:54 +02:00
Lipu Fei
b43a09d773 Merge pull request #2064 from Ultimaker/feature_top_navigation_bar 
Feature top navigation bar
 2017-07-04 15:46:03 +02:00
MaukCC
a7e9dc06f0 Merge pull request #7 from maukcc/cura/Cura/master 
Cartesio profiles update
 2017-07-04 15:01:51 +02:00
maukcc
194d7bb3b8 Cartesio profiles update 
Cartesio disalowed areas
Cartesio extruder offsets
Cartesio high quality profiles
 2017-07-04 14:58:01 +02:00
Ghostkeeper
b3691d0e5c Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-04 14:07:03 +02:00
Ghostkeeper
b66f9a0da4
Invert enabled condition on spaghetti_infill_stepped 
These two settings are only relevant if the spaghetti infill is stepped, not when it's not stepped.

Contributes to issue CURA-3861.
 2017-07-04 13:50:19 +02:00
Lipu Fei
19495de7e8 Fix machine_nozzle_offset_y value 
CURA-3964

This is such an obvious bug...
 2017-07-04 13:24:14 +02:00
Lipu Fei
d0ef97b02c Remove invalid anchoring for SidebarHeader 
CURA-3964

sidebarHeaderBar has been removed and the anchor line is not needed.
 2017-07-04 13:06:41 +02:00
Ghostkeeper
d3fc47fb42
Remove nonsensical warning values for prime tower position 
I discovered this during work on CURA-3521.
 2017-07-04 12:36:18 +02:00
Ghostkeeper
88ee878423
Simplify inheritance formula for prime tower wall thickness 
Firstly, all the resolveOrValue calls are identity functions now so they can be phased out.

Secondly, all the max(extruderValues(...)) should be done by the resolve property rather than the value property. The resolve property already makes sure that the prime tower is evenly thick for every extruder, so it doesn't need to ensure this in the value function as well.

Contributes to issue CURA-3521.
 2017-07-04 12:33:19 +02:00
Jaime van Kessel
1627a65513 Viewport overlay now shows correctly when switching between monitor & settings 
CURA-3964
 2017-07-04 11:58:04 +02:00
Jaime van Kessel
5fa2ba6052 Undo for material diameter also changes the property. 
It used to only set the metadata. CURA-2822
 2017-07-04 11:55:24 +02:00
Lipu Fei
b2a263b2db Enable support_infill_sparse_thickness when support is enabled 
CURA-2724
 2017-07-04 11:38:56 +02:00
Arjen Hiemstra
ec25164731 Cleanup monitoringPrint stuff by properly passing things as properties 
Instead of relying on the property magically being propagated from the
root object, which causes crashes.

Contributes to CURA-3964
 2017-07-04 11:37:04 +02:00
Mark Burton
ff4935011d Tweak description. 2017-07-04 10:36:45 +01:00
Jaime van Kessel
3ee72a5393 Fixed sending wrong setting for bed adhesion 
CURA-3858
 2017-07-04 10:19:11 +02:00
Jaime van Kessel
1b6152b793 Send print times & extruders as string 
CURA-3858
 2017-07-04 09:44:09 +02:00
Jaime van Kessel
5895f27792 Revert "Also invert nozzle offset when offsetting machine-specified disallowed areas" 
This reverts commit 319559740dd8c8c2f9ffad637bee43cef9345073.

This was already fixed (line 734 inveted it). This code breaks it when there is no extruder
 2017-07-03 17:10:59 +02:00
Jaime van Kessel
edeb2fa787 Merge branch 'master' of github.com:Ultimaker/Cura into feature_top_navigation_bar 2017-07-03 16:40:47 +02:00
Lipu Fei
68cae135a9 Make outer wall line width to evaluate its value accroding to its extruder 
CURA-3891

This commit fixes the problem that limit to extruder for outer wall
doesn't work.
 2017-07-03 16:19:10 +02:00
Jaime van Kessel
680cceb6f5 Switching to monitor tab now shows the correct sidebar again 
CURA-3964
 2017-07-03 16:12:19 +02:00
fieldOfView
5fec3d4f6d Replace mock borders with true borders 2017-07-03 16:04:18 +02:00
Jaime van Kessel
7e07482dec Added topbar to Cura 
CURA-3964
 2017-07-03 15:44:42 +02:00
Mark
8a55469499 Revert "Add margins to buttons and progressBar so they align" 
This reverts commit 8776cedd278ab0830f4f621d013e7ef75efbb9d1.
 2017-07-03 14:49:26 +02:00
Mark
8776cedd27 Add margins to buttons and progressBar so they align 
CURA-3856
 2017-07-03 14:46:31 +02:00
Jaime van Kessel
a1413e8162 Added active mode to sliceinfo 
CURA-3858
 2017-07-03 13:18:23 +02:00
Jaime van Kessel
d69736ac34 Filter \n from transformation string 
CURA-3858
 2017-07-03 13:13:42 +02:00
Jaime van Kessel
1682348629 Send data to new server 
CURA-3858
 2017-07-03 13:10:17 +02:00