GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 12:58:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,489 Commits 290 Branches 260 Tags
Commit Graph

2489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
db7777a6e7 Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well 
Tool hint is now a child of Toolbar.qml, where it fits with the tools for which it is useful.

CURA-1014
 2016-04-12 17:09:32 +02:00
Jaime van Kessel
6dd0a0d61a Added printer specific output device 
CURA-1339
 2016-04-12 16:45:58 +02:00
Ghostkeeper
7cc31c3d2e Update translations 
Updates the translations with the updated strings. Made by Bothof.

Contributes to issue CURA-1190.
 2016-04-12 16:34:45 +02:00
Arjen Hiemstra
4253a3f9ef Round convex hull data to 0.1mm, then remove duplicates 
This greatly reduces convex hull complexity while at the same
time not introducing much error into the convex hull. This keeps
things responsive when dealing with more complex models.

Contributes to CURA-1387
 2016-04-12 15:40:10 +02:00
Jaime van Kessel
63eb1793ad Renaming USBPrinterConnection 
CURA-1339
 2016-04-12 15:15:02 +02:00
fieldOfView
6e1265a822 Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX 
Without these additions, windows (preferences, wizards, about) open larger than fullscreen, making some controls inaccessible

Fixes CURA-504
 2016-04-12 10:23:43 +02:00
fieldOfView
967c062357 Fix import error starting up with an empty profile 
CURA-1376
 2016-04-12 07:41:42 +02:00
fieldOfView
a862f29794 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-11 20:59:45 +02:00
fieldOfView
0259457d2e Prevent overly long names for printers and profiles 
Contributes to CURA-1342
 2016-04-11 20:58:53 +02:00
Tim Kuipers
a57125292d JSON fix: syntax mistake 2016-04-11 19:10:16 +02:00
Tim Kuipers
3c919e9652 Revert "JSOn/profiles: changed infill overlap to mm (CURA-786)" 
This reverts commit 24f1726585781b74838952691c98973c4bf6fb16.
 2016-04-11 19:04:36 +02:00
Tim Kuipers
59f5bcb1cd feat: infill overlap in mm (besides %) (CURA-786) 2016-04-11 18:57:37 +02:00
Tim Kuipers
de64e812ff removed old duplicate profiles introduced by rename and merge (CURA-1349) 2016-04-11 18:51:06 +02:00
Tim Kuipers
a144a51da4 Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura 
This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349
 2016-04-11 18:50:41 +02:00
Arjen Hiemstra
d5bf9b3733 Merge branch '2.1' 
* 2.1:
  Do not round convex hull points to nearest int
  Use fdmprinter.json If we have no active machine instead of returning None
  JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374)
 2016-04-11 15:40:36 +02:00
Arjen Hiemstra
51c4e277ae Do not round convex hull points to nearest int 
This might have made sense when convex hulls were not recalculated on
transformation changes but as it is now, we want to be able to specify
0.5 as a valid point for a convex hull.

Contributes to CURA-435
 2016-04-11 15:30:27 +02:00
Arjen Hiemstra
cdb235740d Use fdmprinter.json If we have no active machine instead of returning None 
This prevents issues where backend creation would end up in an infinite
loop while there was no active machine.

Contributes to CURA-1376
 2016-04-11 13:01:03 +02:00
Arjen Hiemstra
6896fbf93a Re-add CuraVersion.py.in which got deleted in 97d16ae3 
It is required for the build to work as the file gets processed to
include the proper version.
 2016-04-11 12:06:27 +02:00
Simon Edwards
8fad56c1f4 Revert a number of Settings names changes after code review. 
CURA-1177
 2016-04-11 11:13:20 +02:00
