From 85cb20e23daf71cf9e0ba260ae7b6e639f8c2914 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 26 Feb 2024 15:42:56 -0500 Subject: [PATCH 1/2] renames urls in gitmodules to current updated names of the repos --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 17c3cc026..903904103 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,10 @@ [submodule "assets"] path = assets - url = https://github.com/FunkinCrew/Funkin-history-rewrite-assets + url = https://github.com/FunkinCrew/Funkin-Assets-secret branch = master update = merge [submodule "art"] path = art - url = https://github.com/FunkinCrew/Funkin-history-rewrite-art + url = https://github.com/FunkinCrew/Funkin-Art-secret branch = master update = merge From 5dafd5409794aeb28089132cee507595dd0c44aa Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 27 Feb 2024 22:09:09 -0500 Subject: [PATCH 2/2] update submodules, and add change from other PR --- .gitmodules | 4 ---- assets | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 903904103..452c0089b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,6 @@ [submodule "assets"] path = assets url = https://github.com/FunkinCrew/Funkin-Assets-secret - branch = master - update = merge [submodule "art"] path = art url = https://github.com/FunkinCrew/Funkin-Art-secret - branch = master - update = merge diff --git a/assets b/assets index cb0fbb56b..f8c259584 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit cb0fbb56b9667f68a9776a216c16a4e2b29f7096 +Subproject commit f8c2595844eff9375b522f117bfdadbdc6728c49