3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-01-18 05:45:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Cura/resources
History
fieldOfView 4d1fce18cb Merge branch '3.5' into bb-3.5 
# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputDevice.py
#	resources/qml/Preferences/Materials/MaterialsPage.qml
#	resources/qml/SaveButton.qml
2018-09-12 16:12:01 +02:00
..
definitions Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
extruders fix issues with moai profile 2018-08-28 08:01:51 +02:00
firmware Add blackbelt firmware (bb-1.1.8 branch) 2018-07-16 13:29:23 +02:00
i18n Fix shortcut conflict in French 2018-09-06 16:06:45 +02:00
images Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
meshes Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
qml Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
quality Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
setting_visibility Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
shaders Fix support blocker on older (legacy) opengl 2018-05-14 14:29:41 +02:00
themes Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
variants Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
bundled_packages.json Update SDK version for the bundled packages. 2018-09-11 09:38:23 +02:00