Tim Kuipers
e28bed6006 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 16:43:18 +02:00
Jaime van Kessel
14edc8aac8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-08 15:07:46 +02:00
Jaime van Kessel
63593ba16c Moved layerData & polygon to own file 2016-04-08 15:07:07 +02:00
Jaime van Kessel
dc1630c268 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-08 15:02:30 +02:00
Tim Kuipers
2ccdf674c8 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 14:34:36 +02:00
Jaime van Kessel
97d16ae3bd Update documentation & code cleanup 2016-04-08 14:26:28 +02:00
ckielstra
4c233e75f4 Spelling 2016-04-08 11:06:24 +02:00
Jaime van Kessel
bc0d8818cf Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-08 09:59:35 +02:00
Jaime van Kessel
e034e3f9e1 Extra hull area now matches the assumptions in the rest of the code 
It's now also correct according to the original documentation.
CURA-435
 2016-04-08 09:58:34 +02:00
ckielstra
75d3a13659 Spelling 2016-04-08 09:51:46 +02:00
fieldOfView
27e3f8b33f Fix color of some texts on Linux with dark theme 
Use Label{} instead of Text{}

CURA-1143
 2016-04-07 18:57:11 +02:00
fieldOfView
9fe3eb4f01 Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX 
Without these additions, windows (preferences, wizards, about) open larger than fullscreen, making some controls inaccessible

Fixes CURA-504
 2016-04-07 18:06:38 +02:00
Jaime van Kessel
24950627dc Removable drives with any name are now accepted by OSX 
I have no idea why the old plugin only accepted drives with the name
"MASS STORAGE DEVICE", but it now simply lists all removable drives

CURA-1365
 2016-04-07 13:31:20 +02:00
Jaime van Kessel
b62c890bfa Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-06 17:24:40 +02:00
Jaime van Kessel
c176c608d7 Added extra mm to UM2+ lower right disallowed area 
CURA-1166
 2016-04-06 17:23:11 +02:00
Ghostkeeper
3a478dac12
Fix inaccuracy in change log 
You can't actually set a profile per object. You can set settings per object.

Contributes to issue CURA-1326.
 2016-04-06 16:47:21 +02:00
Jaime van Kessel
34b0d051fb Updated changelog for 2.1 release 
CURA-1326
 2016-04-06 15:02:49 +02:00
Ghostkeeper
db173f1347 Add more speed limits 
Can't have our users breaking the laws of physics.
 2016-04-06 13:58:56 +02:00
Simon Edwards
a15d864f0f Updated the Surface Mode description 
Fixes CURA-850
 2016-04-06 13:56:23 +02:00
Simon Edwards
3fa19e576b Fixed a few minor english errors in the settings names. 2016-04-06 11:47:02 +02:00
Simon Edwards
0187224137 Settings names are now meaningful outside their place/category in the sidebar. 
Fixes CURA-1177
 2016-04-06 11:46:53 +02:00
Jaime van Kessel
e2e25ea3e8 Merge branch '2.1-max_message_size_fix' of https://github.com/Ultimaker/Cura into 2.1 2016-04-06 11:42:38 +02:00
Jaime van Kessel
610533aa15 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-06 10:52:21 +02:00
Jaime van Kessel
5f74113a45 Fixed changelog plugin so it shows correctly again 
CURA-1326
 2016-04-06 10:51:45 +02:00
fieldOfView
2cedfbfbb7 Change splash-screen so it does not say "developer version", pending a release "real soon now" 
CURA-1341
 2016-04-05 22:28:52 +02:00
Jaime van Kessel
6a4b83b54b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-05 10:28:29 +02:00
fieldOfView
b3b04ff7b0 Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:59:02 +02:00
fieldOfView
78038e90b8 Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:52:33 +02:00
Ghostkeeper
7a217130a7
Fix profiles and FDMprinter after merge 
Merge didn't go too well.

Contributes to issue CURA-1235.
 2016-04-05 09:49:44 +02:00
Ghostkeeper
0684cee681 Merge branch '2.1' 
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
 2016-04-04 18:49:09 +02:00
Jaime van Kessel
3ed7d60adb Increased size of the label for layerview a bit more. 
CURA-1273
 2016-04-04 14:42:42 +02:00