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

18720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
75b185d462 Add test for duration messages for printInformation 2019-02-15 16:43:08 +01:00
Jaime van Kessel
f4a0b742cb Added some tests for printerOutputDevice 2019-02-15 15:39:18 +01:00
Jaime van Kessel
4acc480544 Also add tests for configurationModel 2019-02-15 15:27:57 +01:00
Jaime van Kessel
369c64e1b6 Add tests for PrintJobOutputModel & PrinterOutputModel 2019-02-15 15:19:19 +01:00
Lipu Fei
3e819f56fc Remove debug code 
CURA-6225
 2019-02-15 15:14:12 +01:00
Lipu Fei
f521fae152 Fix call_on_qt_thread decorator 
CURA-6225

Do thread check in the wrapper function, not outside.
 2019-02-15 15:11:11 +01:00
Jaime van Kessel
338f9c0052 Add check for platform mesh & texture 
It simply checks if the file exists
 2019-02-15 14:42:50 +01:00
Diego Prado Gesto
ace638ec81 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-15 14:37:56 +01:00
Diego Prado Gesto
ef73453874 Fix height in the about dialog to show the logo correctly 2019-02-15 14:36:58 +01:00
Jaime van Kessel
c3b447cd89 Also check if the variants are correct 2019-02-15 14:20:13 +01:00
Jaime van Kessel
2820bc2e8f Merge branch 'master' of github.com:Ultimaker/Cura 2019-02-15 14:08:22 +01:00
Jaime van Kessel
48b4f0ae2b Removed last few incorrect values from nwa3d profiles 2019-02-15 14:07:57 +01:00
Jaime van Kessel
b7bbe8e321 Merge branch 'master' of https://github.com/DragonJe/Cura 2019-02-15 14:07:09 +01:00
Jaime van Kessel
c0d75b38b7 Added test to check if a key in the profile is defined in the definition 2019-02-15 14:06:46 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0' 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
 2019-02-15 13:58:47 +01:00
Ghostkeeper
f3cab17e20
Revert "Check if on main thread for call_on_qt_thread" 
This reverts commit 21099e30cb666d65b53fbcd749793ce6f5fe6776.
It was causing a segfault when saving UFP files.
 2019-02-15 13:45:23 +01:00
Diego Prado Gesto
21bc8d7990 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-15 13:40:08 +01:00
Diego Prado Gesto
2d1d0c2d37 Remove unused image 2019-02-15 13:39:40 +01:00
Jaime van Kessel
aefacde7d5 Merge branch 'master' of github.com:Ultimaker/Cura 2019-02-15 13:19:48 +01:00
Jaime van Kessel
1e280c2869 Check if every quality is matched to an existing definition 2019-02-15 13:18:18 +01:00
Jaime van Kessel
98704e72a2 Added validation test for all qualities shipped with Cura 
This checks if the qualities are atleast formatted righ.
 2019-02-15 13:09:42 +01:00
Lipu Fei
21099e30cb Check if on main thread for call_on_qt_thread 
CURA-6225
 2019-02-15 12:51:42 +01:00
Satish
4a0bb43e39 CURA-6201 - Added an id to stage buttons for the integration tests 2019-02-15 12:08:42 +01:00
Ghostkeeper
73524deb8d
Add settingKey property for Squish to find things easier 2019-02-15 11:52:16 +01:00
Ian Paschal
61b84bdcfc
Merge pull request #5305 from Ultimaker/CL-1250_set_cloud_buildplate 
CL-1250 set cloud build plate
 2019-02-15 10:28:07 +01:00
Mark Burton
1ba7b35ccc Support gyroid support. 
Haven't actually tried printing gyroid support but at least now it can be evaluated.
 2019-02-15 09:19:40 +00:00
Ian Paschal
0a945b8ba5 Code style 
Contributes to CL-1250
 2019-02-15 10:18:47 +01:00
