Merge branch 'release-2.1.1'

stfc · Nov 6, 2017 · 21908cc · 21908cc
2 parents 64d07a3 + 53001e0
commit 21908cc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,10 @@
 Changelog
 
+========== Version 2.1.1 ==========
+
+Patches and Bug Fixes:
+- Change website URL to point to STFC repository
+
 ========== Version 2.1.0 ==========
 
 Minor Changes:

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>org.ardublock</groupId>
 	<artifactId>ardublock</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 	<name>ArduBlock</name>
 	<description>A Block Programming Language for Arduino</description>
 	<properties>

diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -160,7 +160,7 @@ public void actionPerformed(ActionEvent e) {
 			    URL url;
 			    if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
 			        try {
-						url = new URL("https://github.com/gregcorbett/ardublock");
+						url = new URL("https://github.com/stfc/ardublock");
 			            desktop.browse(url.toURI());
 			        } catch (Exception e1) {
 			            e1.printStackTrace();

diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties
@@ -438,7 +438,7 @@ ardublock.ui.create_refer=create reference
 ardublock.ui.website=Go to Web Site
 ardublock.ui.serialMonitor=Serial Monitor
 ardublock.ui.saveImage=Save as image...
-ardublock.ui.version=2.1.0
+ardublock.ui.version=2.1.1
 
 ardublock.error_msg.digital_var_slot=Digital variable slot must take a 'digital variable' name.\nHint: Look at the 'variable' socket on the highlighted block
 ardublock.error_msg.number_var_slot=Standard variable slot must take a standard 'numeric' variable name.\nHint: Look at the 'variable' socket on the highlighted block