GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 07:04:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,419 Commits 289 Branches 260 Tags
Commit Graph

358 Commits

Author SHA1 Message Date
Ghostkeeper
a3c5435a1d
Remove support_tree_wall_thickness 
This setting will not be automatically translated to support_wall_thickness if it's overwritten, because that would require knowing the line width and we don't know that here. So it's hard to do.

Contributes to issue CURA-7077.
 2019-12-23 16:22:17 +01:00
Ghostkeeper
50f64ca696
Merge support_tree_wall_count into support_wall_count 
So now the two settings are used as one.

Contributes to issue CURA-7077.
 2019-12-23 16:22:17 +01:00
Ghostkeeper
dbda415bba
Make merged settings extensible 
This way it's:
- documented at the top of the file to make it easier to find all the changes, and
- easier to extend the list of merged settings.

Contributes to issue CURA-7077.
 2019-12-23 16:22:16 +01:00
Ghostkeeper
824dd59e76
Code style: Spaces around binary operators 2019-12-23 16:22:16 +01:00
Ghostkeeper
71a10a262a
Move documentation nearer to code it applies to 
Contributes to issue CURA-6522.
 2019-12-23 16:22:16 +01:00
Nino van Hooff
8aae5f7563 Fix: extra ConfigParsaer arg added to wrong call 
CURA-6522
 2019-12-10 16:33:47 +01:00
Jaime van Kessel
f66b1e6fde
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack 2019-12-10 13:06:37 +01:00
Nino van Hooff
b30b641034 Merge remote-tracking branch 'origin/CURA-6522_one_at_a_time_overlapping_build_area' into CURA-6522_one_at_a_time_overlapping_build_area 2019-12-04 14:28:48 +01:00
Nino van Hooff
e2db4e873d Add paramteter to Config Parser constructor to prevent comments in 
Gcode to be remnoved by upgrade, as in CURA-6994

CURA-6522
 2019-12-04 14:28:30 +01:00
Dimitriovski
74d919a5d2 Prevent deleting comments from Start/End G-codes by changing the comment_prefixes in ConfigParser 
CURA/6994
 2019-12-03 14:40:54 +01:00
Jaime van Kessel
50d72692d8
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_one_at_a_time_overlapping_build_area 2019-11-20 16:48:00 +01:00
Dimitriovski
94a5b5ef90 CURA-6522_one_at_a_time_overlapping_build_area 
Changed the setting_version to 11
 2019-11-19 15:27:17 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports 2019-11-08 13:38:42 +01:00
Jaime van Kessel
ad85e29c0a
Fix stupid identation issue 2019-11-04 13:11:46 +01:00
Jaime van Kessel
aa5b788b59
Fix issue with profiles getting added to non creality printers in upgrade 2019-11-04 11:30:48 +01:00
Ghostkeeper
eaedca1917
Convert unit of adaptive layers threshold and change name 
This usage is hopefully more intuitive than the previous one.
 2019-11-01 11:54:17 +01:00
Nino van Hooff
88b3a2506d Version Upgrade 44 to 45 
Includes test for changes made in CURA-6522

CURA-6522
 2019-11-01 09:58:47 +01:00
ninovanhooff
9beea85482
Merge pull request #6566 from Ultimaker/CURA-6858_increase_sdk_ver_7_0 
Change SDK version to 7.0.0
 2019-10-23 11:54:49 +02:00
Lipu Fei
66005f28f3 Fix typo in removing Alternate Skin Rotations 2019-10-22 15:00:51 +02:00
Ghostkeeper
cb9b385a85
Remove Alternate Skin Rotations setting 
It's been replaced completely by the Top/Bottom Line Directions setting.
 2019-10-22 13:46:42 +02:00
Nino van Hooff
c62ff262ed Change SDK version to 7.0.0 
CURA-6858
 2019-10-21 14:51:34 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Lipu Fei
1977a865f1 Fix HMS434 version upgrade 
CURA-6774
 2019-09-24 11:05:52 +02:00
Lipu Fei
18d93d0b7b Fix UM2 extended variants 
CURA-6775
 2019-09-23 10:43:58 +02:00
Lipu Fei
d8b59c4471 Fix renamed um2 nozzles 
CURA-6599
 2019-09-19 14:26:01 +02:00
Ghostkeeper
5617784b48
Implement version upgrade for UM2 with Olsson 
Contributes to issue CURA-6775.
 2019-09-16 15:38:01 +02:00
Lipu Fei
bbde75491d Fix version number in upgrade from 4.1 to 4.2 2019-09-13 10:52:41 +02:00
Lipu Fei
fa8213c601 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-13 10:31:11 +02:00
Jaime van Kessel
febe953226
Don't assert if there are already 7 containers in stack 
CURA-6599

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2019-09-13 09:29:49 +02:00
Diego Prado Gesto
d38e60ce06 Merge branch 'master' into feature_intent 2019-09-13 09:02:30 +02:00
Jaime van Kessel
06103b98d5
Ensure that quality_changes get their intent_category set in upgrade 
CURA-6599
 2019-09-12 10:30:16 +02:00
Jaime van Kessel
d6d06fb85b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-10 15:07:57 +02:00
Lipu Fei
87285f6b86 Fix version upgrade 42 to 43 2019-09-10 12:22:16 +02:00
Jaime van Kessel
7d8911b74d
Fix version upgrade for stacks 
CURA-6599
 2019-09-10 11:41:42 +02:00
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Jaime van Kessel
e9862fb348
Move version upgrade for intents from 4.1-4.2 to 4.3-4.4 
CURA-6599
 2019-09-10 10:57:25 +02:00
Jaime van Kessel
87e0b8629a Add convenience script for running complete coverage 2019-08-30 16:32:11 +02:00
Jaime van Kessel
1d9d411732 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-08-27 14:17:57 +02:00
Lipu Fei
4feb22e065 Fix version upgrade for imade3d jellybox 
CURA-6709
 2019-08-15 13:37:04 +02:00
Ghostkeeper
20201c65e6
Merge branch 'master' into feature_intent 
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
 2019-08-13 14:43:28 +02:00
Lipu Fei
b65482e992 Fix typing 2019-08-12 12:22:57 +02:00
Lipu Fei
5804110c15
Merge pull request #4598 from DesktopMetal/feature_support_line_directions 
Feature: "Support Infill/Interface Line Directions"
 2019-08-12 10:47:08 +02:00
Lipu Fei
3a10345c01
Fix version upgrade 2019-08-12 10:37:00 +02:00
Vlad Gribinchuk
6f3eea3c2c Adjust VersionUpgrade to update support_infill_angle 2019-08-01 11:41:50 +03:00
Ghostkeeper
52f5a1f8bc
Merge branch '4.2' 2019-07-31 14:34:25 +02:00
Ghostkeeper
e5ebbdd62f
Remove debugging statements 
Contributes to issue CURA-6696.
 2019-07-31 14:34:07 +02:00
Ghostkeeper
ce8fdca938
Merge branch '4.2' 2019-07-31 14:23:23 +02:00
Ghostkeeper
65b28f228b
Fix missing comma 
Otherwise it would concatenate the two strings, leading to both of them effectively missing from the set.
 2019-07-31 14:22:23 +02:00
Ghostkeeper
5cf4cd03cf
Fix importing profiles for CR10s 
It was somehow missing from this list. An oversight.

Fixes #6083.
 2019-07-31 14:18:44 +02:00
Ghostkeeper
846cbe79a3
Rename Orthogonal to Orthographic everywhere 2019-07-30 17:35:40 +02:00