Ian Paschal
76240bb458
Remove unused comment
...
Contributes to CL-1212
2019-01-22 11:13:27 +01:00
Jinbuhm Kim
db17116b37
Fix Json error
2019-01-22 11:56:18 +09:00
Remco Burema
aae06fe0fa
Prevent calculations with brim width larger than build-plate. [CURA-6094]
2019-01-21 17:47:13 +01:00
Remco Burema
ccfa6ebb92
Set proper maximum values for brim width and line-count. [CURA-6094]
2019-01-21 17:47:01 +01:00
Ian Paschal
e212bbfb01
Add some translations which were forgotten
2019-01-21 17:13:34 +01:00
Ian Paschal
bc9831abd1
Add color theming to monitor tab
...
Contributes to CL-1212
2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802
Revert "Add theme colors"
...
This reverts commit 2e5eb611442b992ca0da60dc22a9e16538c48fa9.
2019-01-21 14:05:24 +01:00
Ian Paschal
2e5eb61144
Add theme colors
...
Contributes to CL-1212
2019-01-21 13:07:16 +01:00
steverc1572
d91d3713f3
Add files via upload
...
Reduced file size to under 1MB as requested
2019-01-20 18:31:34 -06:00
steverc1572
ad9b367b2a
Delete cr-x.stl
2019-01-20 18:30:25 -06:00
Diego Prado Gesto
5e3dedf62b
Merge branch '4.0'
2019-01-20 21:25:19 +01:00
steverc1572
92222ab3a3
Update cr-x_extruder_1.def.json
2019-01-20 14:23:42 -06:00
steverc1572
17c236fe53
Update cr-x_extruder_0.def.json
2019-01-20 14:22:56 -06:00
steverc1572
4637257f03
Update creality cr-x.def.json
...
Updated name to Creality3D instead of Creality
2019-01-20 14:21:54 -06:00
steverc1572
ff005eb01f
Add files via upload
2019-01-18 15:47:26 -06:00
Ian Paschal
1369c98ea6
Center extruder numbers on Ubuntu
...
This one is for you @christerbeke
2019-01-18 16:02:23 +01:00
Lipu Fei
c602c1cf15
Use MachineManager.activeMachine instead of Application.globalstack
...
CURA-6117
2019-01-18 14:08:53 +01:00
Lipu Fei
c83f815838
Fix tests
2019-01-18 13:46:37 +01:00
fieldOfView
9d02086585
Get app name from ApplicationMetaData
2019-01-18 12:22:07 +01:00
fieldOfView
7b1e20c955
Fix typo
2019-01-18 12:21:19 +01:00
fieldOfView
056655e584
Merge branch 'master' into feature_curaversion_appname
...
# Conflicts:
# cura/CuraApplication.py
2019-01-18 12:12:36 +01:00
Jaime van Kessel
a51289d7ce
Merge branch 'not_activate_when_no_materials' of github.com:Ultimaker/Cura
2019-01-18 11:19:28 +01:00
Jaime van Kessel
f7b4bd50ae
Merge branch 'fix_xray_zfighting' of https://github.com/fieldOfView/Cura
2019-01-18 11:16:40 +01:00
Jaime van Kessel
490d933923
Merge pull request #4895 from matshch/wanhao_d9
...
Added definitions for Wanhao Duplicator 9
2019-01-18 11:11:39 +01:00
Jaime van Kessel
cbcbbb8516
Merge pull request #5093 from pinchies/add-a-u20
...
fix start gcode on alfawise u20
2019-01-18 11:03:32 +01:00
Nicolas NSSM
057c30f86e
Create alfawise_u30.def.json ( #5083 )
...
* Create alfawise_u30.def.json
I basically took the base from https://github.com/Ultimaker/Cura/blob/master/resources/definitions/alfawise_u20.def.json and compiled it with the old Cura ini given by Alfawise on the SD card.
I don't know anything about Cura config so double check it real good!
* Update alfawise_u30.def.json
* Create alfawise_u30_extruder_0.def.json
* Update alfawise_u30.def.json
* Update alfawise_u30.def.json
* Update alfawise_u30.def.json
* Update alfawise_u30.def.json
Turn off the fan at the end of a print
2019-01-18 10:40:59 +01:00
Jaime van Kessel
bff1796f91
Merge pull request #5003 from DanTup/patch-1
...
Add Monoprice Ultimate based on Wanhao D6
2019-01-18 09:59:03 +01:00
DragonJe
0b69d655db
Adding NWA3D A5 printer ( #5118 )
...
* Add files via upload
* Add files via upload
* Create nwa3d_a5_normal.inst.cfg
* Add files via upload
* Add files via upload
* Delete nwa3d_a5.def.json
* Create nwa3d_a5.def.json
* Delete nwa3d_backplate.png
* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/definitions/nwa3d_a5.def.json
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/definitions/nwa3d_a5.def.json
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/definitions/nwa3d_a5.def.json
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/definitions/nwa3d_a5.def.json
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/definitions/nwa3d_a5.def.json
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
* Update resources/extruders/nwa3d_a5_extruder_0.def.json
Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
2019-01-17 17:39:00 +01:00
Jaime van Kessel
56fa30b88a
Merge branch 'master' of github.com:Ultimaker/Cura
2019-01-17 17:29:38 +01:00
Jaime van Kessel
8abeab9202
Merge branch 'patch-1' of https://github.com/TiZYX/Cura
2019-01-17 17:29:26 +01:00
Ghostkeeper
4cb7ee5fc7
Give tabs a height
...
It is used in the profile assistant. I don't know if it should be used, but it is.
Contributes to issue CURA-6086.
2019-01-17 17:23:21 +01:00
Remco Burema
e7ba543fec
Merge pull request #5172 from Ultimaker/resize_bar_ui_changes
...
Change the style of the resize bar
2019-01-17 16:59:18 +01:00
Ghostkeeper
a01063b7d8
Merge branch '4.0'
2019-01-17 16:32:18 +01:00
Ghostkeeper
13c1a70677
Fix margin
...
The theme entry didn't exist.
Discovered during work on CURA-6086, but for the rest unrelated.
2019-01-17 16:31:50 +01:00
Remco Burema
98ce0caaef
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator
...
Remove loading gif
2019-01-17 16:17:00 +01:00
Jaime van Kessel
72a7cc59ce
Use sane default when CuraCloudApiVersion is not set
2019-01-17 16:14:57 +01:00
Jaime van Kessel
662dd80a1d
Add logging if the status code of toolbox request is not 200
2019-01-17 16:06:10 +01:00
Ian Paschal
f3d0010b87
Add cloud connection condition
...
Contributes to CL-1165
2019-01-17 15:44:37 +01:00
Ian Paschal
495115c9f7
Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info
2019-01-17 15:11:38 +01:00
Jaime van Kessel
2cd6f6a834
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 14:44:42 +01:00
Jaime van Kessel
894dbcf6f6
Revert "Added skip mark to failing cloud tests"
...
This reverts commit 665c33156468270e53fb2702f7d60f0deab0618a.
2019-01-17 14:43:43 +01:00
Jaime van Kessel
c6628560bb
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into 4.0
2019-01-17 14:42:56 +01:00
Jaime van Kessel
94cf61ca18
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 14:28:35 +01:00
Jaime van Kessel
aff2ffc67a
Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0
2019-01-17 14:23:06 +01:00
Jaime van Kessel
12a120f044
Slightly modify the variant label to match more with the monitor tab
...
CURA-6100
2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76
Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0
2019-01-17 14:03:43 +01:00
Jaime van Kessel
15563a756f
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 13:42:58 +01:00
Jaime van Kessel
900e0183ca
Merge branch 'CURA-6117_remove_hardcoded_account_urls' of github.com:Ultimaker/Cura into 4.0
2019-01-17 13:16:12 +01:00
Jaime van Kessel
a41cc9efbe
Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura
2019-01-17 13:12:41 +01:00
Jaime van Kessel
665c331564
Added skip mark to failing cloud tests
2019-01-17 13:04:04 +01:00
