Merge branch 'master' into 2.0.1

POE-Addon-Launcher · Dec 25, 2018 · a821262 · a821262
2 parents 66b2822 + 4359b18
commit a821262
Show file tree

Hide file tree

Showing 29 changed files with 69 additions and 0 deletions.
diff --git a/src/main/java/API/GithubHandler.java → src/PRE-2.0/main/java/API/GithubHandler.java b/src/main/java/API/GithubHandler.java → src/PRE-2.0/main/java/API/GithubHandler.java
diff --git a/src/main/java/GUI/Configurator.java → src/PRE-2.0/main/java/GUI/Configurator.java b/src/main/java/GUI/Configurator.java → src/PRE-2.0/main/java/GUI/Configurator.java
diff --git a/...ain/java/GUI/Configurator2Controller.java → ...ain/java/GUI/Configurator2Controller.java b/...ain/java/GUI/Configurator2Controller.java → ...ain/java/GUI/Configurator2Controller.java
diff --git a/...ain/java/GUI/Configurator_Controller.java → ...ain/java/GUI/Configurator_Controller.java b/...ain/java/GUI/Configurator_Controller.java → ...ain/java/GUI/Configurator_Controller.java
diff --git a/src/main/java/GUI/Data.java → src/PRE-2.0/main/java/GUI/Data.java b/src/main/java/GUI/Data.java → src/PRE-2.0/main/java/GUI/Data.java
diff --git a/src/main/java/GUI/Data2.java → src/PRE-2.0/main/java/GUI/Data2.java b/src/main/java/GUI/Data2.java → src/PRE-2.0/main/java/GUI/Data2.java
diff --git a/src/main/java/GUI/LauncherUI.java → src/PRE-2.0/main/java/GUI/LauncherUI.java b/src/main/java/GUI/LauncherUI.java → src/PRE-2.0/main/java/GUI/LauncherUI.java
diff --git a/src/main/java/GUI/LauncherUI_Controller.java → .../main/java/GUI/LauncherUI_Controller.java b/src/main/java/GUI/LauncherUI_Controller.java → .../main/java/GUI/LauncherUI_Controller.java
diff --git a/...main/java/GUI/PopUp/PopUp_Controller.java → ...main/java/GUI/PopUp/PopUp_Controller.java b/...main/java/GUI/PopUp/PopUp_Controller.java → ...main/java/GUI/PopUp/PopUp_Controller.java
diff --git a/src/main/java/GUI/PopUp/Popup.java → src/PRE-2.0/main/java/GUI/PopUp/Popup.java b/src/main/java/GUI/PopUp/Popup.java → src/PRE-2.0/main/java/GUI/PopUp/Popup.java
diff --git a/src/main/java/GUI/launcher_data.java → src/PRE-2.0/main/java/GUI/launcher_data.java b/src/main/java/GUI/launcher_data.java → src/PRE-2.0/main/java/GUI/launcher_data.java
diff --git a/src/main/java/Helper/QuickSorter.java → ...PRE-2.0/main/java/Helper/QuickSorter.java b/src/main/java/Helper/QuickSorter.java → ...PRE-2.0/main/java/Helper/QuickSorter.java
diff --git a/src/main/java/Helper/Release.java → src/PRE-2.0/main/java/Helper/Release.java b/src/main/java/Helper/Release.java → src/PRE-2.0/main/java/Helper/Release.java
diff --git a/...main/java/Helper/UpdateCheckerClient.java → ...main/java/Helper/UpdateCheckerClient.java b/...main/java/Helper/UpdateCheckerClient.java → ...main/java/Helper/UpdateCheckerClient.java
diff --git a/src/main/java/Launcher.java → src/PRE-2.0/main/java/Launcher.java b/src/main/java/Launcher.java → src/PRE-2.0/main/java/Launcher.java
diff --git a/src/main/java/PAL/PALsettings.java → src/PRE-2.0/main/java/PAL/PALsettings.java b/src/main/java/PAL/PALsettings.java → src/PRE-2.0/main/java/PAL/PALsettings.java
diff --git a/src/main/resources/Configurator2.fxml → ...PRE-2.0/main/resources/Configurator2.fxml b/src/main/resources/Configurator2.fxml → ...PRE-2.0/main/resources/Configurator2.fxml
diff --git a/src/main/resources/Launcher.fxml → src/PRE-2.0/main/resources/Launcher.fxml b/src/main/resources/Launcher.fxml → src/PRE-2.0/main/resources/Launcher.fxml
diff --git a/src/main/resources/Path.fxml → src/PRE-2.0/main/resources/Path.fxml b/src/main/resources/Path.fxml → src/PRE-2.0/main/resources/Path.fxml
diff --git a/src/PRE-2.0/main/resources/bgi_big.png b/src/PRE-2.0/main/resources/bgi_big.png
diff --git a/src/PRE-2.0/main/resources/cancel.png b/src/PRE-2.0/main/resources/cancel.png
diff --git a/src/PRE-2.0/main/resources/cancel0.png b/src/PRE-2.0/main/resources/cancel0.png
diff --git a/src/main/resources/gear0.png → src/PRE-2.0/main/resources/gear0.png b/src/main/resources/gear0.png → src/PRE-2.0/main/resources/gear0.png
diff --git a/src/main/resources/gear1.png → src/PRE-2.0/main/resources/gear1.png b/src/main/resources/gear1.png → src/PRE-2.0/main/resources/gear1.png
diff --git a/src/main/resources/popup.fxml → src/PRE-2.0/main/resources/popup.fxml b/src/main/resources/popup.fxml → src/PRE-2.0/main/resources/popup.fxml
diff --git a/src/PRE-2.0/main/resources/witch.png b/src/PRE-2.0/main/resources/witch.png
diff --git a/src/PRE-2.0/pom.xml b/src/PRE-2.0/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>RizlimDev</groupId>
+    <artifactId>PoE-Addon-Manager-Launcher</artifactId>
+    <version>1.7</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.6</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.kohsuke</groupId>
+            <artifactId>github-api</artifactId>
+            <version>1.93</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>Launcher</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>Launcher</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+        </plugins>
+
+    </build>
+
+</project>
diff --git a/src/test/java/Helper/QuickSorterTest.java → ...2.0/test/java/Helper/QuickSorterTest.java b/src/test/java/Helper/QuickSorterTest.java → ...2.0/test/java/Helper/QuickSorterTest.java
diff --git a/src/test/java/Helper/ReleaseTest.java → ...PRE-2.0/test/java/Helper/ReleaseTest.java b/src/test/java/Helper/ReleaseTest.java → ...PRE-2.0/test/java/Helper/ReleaseTest.java