From: Alexander Green <alexandergreen22@gmail.com>
Date: Fri, 18 Oct 2013 04:19:04 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=6b163a98976a5f2adf9da1b7bd3297e39d6dd7bf;p=SugarCubes.git

Merge branch 'master' of https://github.com/sugarcubes/SugarCubes

Conflicts:
	_Mappings.pde
---

6b163a98976a5f2adf9da1b7bd3297e39d6dd7bf
diff --cc AlexGreen.pde
index 6b076f6,6ee9a39..e240f7d
mode 100755,100644..100644
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
diff --cc SugarCubes.pde
index f9616b8,84a311a..893152f
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -26,10 -26,10 +26,12 @@@
  LXPattern[] patterns(GLucose glucose) {
    return new LXPattern[] {
  
 -    
 +    new SineSphere(glucose),
 +     new CubeCurl(glucose),
 +
      // Slee
+     // new MidiMusic(glucose),
+     new Pulley(glucose),
      new Swarm(glucose),
      new ViolinWave(glucose),
      new BouncyBalls(glucose),
diff --cc _Mappings.pde
index 3f6756a,9ff78ba..a16c467
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@@ -120,7 -114,10 +120,7 @@@ for (StaggeredTower st : scubes) 
      towerList.add(new Tower(tower));
    }
  
-  return new Model(towerList, cubes, bassBox, speakers);
 -  for (Cube cube : singleCubes) cubes[cubeIndex++] = cube;
 -  for (Cube cube : dcubes) 		cubes[cubeIndex++] = cube;
 -
+   return new Model(towerList, cubes, bassBox, speakers);
  }
  
  /**