New instruments merged

README.md

@@ -1,6 +1,6 @@
 Super Mario Paint
 ==========
-* Current Version: 1.1.2.1
+* Current Version: 1.3.0
 
 Help would be very much appreciated! If you manage to debug something, submit a pull request and I'll review it and (hopefully) merge it in.
 
@@ -15,6 +15,8 @@ Accepting cryptocurrency donations!
 Major Releases:
 -----
 See "Version History.txt" for semantic versioning and more release notes.
+* March 9, 2019 - v1.3.0 release
+* March 4, 2019 - v1.2.1 release
 * February 4, 2018 - v1.1.1 release
 * January 29, 2018 - First relatively major functionality upgrade, v1.1.0
 * June 2017 - Addition of team member j574y923 

Version History.txt

@@ -17,7 +17,7 @@ v1.3.0
     Ctrl and/or shift increases scroll speed
     Adds Luigi, Peach, and Feather as instruments
 
-v1.2.0
+v1.2.0/v1.2.1
 --FIXES
 
     Fixed song name text field focus issues--click anywhere other than the text field to defocus it
@@ -33,6 +33,7 @@ v1.2.0
     Load song's soundfont when loading song
     Load soundfonts for every song in an arrangement
     Load existing soundfonts from AppData
+(v1.2.1 is a bugfix on the main window loading)
 
 v1.1.1
 --FIXES

src/smp/SuperMarioPaint.java

@@ -49,13 +49,14 @@
  * Dev team: 
  * RehdBlob (2012 - current)
  * j574y923 (2017 - current)
+ * SeymourSchlong (2018 - current)
  *
  *
  * @author RehdBlob
  * @author j574y923
  * 
  * @since 2012.08.16
- * @version 1.2.1
+ * @version 1.3.0
  */
 public class SuperMarioPaint extends Application {
 

src/smp/stateMachine/Settings.java

@@ -16,7 +16,7 @@
 public class Settings {
 
     /** The current version number of this program. */
-    public final static String version = "v1.2.0";
+    public final static String version = "v1.3.0";
 
     /** The name of the file that we write to. */
     private final static String settingsFile = "settings.data";