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

5951 Commits

Author SHA1 Message Date
Jaime van Kessel
e1ebd3e225 3mf files are now placed in their own worldspace 
CURA-382
 2016-10-28 13:01:21 +02:00
Jaime van Kessel
28eb4297c6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-28 11:38:13 +02:00
Jaime van Kessel
db0fb0c652 Compatible metadata entry is now correctly set for each variant & machine 
CURA-2821
 2016-10-28 11:37:09 +02:00
Jaime van Kessel
a7f8adb80a Handles now correctly hide selection aura when in x-ray mode 
USL-33
 2016-10-27 20:14:39 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Arjen Hiemstra
e0b926878f Remove code that sets incompatible materials to invalid type 
Instead use the "compatible" metadata entry like we do for nozzles.

Setting the type differently caused all code that looks for materials to
fail because "incompatible_material" is not "material". Since this is
the base file, this meant a lot of materials failed to duplicate
properly which caused crashes.

Contributes to CURA-2821
 2016-10-27 15:45:29 +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
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
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
448d7d890c Merge branch '2.3' 
* 2.3:
  Set encoding to utf-8 when writing files
  Remove manually specified utf-8 encoding
  SettingInstanceManager now also watches containerchanged of extruder stacks
 2016-10-24 14:30:22 +02:00
Arjen Hiemstra
bfec96f584 Set encoding to utf-8 when writing files 
Since we assume utf-8 in a lot of places.

Contributes to CURA-2692
 2016-10-24 14:28:20 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Ghostkeeper
9c4f8ab8fb
Update change log 
This is what we have for 2.3.1 so far.

Contributes to issue CURA-2755.
 2016-10-21 14:59:41 +02:00
Jack Ha
d308cd45bc Moved function out of MachineManager, changed "Valid" to "HaveErrors". 
CURA-2730
 2016-10-20 16:16:33 +02:00
Ghostkeeper
3c9ebfab8f
Merge branch '2.3' 
Conflicts:
	resources/definitions/fdmprinter.def.json
	resources/materials/generic_abs.xml.fdm_material
	resources/materials/generic_cpe.xml.fdm_material
	resources/materials/generic_nylon.xml.fdm_material
	resources/materials/generic_pla.xml.fdm_material
	resources/materials/ultimaker_abs_black.xml.fdm_material
	resources/materials/ultimaker_abs_blue.xml.fdm_material
	resources/materials/ultimaker_abs_green.xml.fdm_material
	resources/materials/ultimaker_abs_grey.xml.fdm_material
	resources/materials/ultimaker_abs_orange.xml.fdm_material
	resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material
	resources/materials/ultimaker_abs_red.xml.fdm_material
	resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_abs_white.xml.fdm_material
	resources/materials/ultimaker_abs_yellow.xml.fdm_material
	resources/materials/ultimaker_cpe_black.xml.fdm_material
	resources/materials/ultimaker_cpe_blue.xml.fdm_material
	resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_green.xml.fdm_material
	resources/materials/ultimaker_cpe_light-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_red.xml.fdm_material
	resources/materials/ultimaker_cpe_transparent.xml.fdm_material
	resources/materials/ultimaker_cpe_white.xml.fdm_material
	resources/materials/ultimaker_cpe_yellow.xml.fdm_material
	resources/materials/ultimaker_nylon_black.xml.fdm_material
	resources/materials/ultimaker_nylon_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_black.xml.fdm_material
	resources/materials/ultimaker_pla_blue.xml.fdm_material
	resources/materials/ultimaker_pla_green.xml.fdm_material
	resources/materials/ultimaker_pla_magenta.xml.fdm_material
	resources/materials/ultimaker_pla_orange.xml.fdm_material
	resources/materials/ultimaker_pla_pearl-white.xml.fdm_material
	resources/materials/ultimaker_pla_red.xml.fdm_material
	resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_pla_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_white.xml.fdm_material
	resources/materials/ultimaker_pla_yellow.xml.fdm_material

Contributes to issue CURA-2737.
 2016-10-20 12:41:31 +02:00
