From 1587447f483cde46a3dde0fc54e09839f4246d4b Mon Sep 17 00:00:00 2001 From: sys4 Date: Sat, 4 May 2019 20:51:56 +0200 Subject: [PATCH] =?UTF-8?q?[homedecor=5Fmodpack]=20Corrige=20le=20merge=20?= =?UTF-8?q?pr=C3=A9c=C3=A9dent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 8 ++++---- homedecor_modpack | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index f66bf2b..288dad5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -546,10 +546,6 @@ path = serverguide url = https://sys4.fr/gitea/nalc/serverguide.git branch = nalc-1.1 -[submodule "homedecor_modpack"] - path = homedecor_modpack - url = https://sys4.fr/gitea/nalc/homedecor_modpack.git - branch = nalc-1.2 [submodule "basic_materials"] path = basic_materials url = https://sys4.fr/gitea/nalc/basic_materials.git @@ -566,3 +562,7 @@ path = technic url = https://sys4.fr/gitea/nalc/technic.git branch = master +[submodule "homedecor_modpack"] + path = homedecor_modpack + url = https://sys4.fr/gitea/nalc/homedecor_modpack.git + branch = nalc-1.2 diff --git a/homedecor_modpack b/homedecor_modpack index 1520d27..fb0ca9a 160000 --- a/homedecor_modpack +++ b/homedecor_modpack @@ -1 +1 @@ -Subproject commit 1520d27a73dd25d422c9599876952dab9196d56c +Subproject commit fb0ca9a15c487ebd5af8cf26a9060de18b596c91