Merge pull request #115 from Stabrinai/master

bump Energie version and fix build

Plugin/pom.xml

@@ -33,7 +33,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
+				<version>3.5.2</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -46,6 +46,7 @@
 									<include>de.Linus122.TimeIsMoney:*</include>
 									<include>xyz.spaceio:SpaceGUI</include>
 									<include>xyz.spaceio:Metrics</include>
+									<include>com.github.Euphillya:Energie</include>
 								</includes>
 							</artifactSet>
 							<relocations>
@@ -53,6 +54,10 @@
 									<pattern>xyz.spaceio</pattern>
 									<shadedPattern>de.Linus122.net.xyz.spaceio</shadedPattern>
 								</relocation>
+								<relocation>
+									<pattern>fr.euphyllia</pattern>
+									<shadedPattern>de.Linus122.fr.euphyllia</shadedPattern>
+								</relocation>
 							</relocations>
 						</configuration>
 					</execution>
@@ -88,7 +93,7 @@
 		<dependency>
 			<groupId>com.github.Euphillya</groupId>
 			<artifactId>Energie</artifactId>
-			<version>5659f25e22</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.ess3</groupId>

Plugin/src/main/java/de/Linus122/TimeIsMoney/Main.java

@@ -102,7 +102,7 @@ public class Main extends JavaPlugin {
 	@Override
 	public void onEnable() {
 
-		scheduler = new Energie(this).getScheduler(Energie.SchedulerSoft.MINECRAFT);
+		scheduler = new Energie(this).getMinecraftScheduler();
 		this.getCommand("timeismoney").setExecutor(new Cmd(this));
 		PL_VERSION = this.getDescription().getVersion();
 		

Plugin/src/main/resources/plugin.yml

@@ -4,12 +4,9 @@ description: Gives money for online time
 author: Linus122
 website: "https://www.spigotmc.org/resources/time-is-money.12409/"
 main: de.Linus122.TimeIsMoney.Main
-<<<<<<< master
+
 api-version: 1.13
 folia-supported: true
-=======
-api-version: 1.13.2
->>>>>>> master
 
 depend: [Vault]
 softdepend: [Essentials, PlaceholderAPI]