diff --git a/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch b/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch index 40407d0..607ef08 100644 --- a/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch +++ b/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch @@ -1,4 +1,4 @@ -From 4a3bbce9c7aece2f8f6121dee46c24a94a5eb2de Mon Sep 17 00:00:00 2001 +From a55de5a537a9b50c470e67e77608d702d830e40b Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 11:34:52 -0700 Subject: [PATCH] Fetch modules from the Waterfall CI @@ -6,28 +6,23 @@ Subject: [PATCH] Fetch modules from the Waterfall CI Don't fetch from the BungeeCord CI, as that only has their modules diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java -index 2536435c..11d9823f 100644 +index 2536435c..e1cf0010 100644 --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java -@@ -1,12 +1,13 @@ +@@ -1,10 +1,10 @@ package net.md_5.bungee.module; -import com.google.common.io.ByteStreams; -import com.google.common.io.Files; -+import lombok.Data; -+import net.md_5.bungee.Util; -+ import java.io.IOException; import java.net.URL; import java.net.URLConnection; --import lombok.Data; --import net.md_5.bungee.Util; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; + import lombok.Data; + import net.md_5.bungee.Util; - @Data - public class JenkinsModuleSource implements ModuleSource -@@ -18,13 +19,14 @@ public class JenkinsModuleSource implements ModuleSource +@@ -18,13 +18,14 @@ public class JenkinsModuleSource implements ModuleSource System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() ); try { @@ -45,5 +40,5 @@ index 2536435c..11d9823f 100644 } catch ( IOException ex ) { -- -2.11.1 +2.12.0 diff --git a/BungeeCord-Patches/0010-Fix-unicode-characters-in-configuration-files.patch b/BungeeCord-Patches/0010-Fix-unicode-characters-in-configuration-files.patch index 90ce274..ac5fd25 100644 --- a/BungeeCord-Patches/0010-Fix-unicode-characters-in-configuration-files.patch +++ b/BungeeCord-Patches/0010-Fix-unicode-characters-in-configuration-files.patch @@ -1,11 +1,11 @@ -From 2b84f26c4d3b06e90badd6260f35745967817f0e Mon Sep 17 00:00:00 2001 +From 3db58d4b09ae6d1d289033f12cf8e40ccf9eeaf4 Mon Sep 17 00:00:00 2001 From: kamcio96 Date: Sat, 21 May 2016 17:17:36 -0600 Subject: [PATCH] Fix unicode characters in configuration files diff --git a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java -index db8aa4b..9258d7d 100644 +index db8aa4be..9258d7dd 100644 --- a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java +++ b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java @@ -1,16 +1,25 @@ @@ -53,5 +53,5 @@ index db8aa4b..9258d7d 100644 return load( reader, defaults ); } -- -2.8.2 +2.12.0