Commits · e7e2d1a9af2d7bcb454fbfd99e5f51d989dc1579 · machinery / MarlinKimbra

01 Jun, 2016 14 commits
- Merge branch 'master' into k40_flow_cooler · e7e2d1a9
  Franco (nextime) Lanza authored Jun 01, 2016
  
  e7e2d1a9
- Merge branch 'dev' · 79e48094
  Franco (nextime) Lanza authored Jun 01, 2016
  
  79e48094
- Update default pins for laser, cooler, flow sensor in ramps · 72930932
  Franco (nextime) Lanza authored Jun 01, 2016
  
  72930932
- Merge branch 'master' into k40_flow_cooler · 811aa7ca
  Franco (nextime) Lanza authored Jun 01, 2016
  
  811aa7ca
- Restored README · bcea222f
  Franco (nextime) Lanza authored Jun 01, 2016
  
  bcea222f
- Merge branch 'dev' · 0e924926
  Franco (nextime) Lanza authored Jun 01, 2016
  
  0e924926
- Merge remote-tracking branch 'upstream/dev' into dev · 617215e3
  Franco (nextime) Lanza authored Jun 01, 2016
  
  617215e3
- Merge branch 'master' into k40_flow_cooler · 1c1cf7d2
  Franco (nextime) Lanza authored Jun 01, 2016
  
  1c1cf7d2
- Update readme · 50a2c427
  Franco (nextime) Lanza authored Jun 01, 2016
  
  50a2c427
- Default config for k40 · 74d53f4e
  Franco (nextime) Lanza authored Jun 01, 2016
  
  74d53f4e
- Restored readme · d8f54a1a
  Franco (nextime) Lanza authored Jun 01, 2016
  
  d8f54a1a
- Update config file examples for K40 · d2031f2b
  Franco (nextime) Lanza authored Jun 01, 2016
  
  d2031f2b
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 242fe1b9
  MagoKimbra authored Jun 01, 2016
  
  242fe1b9
- Fix · dd3c8447
  MagoKimbra authored Jun 01, 2016
  
  dd3c8447
31 May, 2016 14 commits
- Merge branch 'dev' · 586fed8a
  Franco (nextime) Lanza authored May 31, 2016
  
  586fed8a
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 444b49ee
  MagoKimbra authored May 31, 2016
  
  444b49ee
- Fix · 80ebe900
  MagoKimbra authored May 31, 2016
  
  80ebe900
- sync with upstream · 252fa2d0
  Franco (nextime) Lanza authored May 31, 2016
  
  252fa2d0
- Merge remote-tracking branch 'upstream/dev' into dev · 81e4f5c9
  Franco (nextime) Lanza authored May 31, 2016
  
  81e4f5c9
- Merge remote-tracking branch 'upstream/dev' into dev · aa1b69a7
  Franco (nextime) Lanza authored May 31, 2016
  
  aa1b69a7
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 2dfd21c9
  MagoKimbra authored May 31, 2016
  
  2dfd21c9
- Update credits · 49b252fc
  MagoKimbra authored May 31, 2016
  
  49b252fc
- Fix Laser & LCD · 28b011e5
  MagoKimbra authored May 31, 2016
  
  28b011e5
- sync with upstream · 2f99cb36
  Franco (nextime) Lanza authored May 31, 2016
  
  2f99cb36
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 46ac851b
  MagoKimbra authored May 31, 2016
  
  46ac851b
- Fix README · 4c2e2ab6
  MagoKimbra authored May 31, 2016
  
  4c2e2ab6
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 0399e36f
  MagoKimbra authored May 31, 2016
  
  0399e36f
- Update 4.2.83 · 184769cb
  MagoKimbra authored May 31, 2016
```
Add Cooler and Hot Chamber
Add Laser PWM and raster base 64
```
  184769cb
28 May, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 366fe4a4
  MagoKimbra authored May 28, 2016
  
  366fe4a4
- Fix SD_DETECT_INVERTED · 3fdffbe0
  MagoKimbra authored May 28, 2016
  
  3fdffbe0
27 May, 2016 7 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 180b51cd
  MagoKimbra authored May 27, 2016
  
  180b51cd
- Fix · f37b56ef
  MagoKimbra authored May 27, 2016
  
  f37b56ef
- Merge remote-tracking branch 'refs/remotes/origin/dev' · 4ec1eb33
  MagoKimbra authored May 27, 2016
  
  4ec1eb33
- Fix · 7bcab335
  MagoKimbra authored May 27, 2016
  
  7bcab335
- Restore README.md · 32b99d79
  Franco (nextime) Lanza authored May 27, 2016
  
  32b99d79
- Fix print_job_timer to print_job_counter · c3a55864
  Franco (nextime) Lanza authored May 27, 2016
  
  c3a55864
- Update Laser README · 36c76a49
  Franco (nextime) Lanza authored May 27, 2016
  
  36c76a49
26 May, 2016 3 commits
- Fix example with the actual arduino · bce09319
  Franco (nextime) Lanza authored May 26, 2016
  
  bce09319
- Add mega extraflag example · 5e3f4f0c
  Franco (nextime) Lanza authored May 26, 2016
  
  5e3f4f0c
- Merge branch 'dev' · 6186c1da
  Franco (nextime) Lanza authored May 26, 2016
  
  6186c1da