mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-25 01:57:56 +01:00
Updated Upstream (Waterfall)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Waterfall Changes:
4960583
Add native macos DNS resolver
This commit is contained in:
parent
8275df5b4b
commit
51c4e52e4e
@ -1 +1 @@
|
||||
Subproject commit 845580021b932f07ea5882f08db76e548ac99c18
|
||||
Subproject commit 49605839bc79aa176429f3b965e3f988d840e154
|
@ -1,11 +1,11 @@
|
||||
From c5ebed82ea418dd7281481f4971080bdc70629e5 Mon Sep 17 00:00:00 2001
|
||||
From ac5a18e97dbbc5cb69352de75f38895c60433503 Mon Sep 17 00:00:00 2001
|
||||
From: Troy Frew <fuzzy_bot@arenaga.me>
|
||||
Date: Tue, 15 Nov 2016 08:56:43 -0500
|
||||
Subject: [PATCH] POM Changes
|
||||
|
||||
|
||||
diff --git a/api/pom.xml b/api/pom.xml
|
||||
index c2b55587d..1cd99ed30 100644
|
||||
index ca1ed8811..adec9d39f 100644
|
||||
--- a/api/pom.xml
|
||||
+++ b/api/pom.xml
|
||||
@@ -5,41 +5,41 @@
|
||||
@ -452,7 +452,7 @@ index db15febbc..a2efb5e52 100644
|
||||
<dependencies>
|
||||
<dependency>
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index bfec1abc2..0183f7148 100644
|
||||
index 56bb4a7aa..b3ee7b0cd 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -5,19 +5,19 @@
|
||||
@ -535,7 +535,7 @@ index 402266ca1..993cbca95 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
diff --git a/proxy/pom.xml b/proxy/pom.xml
|
||||
index 7a872a549..330697bc7 100644
|
||||
index ca1fc13b9..d67d1a5d3 100644
|
||||
--- a/proxy/pom.xml
|
||||
+++ b/proxy/pom.xml
|
||||
@@ -5,17 +5,17 @@
|
||||
@ -559,7 +559,7 @@ index 7a872a549..330697bc7 100644
|
||||
<description>Proxy component of the Elastic Portal Suite</description>
|
||||
|
||||
<properties>
|
||||
@@ -59,31 +59,31 @@
|
||||
@@ -65,31 +65,31 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
@ -646,5 +646,5 @@ index 8ce88f4a4..813696e45 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
--
|
||||
2.30.1
|
||||
2.31.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user