From f849bcaf04046a9f2506732ce1230b9e9d59bb95 Mon Sep 17 00:00:00 2001 From: Hugo Planque Date: Thu, 11 Mar 2021 21:09:52 +0100 Subject: [PATCH 1/2] Upstream tuinity --- .gitmodules | 2 +- Tuinity | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a6c443e5d..f4ae6785a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "Tuinity"] path = Tuinity url = https://github.com/Spottedleaf/Tuinity - branch = ver/1.15.2 + branch = master diff --git a/Tuinity b/Tuinity index 03ad94df5..19ac6608f 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 03ad94df5dc894fda3e24cbe3a140f887c513ab4 +Subproject commit 19ac6608f3035459bfbad0059f342d719c9050a3 From ad25e7ef021a5448bb4c45ac6553ff8485fd08d5 Mon Sep 17 00:00:00 2001 From: Hugo Planque Date: Thu, 11 Mar 2021 21:16:58 +0100 Subject: [PATCH 2/2] Updated Upstream (Tuinity) /e/Developpement/dev/Akarin 1 Tuinity Changes: 5b6d8be Updated Upstream (Paper) 81d5fc1 Fix NPE in pickup logic for arrow --- Tuinity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tuinity b/Tuinity index 19ac6608f..5b6d8beec 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 19ac6608f3035459bfbad0059f342d719c9050a3 +Subproject commit 5b6d8beec8c4b3db1c522122539400e11dd28313