Commits · 81e4f5c91ca998a320be8b1c184d85768c547449 · machinery / MarlinKimbra

31 May, 2016 10 commits
- 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 6 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
- 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 4 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
- Add a complete example of the buffer mod for arduino · 7ee69362
  Franco (nextime) Lanza authored May 26, 2016
  
  7ee69362
25 May, 2016 1 commit
- Default configs also for machines with no flowmeter and cooler · d8479fb8
  Franco (nextime) Lanza authored May 25, 2016
  
  d8479fb8
23 May, 2016 4 commits
- Updated readme · 8a94059f
  Franco (nextime) Lanza authored May 23, 2016
  
  8a94059f
- Merge remote-tracking branch 'origin/dev' · daa75234
  Franco (nextime) Lanza authored May 23, 2016
  
  daa75234
- Merge remote-tracking branch 'upstream/dev' into dev · 050b88de
  Franco (nextime) Lanza authored May 23, 2016
  
  050b88de
- Merge branch 'dev' into 'master' · 15fe0abd
  Franco (nextime) Lanza authored May 23, 2016
```
Dev



See merge request !1
```
  15fe0abd
22 May, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 58e2369b
  MagoKimbra authored May 22, 2016
  
  58e2369b
- Fix printcounter · 937fd2ed
  MagoKimbra authored May 22, 2016
  
  937fd2ed
21 May, 2016 7 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 8e6da881
  MagoKimbra authored May 21, 2016
  
  8e6da881
- Fix #137 · b9104098
  MagoKimbra authored May 21, 2016
  
  b9104098
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 315cf588
  MagoKimbra authored May 21, 2016
  
  315cf588
- Fix · e30b5fb7
  MagoKimbra authored May 21, 2016
  
  e30b5fb7
- Merge remote-tracking branch 'refs/remotes/origin/dev' · cd948299
  MagoKimbra authored May 21, 2016
  
  cd948299
- Fix printcounter · 62b0e7f2
  MagoKimbra authored May 21, 2016
  
  62b0e7f2
- Better defaults for K40 · 608868a2
  Franco (nextime) Lanza authored May 21, 2016
  
  608868a2
20 May, 2016 4 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 8ff49054
  MagoKimbra authored May 20, 2016
  
  8ff49054
- Delete old Arduino libraries · dd4af352
  MagoKimbra authored May 20, 2016
  
  dd4af352
- Merge remote-tracking branch 'refs/remotes/origin/dev' · d124d2e2
  MagoKimbra authored May 20, 2016
  
  d124d2e2
- Add MFRC522 · a60bcd96
  MagoKimbra authored May 20, 2016
  
  a60bcd96