Merge branch 'hotfix-0.1.1'

pr1csynth · Aug 23, 2016 · 051b485 · 051b485
2 parents 2af39e9 + 4987a91
commit 051b485
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/dist/mashine.jar b/dist/mashine.jar
diff --git a/lib/ola/protobuf-java-2.4.1.jar b/lib/ola/protobuf-java-2.4.1.jar
diff --git a/lib/ola/protobuf-java-2.6.1.jar b/lib/ola/protobuf-java-2.6.1.jar
diff --git a/src/mashine/Inputs.java b/src/mashine/Inputs.java
@@ -134,9 +134,9 @@ public double getRange(String inputName){
 		}
 	}
 
-	public void registerAction(String destination, Do action){	if(!actions.containsKey(destination)) actions.put(destination, action);}
-	public void registerState(String destination){  if(!states.contains(destination)) states.add(destination);}
-	public void registerRange(String destination){	if(!ranges.contains(destination)) ranges.add(destination);}
+	public void registerAction(String destination, Do action){ actions.put(destination, action);}
+	public void registerState(String destination){ states.add(destination);}
+	public void registerRange(String destination){ ranges.add(destination);}
 
 	public void link(String destination, String source){actionLinks.put(destination, source);}
 	public void range(String destination, String source){rangeLinks.put(destination, source);}

diff --git a/src/mashine/MaShine.java b/src/mashine/MaShine.java
@@ -21,7 +21,7 @@
 
 public class MaShine extends PApplet{
 
-	public static String VERSION = "0.1";
+	public static String VERSION = "0.1.1";
 
 	private static final String[] MAIN_WINDOW = new String[] { "mashine.MaShine" };
 	private String lastSavedTo = "";