Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
authorAlexander Green <alexandergreen22@gmail.com>
Thu, 8 Aug 2013 09:39:02 +0000 (02:39 -0700)
committerAlexander Green <alexandergreen22@gmail.com>
Thu, 8 Aug 2013 09:39:02 +0000 (02:39 -0700)
1  2 
SugarCubes.pde

diff --cc SugarCubes.pde
index 801e2930f0f66bd01619db6414726f677bf28726,c0ab10403b646a78790993fac57d7c4565d661d2..060a035aebdeb18da210932c8ec836537cca6fff
@@@ -34,9 -34,10 +34,11 @@@ LXPattern[] patterns(GLucose glucose) 
      new Psychedelia(glucose),
      new CubeEQ(glucose),
      new PianoKeyPattern(glucose),
+     new WarmPlasma(glucose),
+     new FireTest(glucose),
      
 -    // Basic test patterns for reference, not art
 +    // Basic test patterns for reference, not art    
 +//    new TestCubePattern(glucose),
  //    new TestHuePattern(glucose),
  //    new TestXPattern(glucose),
  //    new TestYPattern(glucose),