From 21c9f4fbadcd2087878a2045f30059424d0ab828 Mon Sep 17 00:00:00 2001 From: Kevin Raneri Date: Mon, 7 Mar 2022 18:36:21 -0500 Subject: [PATCH] Update Upstream (Airplane) --- gradle.properties | 2 +- patches/server/0004-Revert-Sentry-Logging-Support.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 77986a5c9..78a44f473 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ group=gg.pufferfish.pufferfish version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 packageVersion=1_17_1_R1 -airplaneRef=74774a007ecdec5aa48a40b06e54858bec5872e1 +airplaneRef=c253f344943cf3639695a7b38913ee90f36022c7 diff --git a/patches/server/0004-Revert-Sentry-Logging-Support.patch b/patches/server/0004-Revert-Sentry-Logging-Support.patch index 4df419259..00ac8de35 100644 --- a/patches/server/0004-Revert-Sentry-Logging-Support.patch +++ b/patches/server/0004-Revert-Sentry-Logging-Support.patch @@ -6,12 +6,12 @@ Subject: [PATCH] Revert "Sentry Logging Support" This reverts commit 74c0b90cc6569a2b367c63482bbc79688ae6fb2d. diff --git a/build.gradle.kts b/build.gradle.kts -index 2f9bef70be115c09a22594f704841b70d8e8aab0..9102d29622f93e824525eeef3420a6aa2b7ebb30 100644 +index 97e262daaf7b26705b80609244198b83055b900b..3261b23f39a73d6114cf997d539ad03793eebb45 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,8 +65,6 @@ dependencies { } // Airplane - more config - implementation("com.github.technove:Flare:2c4a2114a0") // Airplane - flare + implementation("com.github.technove:Flare:34637f3f87") // Airplane - flare - implementation("io.sentry:sentry:5.4.0") // Airplane -