GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 03:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,405 Commits 295 Branches 268 Tags
Commit Graph

1330 Commits

Author SHA1 Message Date
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
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
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
Arjen Hiemstra
cd2cbcbd66 Only show changelog if we have a global container stack 
If we have no global stack we can assume this is a "first run"
situation.

Contributes to CURA-2519
 2016-10-05 14:59:03 +02:00
Jaime van Kessel
f24fd5660d Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-05 13:49:11 +02:00
Jaime van Kessel
e582607e41 Added todo comment 2016-10-05 13:48:09 +02:00
Ghostkeeper
6f412c0825
Improve translation context for some labels 
These translations went sort of wrong in the Turkish translation, because the context was unclear. I've tried to clarify it better.

Contributes to issue CURA-570.
 2016-10-05 11:39:29 +02:00
Ghostkeeper
7d57e90260
Remove debug statements 
Oops.

Contributes to issue CURA-844.
 2016-09-29 13:24:15 +02:00
Ghostkeeper
d29c817289
Actually apply translated settings 
Don't know when this changed or why it hasn't propped up until then...

Contributes to issue CURA-844.
 2016-09-29 11:56:46 +02:00
Jaime van Kessel
666cba0566 Merge branch 'master-CURA-1445' of https://github.com/thopiekar/Cura 2016-09-28 15:59:49 +02:00
Thomas Karl Pietrowski
df63b2d620 Merge remote-tracking branch 'refs/remotes/origin/master-CURA-1445' into master-CURA-1445 2016-09-27 15:40:16 +02:00
Thomas Karl Pietrowski
ca60e517fa Revert "SliceInfo: Defining container_serialized as empty, before trying to serialize" 
This reverts commit 1fd169c6697f268588733e7a6d65e80d587b51ab.
 2016-09-27 15:39:54 +02:00
Ghostkeeper
4ec380ffd9
Quality-changes now have a quality_type instead of referring to quality 
This field was just renamed, I think for CURA-2320. This updates the name for the upgrade process.

Contributes to issue CURA-844.
 2016-09-27 15:12:29 +02:00
Jaime van Kessel
960a390350 Ensure that the correct properties get set for writing profiles to g-code 
CURA-2462
 2016-09-27 14:05:56 +02:00
fieldOfView
cdba3640a0 Move showing eject success message until after the safe to remove message is hidden 
CURA-2341
 2016-09-26 16:10:57 +02:00
Jaime van Kessel
efd3fc3487 Added check to see if a SceneNode has vertices before adding it 
CURA-2460
 2016-09-26 13:13:31 +02:00
Jaime van Kessel
3f9024aeff Added selftest for all objects in 3mf file 
CURA-2460
 2016-09-26 13:03:45 +02:00
Jaime van Kessel
d7cf65258f Minor codestyle changes 2016-09-26 12:55:17 +02:00
Thomas Karl Pietrowski
10d2d7902e Updating the comment about the "settings" keyword 
Contributes to CURA-1445
 2016-09-24 10:19:26 +02:00
Thomas Karl Pietrowski
db6702fbbc CURA-1445: Sending bundle of serialized data 
After an discussion with the developers at YM, we decided to send all data in one keyword.
So now all data is bundled into a JSON dictionary, where "" is the global_container_stack and it's containers go into the same JSON, too, by using their IDs as keywords.
More on JIRA...

Contributes to CURA-1445

Includes/Fixes #1013
 2016-09-22 18:24:01 +02:00
Thomas Karl Pietrowski
1cda5ae163 Merge remote-tracking branch 'upstream/thopiekar-sliceinfo-hotfix' into master-CURA-1445 2016-09-22 18:14:29 +02:00
fieldOfView
1895cd7062 Fix layerview shade for single extrusion printers 
CURA-2025
 2016-09-22 17:16:08 +02:00
fieldOfView
c3d8b6fb8c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-22 16:52:41 +02:00
fieldOfView
e9d44a07cc Fix up layout of Per Model Settings panel 2016-09-22 16:52:29 +02:00