Jack Ha
98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 2016-10-19 15:46:22 +02:00
Jack Ha
a030b5bfc3 Fix gcode profile. CURA-2718 2016-10-18 10:26:02 +02:00
Jack Ha
0511906263 Revert "Fix gcode profile. CURA-2718" 
This reverts commit deb360642984cdd6ffa2b13cc182e9d1dfd9855e.
 2016-10-18 10:18:06 +02:00
Jack Ha
deb3606429 Fix gcode profile. CURA-2718 2016-10-18 09:55:45 +02:00
Ghostkeeper
96e516c676
Allow for saving multiple scene nodes at the same time 
The selection saving saves the entire current selection and their child nodes.

Contributes to issue CURA-2617.
 2016-10-17 15:53:33 +02:00
Ghostkeeper
b3e3053323
Move automatic file name generating to separate function 
This will make it easier to have multiple nodes here in the future. I'll have to modify this function for that, but I'll do that in a separate commit.

Contributes to issue CURA-2617.
 2016-10-17 15:53:33 +02:00
Jaime van Kessel
87fc0db543 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 13:16:21 +02:00
Ghostkeeper
4769b22138
Sort profiles on extruder position before exporting 
In the importer the extruders are sorted on extruder position. In the exporter they need to be in the same order.

Contributes to issue CURA-2655.
 2016-10-14 11:46:39 +02:00
Ghostkeeper
fcb88f06ab
Fix typo in incompatibility warning message 
This is the actual fix that we couldn't do due to the string freeze.

Contributes to issue CURA-2626.
 2016-10-12 16:18:54 +02:00
Jack Ha
3f6877d2ec Keep per object extruder when switching machines. CURA-2533 2016-10-12 13:58:09 +02:00
Jack Ha
d45f61f778 Comment. CURA-2605 2016-10-11 15:13:16 +02:00
Jack Ha
b119be7d11 Remove settings from extruder that are not settable_per_extruder. CURA-2605 2016-10-11 15:00:17 +02:00
fieldOfView
15a870c050 Add some documentation 
CURA-2544
 2016-10-11 13:39:44 +02:00
fieldOfView
7e99fcc5d7 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-11 13:35:04 +02:00
fieldOfView
d04e6a6644 Use buffered writing for writing gcode to removable drives 
GCode files are still written line by line, but python is instructed to use buffering. This greatly decreases the total time required to write large(ish) files to USB drives, while having minimal impact on memory use.

CURA-2544
 2016-10-11 13:34:48 +02:00
Tim Kuipers
311ebdc3ba fix: changelog clarity improvements suggested by nickthetait (CURA-2000) 2016-10-11 11:35:20 +02:00
Tim Kuipers
3b38d52c75 fix: changelog bugfixes formatting (CURA-2000) 2016-10-11 11:22:16 +02:00
fieldOfView
472ba7ed26 Fix exporting materials for machines other than those in the product_id_map 
CURA-2583
 2016-10-10 14:34:53 +02:00
fieldOfView
59457ad326 Corrections suggested by @bagelorb 
CURA-2000
 2016-10-07 19:56:52 +02:00
Jaime van Kessel
8ac7558677 Apply transformation again 
CURA-382
 2016-10-07 14:31:48 +02:00
Jaime van Kessel
47870f43ef Groups with just a single item are now discarded 
CURA-382
 2016-10-07 13:51:53 +02:00
Jaime van Kessel
7c59f8f2f2 Multiple objects are now handled with right transformation 2016-10-07 12:51:51 +02:00
Jaime van Kessel
7d28f5cdf1 3mf reader now uses correct origin 2016-10-07 09:23:26 +02:00
Jaime van Kessel
39623ba2b8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 13:50:18 +02:00
Ghostkeeper
2d41a992f1
Remove splitting profiles for each material 
The material is no longer listed in the profiles and no longer filtered for, so we don't need to create a new profile for each material.

Contributes to issues CURA-844 and CURA-2320.
 2016-10-06 11:41:39 +02:00
Jaime van Kessel
dadcf45f45 Added extra checks & logging to 3mf reader 
CURA-382
 2016-10-06 10:44:38 +02:00
Arjen Hiemstra
9a0946687b Clean up styling of Changelog dialog 
This prevents the button from being positioned on top of the scroll bar
and the horizontal scrollbar from showing.

Contributes to CURA-2519
 2016-10-05 14:59:03 +02:00