Commit Graph

10 Commits

Author SHA1 Message Date
casperlamboo
9c04511f94 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	settings/printer_settings.json
2017-07-18 14:05:09 +02:00
Rick Companje
ba141a54a5 fixed typo in printer.type for ultimaker2go 2017-06-22 11:13:26 +02:00
casperlamboo
5b9931531b include settings in lib 2016-05-08 11:09:34 +02:00
casperlamboo
fee357b910 move THREE normal function to utils 2015-07-01 14:51:41 +02:00
casperlamboo
99b2b24d88 added three js editor + slicer 2015-06-12 15:58:26 +02:00
casperlamboo
14c5d85318 changed format settings 2015-06-11 15:42:38 +02:00
casperlamboo
81ec036973 improved network error handling
can now reconnect when connecting failed
2015-06-11 10:28:21 +02:00
casperlamboo
38bf3c74f3 added gcode class, removed gulp
gulp didn’t make any more sense to use because it is build modulair
2015-06-05 09:56:58 +02:00
casperlamboo
f2327d3a21 improved variable names 2015-05-20 19:10:18 +02:00
casperlamboo
f24e96c5ac added separate settings files 2015-05-19 19:58:13 +02:00