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

5521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff 
CURA-2826
 2016-10-27 14:26:43 +02:00
Ghostkeeper
b6464b12a1
Ignore externally loaded plug-ins 
We include these plug-ins with the build system, but for development it's easy to have them linked or copied into the plug-ins folder. But don't commit them! So here we ignore these plug-ins.
 2016-10-27 13:14:13 +02:00
Jaime van Kessel
4a5d7cbc73 Bindings of inheritance icon now correctly update when switching between machines 
CURA-2752
 2016-10-27 13:08:10 +02:00
Jaime van Kessel
b381186331 Set um2+ height to same as um2 2016-10-27 13:02:38 +02:00
fieldOfView
740ce1fa0b Fix errors when switching from UM3 to UM2. 2016-10-27 11:34:13 +02:00
Jaime van Kessel
4085404ed7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-27 11:33:44 +02:00
Ghostkeeper
4759bccdb8
Update translation templates after merging secret plug-ins 
The UM3 Network Printing plug-in was secret because the UM3 wasn't released yet. This update contains all texts to be translated as of this writing.
 2016-10-27 11:31:07 +02:00
Jaime van Kessel
e27be7fc4b Travel_avoid_distance and support_offset are only taken into account if respecive feature is active 
We used to always add them, but now we check if support_enable and travel_avoid_other_parts are enabled
CURA-2823
 2016-10-27 09:59:29 +02:00
fieldOfView
3cdf65d36d Fix errors when switching from UM3 to UM2. 2016-10-26 22:58:59 +02:00
Ghostkeeper
51263da2e4
Added new fixes for version 2.3.1 
These are the latest fixes that will be included in 2.3.1. Not all of these are entirely complete yet as of this writing. These are only the fixes that are worth mentioning in a change log.

Contributes to issue CURA-2755.
 2016-10-26 16:06:43 +02:00
Ghostkeeper
58df52ffed
Remove unimportant bugfix 
This tweak is so small that it isn't worth even mentioning in the change log.

Contributes to issue CURA-2755.
 2016-10-26 16:02:18 +02:00
Ghostkeeper
a61ff7b2df
Reorder items in change log of 2.3.0 
This order is closer to what's on the website of Ultimaker, and more closely reflects the relative importance of these features. No 1:1 matching is possible with the website though.

Contributes to issue CURA-2755.
 2016-10-26 16:00:27 +02:00
Ghostkeeper
dfb557eb41
Correct change log of version 2.3.0 
This is now updated with all that's on the website. In many cases, the wording of the Ultimaker website is also chosen, unless that wording was only to make it fit better within the style of that website.

Contributes to issue CURA-2755.
 2016-10-26 16:00:27 +02:00
Ghostkeeper
49603e2f18
Fix spelling 
Thesearetwowordssotheymusthaveaspacebetweenthem.

Contributes to issue CURA-2755.
 2016-10-26 16:00:27 +02:00
Jaime van Kessel
f35914299b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 15:44:19 +02:00
Jaime van Kessel
02d6b20b34 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-26 15:44:05 +02:00
Jaime van Kessel
a8486f88d7 Inheritance icon is correctly shown for single extrusion printers if setting has limit_to_extruder property 
CURA-2752
 2016-10-26 15:43:26 +02:00
Ghostkeeper
07e7521792
Fix spelling mistake 
This is not a bijvoeglijk naamwoord, so it must not get an E at the end.

Contributes to issue CURA-2751.
 2016-10-26 13:41:23 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Ghostkeeper
8da87a2996 Merge branch 'feature_show_origin' of https://github.com/fieldOfView/Cura into fieldOfView-feature_show_origin 2016-10-26 11:37:32 +02:00
Ghostkeeper
53a4e5e6c0
Remove infill_overlap_mm from Nylon profiles 
This is the result of this week's profile updates from our material tests.
 2016-10-26 11:15:14 +02:00
Ghostkeeper
2edcf36a83
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-26 10:52:49 +02:00
Simon Edwards
cc33b3be22 Change for the "Advanced" tab to "Custom". 
CURA-2751 Change settings label "Simple" to "Recommended"
 2016-10-26 10:43:00 +02:00
Ghostkeeper
6c3b4b7f29
Prevent race condition before global container stack is made 
Just properly check if there is a global container stack.
 2016-10-26 09:50:42 +02:00
Ghostkeeper
861837ef41 Make generic quality profiles global 
This way they will also be put in the global profile.

