3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
28446 commits 302 branches 270 tags 773 MiB
Commit graph

12848 commits

Author SHA1 Message Date
Jaime van Kessel
9ca5a52659 Also speed up the expression for the value of a setting item 2021-10-08 18:35:02 +02:00
Jaime van Kessel
512b0a1dbe Remove unneeded catalog 
The catalog was created over and over again even though it wasn't needed.
On my machine this took 0.25 seconds, so it does add up
 2021-10-08 18:17:18 +02:00
Jaime van Kessel
285a4584e7 Improve speed of the inherit button 
A few unneeded conversions were done. Also moved one check to python from JS
 2021-10-08 18:12:35 +02:00
Ghostkeeper
fb7e67b8ad
Change 'hit' to 'click' 
This is more consistent with other texts.

Contributes to issue CURA-8609.
 2021-10-08 16:51:04 +02:00
Ghostkeeper
599c59bd3a
Add a background job to upload material archives 
It creates the archive now. It doesn't yet upload it.

Contributes to issue CURA-8609.
 2021-10-08 15:15:57 +02:00
Ghostkeeper
a7f172d836
Only show online printers in list of printers to sync to 
We can only sync with printers that are currently online.
We'll just send it to the account to sync with everything. But these are the ones it should arrive with.

Contributes to issue CURA-8609.
 2021-10-08 14:22:46 +02:00
Ghostkeeper
32c63c2757
Add isOnline role to GlobalStacksModel 
This way we can filter for only online printers or display whether printers are online or not in the future.

Contributes to issue CURA-8609.
 2021-10-08 14:09:12 +02:00
Jaime van Kessel
65a35bbebc Move creaseee extruders and definitions to correct folder 2021-10-08 10:52:10 +02:00
Ghostkeeper
75c7d5c4f5
Link to USB page without depending on actual order of pages 
This is more future-proof. If someone were to add a page to the end, it wouldn't immediately break these buttons any more.

An example of why self-documenting code can be good.

Contributes to issue CURA-8609.
 2021-10-06 16:48:52 +02:00
Ghostkeeper
d9d83b4334
Add page for when the user has no cloud printers 
It should show this image, instructions, and a refresh button.
If the refresh button is pressed and the user now has more printers, it should automatically swap to the printer list. Or vice-versa if printers get deleted on the website.

Contributes to issue CURA-8609.
 2021-10-06 16:42:56 +02:00
Ghostkeeper
52373c6850
Add correct links for troubleshooting buttons 
Contributes to issue CURA-8609.
 2021-10-06 15:46:43 +02:00
Ghostkeeper
038db1fc4f
Implement functionality of export to USB button 
It now creates a similar dialogue of what the old button did. The dialogue is no longer necessary in the materials page, so I've moved it to here specifically.

Contributes to issue CURA-8609.
 2021-10-06 15:20:26 +02:00
Ghostkeeper
e5dc90a519
Add USB syncing page to swipe view 
Looks like a lot of blank space. May need to adjust sizes.

Contributes to issue CURA-8609.
 2021-10-06 15:11:14 +02:00
Ghostkeeper
b98da6b538
Merge branch 'master' into CURA-8609_sync_materials_to_printer 
Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> Both master and my branch added an __init__ function. I merged the two __init__s to do both things that need to be done.
 2021-10-06 14:22:18 +02:00
Ghostkeeper
d16217c674
Implement filter for printer list to only show printers with certain configured connections 
Because here we only want to show cloud-connected printers.

Contributes to issue CURA-8609.
 2021-10-05 17:44:15 +02:00
Ghostkeeper
c8931d4c23
Implement sync function for refresh button 
Quite simple. There's not a lot of feedback though when you press that button. Maybe we need to look at that.

Contributes to issue CURA-8609.
 2021-10-05 17:31:27 +02:00
Ghostkeeper
554f580f13
Add extra card to refresh printer list 
Contributes to issue CURA-8609.
 2021-10-05 17:28:26 +02:00
