fixed merge conflicts
No related branches found
No related tags found
Showing
- README 5 additions, 2 deletionsREADME
- lib/corn-httpclient-1.0.12.jar 0 additions, 0 deletionslib/corn-httpclient-1.0.12.jar
- nbproject/project.properties 3 additions, 1 deletionnbproject/project.properties
- src/com/t_oster/liblasercut/FloatPowerSpeedFocusProperty.java 237 additions, 0 deletions...com/t_oster/liblasercut/FloatPowerSpeedFocusProperty.java
- src/com/t_oster/liblasercut/LaserCutter.java 120 additions, 0 deletionssrc/com/t_oster/liblasercut/LaserCutter.java
- src/com/t_oster/liblasercut/LibInfo.java 4 additions, 1 deletionsrc/com/t_oster/liblasercut/LibInfo.java
- src/com/t_oster/liblasercut/drivers/GenericGcodeDriver.java 896 additions, 0 deletionssrc/com/t_oster/liblasercut/drivers/GenericGcodeDriver.java
- src/com/t_oster/liblasercut/drivers/LaosCutter.java 22 additions, 2 deletionssrc/com/t_oster/liblasercut/drivers/LaosCutter.java
- src/com/t_oster/liblasercut/drivers/MakeBlockXYPlotter.java 22 additions, 4 deletionssrc/com/t_oster/liblasercut/drivers/MakeBlockXYPlotter.java
- src/com/t_oster/liblasercut/drivers/MakeBlockXYPlotterProperty.java 22 additions, 4 deletions...oster/liblasercut/drivers/MakeBlockXYPlotterProperty.java
- src/com/t_oster/liblasercut/drivers/Marlin.java 110 additions, 0 deletionssrc/com/t_oster/liblasercut/drivers/Marlin.java
- src/com/t_oster/liblasercut/drivers/SmoothieBoard.java 97 additions, 0 deletionssrc/com/t_oster/liblasercut/drivers/SmoothieBoard.java
Loading
Please register or sign in to comment