.

Merge branch 'master' of github.com:daid/SkeinPyPy

Conflicts:
	SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
	SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode

diff --cc SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
index 7c3248d3fe6284b4202cd070a18d77adb5556592,1ccaadc29694c286125f2fc9e7d68542c89f5452..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
--- 2/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
+++ /dev/null
@@@ -1,25 -1,24 +1,0 @@@
- G21        ;metric values)
 -G21        ;metric values
--G90        ;absolute positioning
--G21
--G28 X0 Y0  ;move X/Y to min endstops
--G28 Z0     ;move Z to min endstops
--
--; if your prints start too high, try changing the Z0.0 below
--; to Z1.0 - the number after the Z is the actual, physical
--; height of the nozzle in mm. This can take some messing around
- ; with to get just right...
- G21
 -; with to get just right... 
--G92 X0 Y0 Z0 E0 ;reset software position to front/left/z=0.0
--G21
--G1 Z15.0 F400  ;move the platform down 15mm
--G92 E0         ;zero the extruded length
--G21
- G1 F75 E5      ;extrude 5mm of feed stock
- G1 F75 E3.5    ;reverse feed stock by 1.5mm
 -G1 F75 E5     ;extrude 5mm of feed stock
 -G1 F75 E3.5   ;reverse feed stock by 1.5mm
--G92 E0         ;zero the extruded length again
--G21
--M1             ;Clean the nozzle then press YES to continue...
--G21
--G1 X100 Y100 F3500 ;go to the middle of the platform
--G1 Z0.0 F400   ;back to Z=0 and start the print!
--