Ian Paschal
f7d86667ed Simplify code a bit 
Contributes to CL-1250
 2019-02-15 10:14:14 +01:00
Ian Paschal
4feb53fdf4 Revert "Expect to always have a build plate" 
This reverts commit 0be6c9e6d37dad83b7c447bffd439a6a2b2bb1e4.
 2019-02-15 10:12:19 +01:00
Ian Paschal
0be6c9e6d3 Expect to always have a build plate 
Contributes to CL-1250
 2019-02-15 10:10:39 +01:00
Ian Paschal
5d294a7ff5 Handle self.build_plate = None 
Contributes to CL-1250
 2019-02-15 10:04:39 +01:00
Ian Paschal
72ce40deba Update buildplate with other props 
Contributes to CL-1250
 2019-02-15 09:36:38 +01:00
DragonJe
6ed5296e59
Update nwa3d_a5_normal.inst.cfg 
Added "initial_layer_line_width_factor = 100" and changed "True" and "False" syntax
 2019-02-14 16:05:42 -06:00
DragonJe
f91ee80373
Update nwa3d_a5_fast.inst.cfg 
Added "initial_layer_line_width_factor = 100" and changed True and False syntax
 2019-02-14 16:02:57 -06:00
DragonJe
bcf9a36278
Update nwa3d_a5_best.inst.cfg 
Changed True and False syntax
 2019-02-14 15:59:45 -06:00
DragonJe
e46024e7d1
Update nwa3d_a5_best.inst.cfg 2019-02-14 15:54:56 -06:00
Ghostkeeper
cc94441b54
Fix serialising materials with Ultimaker S5 in it 
Contributes to issue CURA-5787.
 2019-02-14 17:45:25 +01:00
Jaime van Kessel
24bb4f0a4e Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-14 17:22:34 +01:00
Jaime van Kessel
6ff1f49c34 Ensure the layout gets the right width & height for the output devices popup 
CURA-6222
 2019-02-14 17:21:54 +01:00
Diego Prado Gesto
25c9bb20c3 Merge branch 'ValentinPitre-contribution' 2019-02-14 17:14:55 +01:00
Diego Prado Gesto
b53e5a963e Change setting version to 7 
Contributes to CURA-6203.
 2019-02-14 17:13:34 +01:00
Lipu Fei
45af26879f
Merge pull request #5298 from Ultimaker/CURA-6120_arrange_child_nodes_fix 
Arrange child-nodes (like blocker) with parents. [CURA-6120]
 2019-02-14 16:05:23 +01:00
Remco Burema
2f5e973836 Partly revert sugested changes for '()'s because line-breaks. [CURA-5864] 2019-02-14 15:01:32 +01:00
Remco Burema
f1b6e527be Rectified wrong placement of brackets causing logic change. [CURA-5864] 2019-02-14 14:55:12 +01:00
Lipu Fei
bfb02f68d9
Merge pull request #5300 from Ultimaker/CURA-6148-Add_where_to_buy_link 
Add a where to buy link underneath the install button for material
 2019-02-14 14:54:26 +01:00
Jaime van Kessel
68cec2679c
Apply suggestions from code review. 
Cross some brackets and dot some quotes.
[CURA-5864]

Co-Authored-By: rburema <41987080+rburema@users.noreply.github.com>
 2019-02-14 14:52:42 +01:00
Ghostkeeper
d6f116b156
Don't crash on editing metadata entries of non-registered materials 
Sometimes we need to create a temporary material profile just to save it to file.

Contributes to issue CURA-5787.
 2019-02-14 14:03:38 +01:00
Ghostkeeper
8c3f7a065d
Remove unused import 
Discovered during work on CURA-5787.
 2019-02-14 13:54:03 +01:00
Jaime van Kessel
dbb8514a6a Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-14 13:45:29 +01:00
Jaime van Kessel
b09538da63 Ensure that the numberOfExtruders property gets updated after configuration sync 
CURA-6220
 2019-02-14 13:44:43 +01:00