Contributes to issue CURA-2723.
 2016-10-26 09:43:11 +02:00
fieldOfView
55191b722a Codestyle & documentation 2016-10-25 23:06:23 +02:00
fieldOfView
fef15c706f Render an indication of the origin of the machine 2016-10-25 22:51:44 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Ghostkeeper
f72e6be10e Fix setting the quality_type of imported profile 
The metadata entry was renamed a while ago.

Contributes to issue CURA-2785.
 2016-10-25 16:36:26 +02:00
Ghostkeeper
623f9cb4fc Abort importing profile if we have no global container stack 
You shouldn't be able to trigger it anyway, but if you do, it'll give a proper error that the import failed.

Contributes to issue CURA-2785.
 2016-10-25 16:36:17 +02:00
Ghostkeeper
7e5ffe79b6 Cache global container stack 
We'll need it multiple times. Could be a bit faster.

Contributes to issue CURA-2785.
 2016-10-25 16:36:07 +02:00
Jaime van Kessel
b4339bda0e Fixed logger isuse with importing profile 
CURA-2785
 2016-10-25 16:26:52 +02:00
Arjen Hiemstra
30e14478af Replace quality profiles with optimised versions of Ruben's script 
With the global quality profiles merged this now works properly.

CURA-2645
 2016-10-25 15:40:52 +02:00
Ghostkeeper
aef0880a1f
Fix setting the quality_type of imported profile 
The metadata entry was renamed a while ago.

Contributes to issue CURA-2785.
 2016-10-25 13:24:56 +02:00
Ghostkeeper
d439015773
Abort importing profile if we have no global container stack 
You shouldn't be able to trigger it anyway, but if you do, it'll give a proper error that the import failed.

Contributes to issue CURA-2785.
 2016-10-25 13:20:02 +02:00
Ghostkeeper
06521d7c49
Cache global container stack 
We'll need it multiple times. Could be a bit faster.

Contributes to issue CURA-2785.
 2016-10-25 13:16:41 +02:00
Arjen Hiemstra
b0d6d7034a Ensure we re-evaluate the inheritance icon binding when it changes 
Contributes to CURA-2752
 2016-10-25 13:11:04 +02:00
Ghostkeeper
35f43df2f6
Make generic quality profiles global 
This way they will also be put in the global profile.

Contributes to issue CURA-2723.
 2016-10-25 13:06:42 +02:00
fieldOfView
29b357894d Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-25 11:57:15 +02:00
Jaime van Kessel
a3ff918dde Merge pull request #1075 from fieldOfView/fix_um2_start_gcode 
Fix homing UM2/UM2+ when printing with RepRap flavor
 2016-10-25 11:56:34 +02:00
Ghostkeeper
e3ae3d50f9
Merge branch '2.3' 2016-10-25 11:50:20 +02:00
Arjen Hiemstra
bef3666a88 Still show the inherit button even when the revert is visible 
It was not a bug like I assumed

Contributes to CURA-2752
 2016-10-25 11:40:05 +02:00
Ghostkeeper
e6c68bcdc9
Add fallback if no unit is known for layer_height 
If there is no unit known, it is interpreted as there being no unit. There is currently mm, but if we changed that it is probably on purpose so we write no unit.

Contributes to issue CURA-2723.
 2016-10-25 11:28:41 +02:00
Jaime van Kessel
844b9729f4 Fixed critical errors when first adding UM3 2016-10-25 11:16:54 +02:00
Jaime van Kessel
ecbe4b264a Added handling for key not found in extruder map 2016-10-25 11:02:41 +02:00
Ghostkeeper
3e3e6e6b1b
Fix call to _configureProfile 
The footprint of the function changed, but the call wasn't updated, apparently. I pulled new_name up from one of the if-statements since they need to be computed for both branches now (and they are the same).

Contributes to issue CURA-2785.
 2016-10-24 17:39:36 +02:00
Arjen Hiemstra
aed23ca17e Merge branch '2.3' 
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
 2016-10-24 17:10:41 +02:00
Arjen Hiemstra
8ce81fec9f Expand logic for showing the inherit button in SettingItem 
Hide it if the revert button is visible and make the overrides check
limit_to_extruder in addition to the active stack.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
Arjen Hiemstra
bdaa4a5a6d Add a method to get overrides for a specified (extruder)stack 
Since the main getOverrides method only accounts for the active extruder
and we sometimes need to check other extruders in case of
limit_to_extruder.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
Jaime van Kessel
b718109f72 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-24 15:33:33 +02:00