diff --git a/BudgetMasterClient/pom.xml b/BudgetMasterClient/pom.xml index b0fdd520948f2ecc4bc83b02386548fb4d112f37..1d5b244e408e3d9a76a5227bf4ce0956747e3f30 100644 --- a/BudgetMasterClient/pom.xml +++ b/BudgetMasterClient/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.deadlocker8</groupId> <artifactId>BudgetMasterClient</artifactId> - <version>1.7.0_alpha</version> + <version>1.7.0</version> <name>BudgetMasterClient</name> <build> <plugins> diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties index ce292cf5b695c5a2de55e089129122bd2c72438b..3c9a5ea1f9bb7715a0db34755aebf2f0c3935d5d 100644 --- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties +++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties @@ -1,8 +1,8 @@ # DEFAULT app.name=BudgetMaster version.code=11 -version.name=1.7.0_alpha -version.date=03.10.17 +version.name=1.7.0 +version.date=26.10.17 author=Robert Goldmann credits=L�nderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties index 0017bdb0006affb31af2c105ef9f944f193fee0e..f0cb6b14861e1c236799a5a2785d171633ad8f60 100644 --- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties +++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties @@ -1,8 +1,8 @@ # DEFAULT app.name=BudgetMaster version.code=11 -version.name=1.7.0_alpha -version.date=03.10.17 +version.name=1.7.0 +version.date=26.10.17 author=Robert Goldmann credits=Flags by Freepik on https://www.flaticon.com\nFonts used: OpenSans diff --git a/BudgetMasterServer/.classpath b/BudgetMasterServer/.classpath index 8e795b1c7e0c65a33e55e6a4fe23c4a11dd9e703..fae1a2b37d5e3386c9651caedb78b9bd107715bd 100644 --- a/BudgetMasterServer/.classpath +++ b/BudgetMasterServer/.classpath @@ -22,7 +22,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml index b9d7f0dbad7d1240133c97dfdb9d3e12763acd46..0a022441b5bd9151224aec81871cea2c5bf2e5e9 100644 --- a/BudgetMasterServer/pom.xml +++ b/BudgetMasterServer/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.deadlocker8</groupId> <artifactId>BudgetMasterServer</artifactId> - <version>1.7.0_alpha</version> + <version>1.7.0</version> <name>BudgetMasterServer</name> <build> <plugins> diff --git a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties index df6e79da5a70bdf490ae74c08d38ab70cb375bd4..5cb7f01cc467be6ffc386715960412e28a2df9c3 100644 --- a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties +++ b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties @@ -1,7 +1,7 @@ app.name=BudgetMasterServer version.code=11 -version.name=1.7.0_alpha -version.date=03.10.17 +version.name=1.7.0 +version.date=26.10.17 author=Robert Goldmann category.none=No Category diff --git a/build/BudgetMaster.exe b/build/BudgetMaster.exe index 8f3cc2cdfbe17ffc4462c0c8b75a4baacbef2f80..bf47c71db09e77c36e79047a082a567414c081b6 100644 Binary files a/build/BudgetMaster.exe and b/build/BudgetMaster.exe differ diff --git a/build/BudgetMasterClient.jar b/build/BudgetMasterClient.jar index 2cc65b521323311ffafd9c130757d90797b2a6f4..8a48c9429ec34d87b4670b1a46a6f423d3e16db5 100644 Binary files a/build/BudgetMasterClient.jar and b/build/BudgetMasterClient.jar differ diff --git a/build/BudgetMasterServer.jar b/build/BudgetMasterServer.jar index da8339bbc21ff0df81bd6c6cb7b22e811b2daa14..a66a4e59a296d091fdfa41123331d072273c6a6d 100644 Binary files a/build/BudgetMasterServer.jar and b/build/BudgetMasterServer.jar differ