Merge branch 'master' of https://github.com/liam-b/computer-blocks

README.md

@@ -5,5 +5,6 @@ It is developed by Joshua Briant and Liam Brennan, two high school students from
 We hope this tool can eventually be put to use for both educational and recreational purposes. One way we would like to achieve this is through documenting the entire process to building a 10-bit computer.
 
 If you would like any more information it can be accessed from our website https://www.computerblocks.com.
+Also check out what's coming next at https://trello.com/b/kMgKFAj1/computer-blocks.
 
-build jar with `jar cfm computerblocks.jar manifest.mf $(find . -type f -name "*.class")`
+build jar with `jar cfm computerblocks.jar manifest.mf $(find . -type f -name "*.class")`

scripts/mac_run.sh

@@ -1,6 +1,6 @@
 cd src/
 javac -cp '.:lib/json.jar' $1.java
 if [[ $? == 0 ]]; then
-  java -cp '.:lib/json.jar' $1
+  java -Dsun.java2d.opengl=true -cp '.:lib/json.jar' $1
 fi
 find . -name "*.class" -type f -delete

src/computerblocks/Game.java

@@ -72,7 +72,7 @@ private void loop() {
   }
 
   private void setup() {
-    grid = new Grid(300, 300, 3);
+    grid = new Grid(400, 400, 3);
     player = new Player(display, this);
     ui = new UserInterface();
     snippetTray = new SnippetTray(display);

src/computerblocks/Grid.java

@@ -216,6 +216,6 @@ public void propagate(Block source, Display display, Player player) {
 
       updateQueue = nextUpdateQueue;
     }
-    // System.out.println("iters: " + iterations);
+    System.out.println("iters: " + iterations);
   }
 }