Merge remote-tracking branch 'remotes/origin/master' into C_keybindings

This commit is contained in:
Jessica Syder
2017-09-04 13:23:55 +12:00
59 changed files with 2211 additions and 676 deletions
@@ -95,15 +95,15 @@ public class App extends Application {
);
updateMessage("Preparing ingredients . . .");
Thread.sleep(1000);
Thread.sleep(200);
for (int i = 0; i < burgerFilling.size(); i++) {
Thread.sleep(800);
Thread.sleep(100);
updateProgress(i + 1, burgerFilling.size());
String nextFilling = burgerFilling.get(i);
addedFilling.add(nextFilling);
updateMessage("Adding the " + nextFilling + " . . .");
}
Thread.sleep(400);
Thread.sleep(100);
updateMessage("Burger's done!");
return addedFilling;