v27jain
89070237d9
Adding 3DI D300 (#9863) 
* Add files via upload

* Add files via upload

* Add files via upload

* Delete 3di_d220.def.json

* Delete 3di_d300.def.json

* Add files via upload

* Delete 3di_d220_extruder_0.def.json

* Delete 3di_d300_extruder_0.def.json

* Add files via upload

* Update 3di_d220.def.json

* Update 3di_d300.def.json

* Delete 3di_d300_platform.stl

* Add files via upload

* Update 3di_d300.def.json

* Delete 3di_d220.def.json

* Delete 3di_d220_platform.stl
 2021-10-05 16:38:50 +02:00
Ghostkeeper
7a47ffb1b7
Add design for cards with printers 
I'm adding the theme entry 'card' once and for all to hopefully unify the design we're using for cards in the toolbox, in the digital library, in the LAN connection interface, etc.

Contributes to issue CURA-8609.
 2021-10-05 16:34:45 +02:00
hyu7000
46261e328b
cremaker def files added (#10409) 
* test

test

* Delete 느낌표 2개.png

* Cremaker's def file

Cremaker's 3 model def files added.

* Cremaker's ext def file

Cremaker's extruder def files added.

* cremaker bed obj file

2 model size add

* change value

change to value from default value

* change value

change to value from default value

* change machine value

change to "cremaker_common" from "cremaker"

* change value

change to value from default value

* change value

change to value from default value

* change value

change to value from default value

* Update cremaker_common.def.json

* change some code for crashes to resolve
 2021-10-05 16:26:03 +02:00
Jelle Spijker
8466a291fd
Merge pull request #10547 from Ultimaker/CURA-8601_update_connect_to_cloud_popup 
Update connect to cloud popup
 2021-10-05 14:44:12 +02:00
Ghostkeeper
c95de3e379
Add main layout for printer list page 
The actual printer list is not implemented yet and some of these elements may need to be swapped out if there are no printers available. But this is the basis of it.

Contributes to issue CURA-8609.
 2021-10-05 14:30:42 +02:00
Ghostkeeper
ec79961153
Skip to next page when login is successful 
Contributes to issue CURA-8609.
 2021-10-05 14:20:50 +02:00
Ghostkeeper
0bb0c672c5
Skip sign in page if already signed in 
Contributes to issue CURA-8609.
 2021-10-05 14:05:08 +02:00
Ghostkeeper
f2aba01eff
Reset page index to 0 when re-opening sync dialogue 
When the user previously opened the dialog and advanced through the pages, but closes the window, then they'll probably have to restart when they want to try it again.

Contributes to issue CURA-8609.
 2021-10-05 14:00:15 +02:00
Ghostkeeper
9b1c8d1c7a
Add beginnings of printer list page 
We just need this to have something to navigate to from the other pages as I implement that it automatically skips the sign in page when already signed in, and that it continues after being signed in from the sign in page.

Contributes to issue CURA-8609.
 2021-10-05 13:26:25 +02:00
Ghostkeeper
c761820d52
Add behaviour to sign in page buttons 
It will now sign you in when you press that button. It doesn't automatically proceed to the next page when signed in though. For that I reckon I'll need to build that next page first, or at least the beginnings of it.

Contributes to issue CURA-8609.
 2021-10-05 13:22:33 +02:00
Ghostkeeper
3b62759ff2
Design for sign in page of material sync dialog 
It's not functional yet at the moment, but this is a nice layout.

Contributes to issue CURA-8609.
 2021-10-05 13:15:40 +02:00
Jelle Spijker
52a38d4176
Merge pull request #9160 from Ultimaker/UMH-2021_ribbed_vaults_infill 
UM Hackathon 2021: Add 'Ribbed Support Vaults' infill pattern.
 2021-10-05 12:29:00 +02:00
Ghostkeeper
cef5c5da2a
Add link to help and button to continue 
These two are aligned vertically.

Contributes to issue CURA-8609.
 2021-10-05 12:05:26 +02:00
Ghostkeeper
d8dcd0affc
Replace three image layout with a single unified image 
This new image positions all the images correctly and makes sure it all uses the correct line width even though they are scaled relatively to each other.

Contributes to issue CURA-8609.
 2021-10-05 11:44:06 +02:00
Jaime van Kessel
cc92f4c1e0 Merge branch 'CURA-8602_move_skip_button_onboarding_flow' of github.com:Ultimaker/Cura 2021-10-05 11:01:55 +02:00
Jaime van Kessel
527de2b6ef Use image instead of custom message type 
CURA-8601
 2021-10-05 10:20:52 +02:00
AnnaKang0219
46371025b1 update setting_version 
update setting_version
 2021-10-05 10:54:22 +08:00
AnnaKang0219
228b97c003 Fix error 
1.update setting version
 2021-10-05 10:44:21 +08:00
Ghostkeeper
6b0e221b73
Implement word wrapping for introductory text 
Contributes to issue CURA-8609.
 2021-10-04 18:13:12 +02:00
Ghostkeeper
e56076af08
Render material spool somewhat bigger and give it a margin 
The image of the spool doesn't have a margin by itself, contrary to the other images which have a visual margin given by the size of the table. We have to give it a margin manually. This is one of the consequences of encoding margins inside of images that may be used all over the place. We can't just remove the margins inside of the image because the laptop image will be used in other places too.
Just adding a margin would subtract from the size of the spool image making it very small. To compensate I'm making the spool image slightly bigger.

Contributes to issue CURA-8609.
 2021-10-04 18:09:47 +02:00
Ghostkeeper
346d9f1db2
Add images describing the workflow to first page 
Contributes to issue CURA-8609.
 2021-10-04 17:59:16 +02:00
Jelle Spijker
b49004a742
Reorient layout of skip, sign-in and create 
* Skip button
  - Moved to the left, such that a user won't click on it mindlessly
  - Made it a Tertiary button, so it will have predictable margins
* Sign-in button
  - Moved to the right bottom, making it the logical next option
* Create an account
  - Moved to be inline with skip and sign-in
  - Made it a secondary button as requested by UX

Contributes to CURA-8602
 2021-10-04 16:48:51 +02:00
Ghostkeeper
1e9ae92d29
Add spacing and padding to first page 
Contributes to issue CURA-8609.
 2021-10-04 16:39:56 +02:00
Ghostkeeper
b5edd5fa9c
Make Sync dialogue modal 
Otherwise it appears behind other modal windows, such as the material manager.

Contributes to issue CURA-8609.
 2021-10-04 16:27:52 +02:00
Ghostkeeper
9ec731eaf6
Create MaterialsSyncDialog from a Python function 
Rather than from the QML.
This allows creating this dialogue from a message button without needing to put it in the base application.

Contributes to issue CURA-8609.
 2021-10-04 16:23:28 +02:00
AnnaKang0219
b154e4260a fix errors 
1.setting extruder for Jr. Wifi Pro
2.setting base quality
 2021-10-04 16:48:00 +08:00
AnnaKang0219
585e32d241 fix errors 
1.remove no-use file :xyzprinting_da_vinci_jr_wifi_pro_extruder_0.def.json
2.remove "meta" in carbon_fiber quality file.
 2021-10-04 14:10:09 +08:00
AnnaKang0219
8b5e64a4f9 remove unnecessary default_values 
remove unnecessary default_values for ['adhesion_type']
 2021-10-04 13:01:07 +08:00
AnnaKang0219
097a56bd9b fix check error 
remove speed_travel in definition due to the setting already in quality.
 2021-10-04 11:48:49 +08:00
AnnaKang0219
8c155e8990 fix check errors 
remove the settings in definitions if these parameter already setting in quality
 2021-10-04 11:23:30 +08:00
Denis Shatilov
d9a20fd01a
Fixed Extruder hitting frame after finished print 2021-10-03 12:33:04 -07:00
Ghostkeeper
1c78452d39
Add basis for a new material sync wizard 
Just the set-up with a basic page to test the window with.

Contributes to issue CURA-8609.
 2021-10-01 17:54:01 +02:00
Ghostkeeper
f749bbef46
Squashed commit of the following: 
commit a82c29998f18ca940089347912b01c88a766925c
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Fri Oct 1 16:43:41 2021 +0200

    Fix remaining merge conflict and tabs vs. spaces

    Contributes to issue CURA-8604.

commit d0d8eb19e0977dead9e826949161d123f53e7c75
Merge: 6dc65a491 88beb8ab6
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Fri Oct 1 16:37:09 2021 +0200

    Merge branch 'master' of https://github.com/DevelopmentHellbot/Source-files-Cura into DevelopmentHellbot-master

    Conflicts:
    	resources/definitions/hellbot_hidra.def.json
    	resources/definitions/hellbot_hidra_plus.def.json
    	resources/definitions/hellbot_magna_2_230_dual.def.json
    	resources/definitions/hellbot_magna_2_300_dual.def.json
    	resources/extruders/hellbot_hidra_extruder_0.def.json
    	resources/extruders/hellbot_hidra_extruder_1.def.json
    	resources/extruders/hellbot_hidra_plus_extruder_0.def.json
    	resources/extruders/hellbot_hidra_plus_extruder_1.def.json
    	resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json
    	resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json
    	resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json
    	resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json
    	resources/meshes/Hellbot_Magna_2_230.obj
    	resources/meshes/Hellbot_Magna_2_300.obj
    	resources/meshes/hellbot_hidra.obj
    	resources/meshes/hellbot_hidra_plus.obj

    All of these conflicting files were modified on in the PR, but it seems to have been started from a separate history somehow.

commit 88beb8ab68
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:37:56 2021 -0300

    Create hellbot_hidra_plus.obj

commit 48b2de0983
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:37:47 2021 -0300

    Update hellbot_hidra_plus.obj

commit d94d3e42fc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:37:13 2021 -0300

    Update hellbot_hidra.obj

commit c3e7427718
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:35:19 2021 -0300

    Update Hellbot_Magna_2_500.obj

commit 7830e553c0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:34:55 2021 -0300

    Update Hellbot_Magna_2_400.obj

commit e3ec97eefa
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:34:25 2021 -0300

    Update Hellbot_Magna_2_300.obj

commit b906f5bd36
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:33:25 2021 -0300

    Update Hellbot_Magna_2_230.obj

commit e5161a29b1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:45:38 2021 -0300

    Update hellbot_hidra_plus_extruder_1.def.json

commit 4d1da31703
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:45:25 2021 -0300

    Update hellbot_hidra_plus_extruder_0.def.json

commit 940df437b6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:45:12 2021 -0300

    Update hellbot_hidra_extruder_1.def.json

commit 7009e6f43d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:44:59 2021 -0300

    Update hellbot_hidra_extruder_0.def.json

commit 98f7f38dc2
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:44:20 2021 -0300

    Update hellbot_hidra_plus.def.json

commit 941080f059
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:43:25 2021 -0300

    Update hellbot_hidra_plus.def.json

commit 13f908a9a1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:41:49 2021 -0300

    Update hellbot_hidra.def.json

commit e0e7af51bc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Aug 17 15:19:25 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 47fb61b896
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Aug 17 14:25:41 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

    Add new start gcodes

commit 8c3add290e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 16:43:53 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 11cc224d19
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 11:35:36 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

    Change the start gcode

commit b918db88eb
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 11:24:13 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit d8f73a7247
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 11:19:59 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

    Add some new start gcodes for purge line and temperature configuration.

commit 0ba60ac18b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 13:06:45 2021 -0300

    Update hellbot_magna_2_300_dual.def.json

commit b84621061e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 13:05:49 2021 -0300

    Update hellbot_magna_2_300_dual_extruder_1.def.json

commit 3ce4bd1b86
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 13:05:25 2021 -0300

    Update hellbot_magna_2_300_dual_extruder_0.def.json

commit 2b09de8042
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 12:00:12 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_1.def.json

commit 2d41b9c175
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:59:13 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_1.def.json

commit c8ff19e804
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:57:57 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_1.def.json

commit efd7b380ea
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:56:42 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_0.def.json

commit 97b8880501
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:55:54 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_0.def.json

commit 7005882e6f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:32:31 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit b853930158
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:31:11 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 10f3cbd90d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:27:19 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 251025f861
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Aug 10 12:03:10 2021 -0300

    Add missing } in line 16

commit 7adafbe64f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:25:25 2021 -0300

    Update hellbot_magna_2_300_dual_extruder_1.def.json

commit fc636ee688
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:25:13 2021 -0300

    fix format

commit c817a65416
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:24:43 2021 -0300

    Fix format

commit 9569ba33de
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:24:22 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_0.def.json

commit 6badeaa11a
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:22:15 2021 -0300

    fix format

commit 93c482179b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:59:24 2021 -0300

    fix formatting

commit 874efbeecd
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:56:39 2021 -0300

    Fix formatting

commit 654c90bf47
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:55:54 2021 -0300

    Fix formatting

commit d81cf2e44f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:54:18 2021 -0300

    Fix formatting

commit 641c9a3088
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:52:59 2021 -0300

    Add extruder files for Magna 2 400 and 500

commit 6c2eda8bb1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:51:30 2021 -0300

    Update extruder 0 Magna 2 300 Dual

    Add start and end gcode for Magna 2 300 Dual

commit 40d01af1ff
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:49:29 2021 -0300

    Update Extruder 1 Magna 2 300 dual

    Add start and end gcode for Magna 2 300 dual

commit c07b2344d0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:32:14 2021 -0300

    Update Extruder 1 Magna 2 300

    Add start and end Gcode for Extruder 1

commit 215373c8da
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:31:06 2021 -0300

    Update Extruder 0 Magna 2 230

    Add Start and End Gcode for Extruder 0

commit eb94b340ed
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 6 12:29:44 2021 -0300

    Fix formatting

    Fixed the spaces and tabs.

commit 3ae83992a2
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 6 12:21:59 2021 -0300

    Update hellbot_magna_2_400_dual.def.json

commit 521ba3feec
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 17:14:49 2021 -0300

    Add new bed 3D models

    Add 3d models for the beds of the Magna 2 400 and Magna 2 500

commit 7924b268a3
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:18:24 2021 -0300

    Add images for new Hellbot printers

    Add images for beds of the Magna 2 400 and Magna 2 500

commit 7b457e916a
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:17:06 2021 -0300

    Add definitons for new Hellbot Printers

    Add definition files for Magna 2 400, Magna 2 400 Dual, Magna 2 500 and Magna 2 500 Dual.

commit 52ffd4acb0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:14:45 2021 -0300

    Update definition of the Magna 2 300 Dual

    Change the start gcode

commit 550f6fae0b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:09:39 2021 -0300

    Update Magna 2 230 Dual definition

    Change the Start gcode

commit 10f8f52c2f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:42:28 2021 -0300

    Add New Hellbot printers

    Add definition files for the new Hellbot printers: Hidra and Hidra Plus

commit d90b6556e6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:39:10 2021 -0300

    Add extruder files for new Hellbot printers

    Add extruder files for new Hellbot Printers: Hellbot Hidra and Hellbot Hidra Plus

commit 7168ced3ef
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:36:50 2021 -0300

    Add meshes files for Hellbot Hidra and Hidra plus

commit 8d982afede
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:35:46 2021 -0300

    Add bed images for Hellbot Hidra and Hidra Plus

commit f9c20085cc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:30:55 2021 -0300

    Added Start and End Gcode

    Added machine start Gcode for purging the 2 in 1 hotend at the start and end gcode

commit 5e36e40573
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:25:22 2021 -0300

    Added new Start and End Gcode

    Added specific Gcode for purging the 2 in 1 hotend.

commit ff7288831e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:16:11 2021 -0300

    Delete Hellbot_pla_Grey.xml.fdm_material

commit 5cb5e5c655
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:16:00 2021 -0300

    Delete Hellbot_PLA_Red.xml.fdm_material

commit d005b7d77d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:06:50 2021 -0300

    Rename Hellbot_PLA_Grey.xml.fdm_material to Hellbot_pla_Grey.xml.fdm_material

commit 2ba75d9a88
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:01:33 2021 -0300

    Update Hellbot_PLA_Grey.xml.fdm_material

commit 6cb074fa1b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 15:51:53 2021 -0300

    added print settings

commit 4a51c257c4
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 15:51:33 2021 -0300

    added print settings

commit c8967242e6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 15:38:17 2021 -0300

    Added two PLA hellbot materials.

commit 4a4622f95c
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:33:07 2020 -0300

    Update hellbot_magna_2_300.def.json

commit fa47e14765
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:32:45 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit e34aedda09
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:32:24 2020 -0300

    Update hellbot_magna_2_230.def.json

commit a40858e92c
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:31:48 2020 -0300

    Update hellbot_magna_2_300_dual.def.json

commit 08230ef409
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:30:55 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 4655bffec8
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:30:42 2020 -0300

    Update hellbot_magna_2_300.def.json

commit fa76c7c738
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:30:18 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 4a50f4d4ed
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:29:29 2020 -0300

    Update hellbot_magna_2_230.def.json

commit e093729b45
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:40:43 2020 -0300

    Add files via upload

commit c16b5fd034
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:31:07 2020 -0300

    Create hellbot_magna_2_300_extruder_0.def.json

commit b60df9bfb0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:24:42 2020 -0300

    Add files via upload

commit 7a807a11bb
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:19:03 2020 -0300

    Delete hellbot_magna_2_230_extruder_0.def.json

commit 1fa060366a
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:11:16 2020 -0300

    Update hellbot_magna_2_230_extruder_0.def.json

commit 4367946eaa
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:01:47 2020 -0300

    Add files via upload

commit 0de2121e46
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:01:15 2020 -0300

    Delete hellbot_magna_2_300_extruder_0.def.json

commit da5e2d5bbc
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:00:55 2020 -0300

    Delete hellbot_magna_2_300_dual_extruder_1.def.json

commit 8a97089c7c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:00:30 2020 -0300

    Delete hellbot_magna_2_300_dual_extruder_0.def.json

commit 222bfdb6f9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 14:59:52 2020 -0300

    Delete hellbot_magna_2_230_extruder_0.def.json

commit 93530f5ee9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 14:59:31 2020 -0300

    Delete hellbot_magna_2_230_dual_extruder_1.def.json

commit 7e62e8b564
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 14:59:11 2020 -0300

    Delete hellbot_magna_2_230_dual_extruder_0.def.json

commit 4f851668c0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:28:51 2020 -0300

    Rename hellbot_magna_2_300_dual_E2.def.json to hellbot_magna_2_300_dual_extruder_1.def.json

commit 7c78b92cd9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:28:17 2020 -0300

    Rename hellbot_magna_2_300_dual_E1.def.json to hellbot_magna_2_300_dual_extruder_0.def.json

commit da01f79d53
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:27:44 2020 -0300

    Rename hellbot_magna_2_300_E1.def.json to hellbot_magna_2_300_extruder_0.def.json

commit f4147a02fd
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:22:42 2020 -0300

    Rename hellbot_magna_2_230_dual_E2.def.json to hellbot_magna_2_230_dual_extruder_1.def.json

commit 7e6e5213ae
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:22:04 2020 -0300

    Rename hellbot_magna_2_230_dual_E1.def.json to hellbot_magna_2_230_dual_extruder_0.def.json

commit 3fda1c9d7f
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:21:22 2020 -0300

    Rename hellbot_magna_2_230_E1.def.json to hellbot_magna_2_230_extruder_0.def.json

commit 4b3732598b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:32:32 2020 -0300

    Add definition files for Magna 2 230/300

commit ff52d4f7a2
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:21:19 2020 -0300

    Added extruder files for Magna 2 230/300

commit ec5aee395a
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:16:52 2020 -0300

    Add PNG files for textures for Magna 2 230/300

commit 76e496e201
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:12:17 2020 -0300

    Add new Mesh files for Magna 2 230/300

commit 8ec2c2da5c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:33:56 2020 -0300

    Delete Hellbot_Magna_2_300.obj

commit af5524927b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:33:37 2020 -0300

    Delete Hellbot_Magna_2_230.obj

commit 1e8b0f44a4
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:19:44 2020 -0300

    Delete Magna2_300.png

commit dd5f070c9b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:19:35 2020 -0300

    Delete Magna2_230.png

commit bcc0fcbec0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:19:10 2020 -0300

    Delete hellbot_magna_2_300_dual_E2.def.json

commit 0fde6d23c8
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:18:53 2020 -0300

    Delete hellbot_magna_2_300_dual_E1.def.json

commit 75c6177933
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:18:38 2020 -0300

    Delete hellbot_magna_2_300_E1.def.json

commit 5135178a47
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:18:25 2020 -0300

    Delete hellbot_magna_2_230_dual_E2.def.json

commit 43c9a204ab
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:17:59 2020 -0300

    Delete hellbot_magna_2_230_dual_E1.def.json

commit 0c7018c822
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:17:45 2020 -0300

    Delete hellbot_magna_2_230_E1.def.json

commit 4c4f88e52d
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:17:25 2020 -0300

    Delete hellbot_magna_2_300_dual.def.json

commit cf72e6f5bf
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:16:52 2020 -0300

    Delete hellbot_magna_2_230_dual.def.json

commit 7eed5479b9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:16:37 2020 -0300

    Delete hellbot_magna_2_300.def.json

commit 4eafb4d929
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:13:30 2020 -0300

    Delete hellbot_magna_2_230.def.json

commit 60f70cfb59
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 10:00:21 2020 -0300

    Add files via upload

commit 2c894ec680
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:54:48 2020 -0300

    Add files via upload

commit fc108118ec
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:43:13 2020 -0300

    Add files via upload

commit b25ccf9444
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:38:58 2020 -0300

    Update hellbot_magna_2_300_dual.def.json

commit d00d140721
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:37:16 2020 -0300

    Update hellbot_magna_2_300.def.json

commit 4c82819d5e
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:36:24 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 59635c0d96
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:29:09 2020 -0300

    Update hellbot_magna_2_230.def.json

commit f80e23c14e
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:28:03 2020 -0300

    Add files via upload

commit 7c0d67619c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Oct 19 17:38:59 2020 -0300

    Update hellbot_magna_dual.def.json

commit c2e1c1daef
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 14:13:01 2020 -0300

    Update to Hellbot Magna Dual Definition file

    Author changed and added heated bed.

commit 65519c5a03
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 13:29:46 2020 -0300

    Fixed Version

    Fixed incorrect version number

commit 4be3fecd44
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 13:18:35 2020 -0300

    Update hellbot_magna_I.def.json

commit e7e83cef30
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 13:17:46 2020 -0300

    Update hellbot_magna_I.def.json

commit fb37cc861c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 12:50:39 2020 -0300

    Update in Definition file for Hellbot Magna 1

    Change the Author name and version number.
    Added Heated bed.
 2021-10-01 16:55:26 +02:00