Compare commits

..
21 Commits
Author SHA1 Message Date
SFKao 3d33993743 Resource packs 2025-08-20 19:40:09 +02:00
SFKao b3265dec79 Merge remote-tracking branch 'origin/sho-create' 2025-08-18 19:40:35 +02:00
Eloy Garcia 7710037d70 Addons y demas 2025-08-18 19:39:55 +02:00
SFKao 6f2f95db1f Merge remote-tracking branch 'origin/sho-create' 2025-08-18 18:57:19 +02:00
Eloy Garcia 605f69cd17 El resto 2025-08-18 18:56:17 +02:00
Eloy Garcia e861aca90b Biomes, Apple, Artifacts 2025-08-18 18:51:14 +02:00
Eloy Garcia 42a58f557a AE2 + CoBreeding 2025-08-18 18:48:45 +02:00
SFKao b13d4a1fa5 Merge remote-tracking branch 'origin/sho-create'
# Conflicts:
#	mods/balm-neoforge-1.21.1-21.0.49.jar
2025-08-18 18:35:54 +02:00
Eloy Garcia f09fdee961 AllTheMons 2025-08-18 18:34:32 +02:00
Eloy Garcia 04db45b050 Cobble Addons 2025-08-18 18:31:09 +02:00
Eloy Garcia 5a8c892f75 Mega Showdown 2025-08-18 18:26:16 +02:00
Eloy Garcia f678ae2586 Parting Gifts 2025-08-18 18:23:38 +02:00
Eloy Garcia 0fd15ea8bc Ride On 2025-08-18 18:20:28 +02:00
Eloy Garcia 667b3772c6 SimpleTMs 2025-08-18 18:14:43 +02:00
SFKao df2645f062 Merge remote-tracking branch 'origin/sho-create' 2025-08-18 18:01:33 +02:00
SFKao 9e83b67d7c Waystones update 2025-08-18 17:59:12 +02:00
Eloy Garcia e8b50c6623 Create + Journeymap 2025-08-18 17:58:38 +02:00
SFKao 0c3dbc83ca Remove 1 balm 2025-08-18 17:57:11 +02:00
SFKao 1ad7faecbf Added balm and cooking for blockheads 2025-08-18 17:50:27 +02:00
SFKao ff9b59bb07 Revert "CAMBIADO FORGE VERSION, MIRAR GIT PARA COMO CAMBIARLO"
This reverts commit 3e83a0e050.
2025-08-18 14:55:07 +02:00
SFKao 30f80f254a Revert updating little tiles 2025-08-18 14:49:06 +02:00
35 changed files with 1 additions and 40 deletions

No files matched your search

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -10,7 +10,7 @@ if %errorlevel% neq 0 (
git init git init
git remote add origin https://git.sfkao.net/SFKao/Las_3000-modpack.git git remote add origin https://git.sfkao.net/SFKao/Las_3000-modpack.git
git fetch git fetch
git checkout -t origin/server -f git checkout -t origin/main -f
) )
call git fetch call git fetch
call git pull --rebase --autostash call git pull --rebase --autostash
-39
View File
@@ -1,39 +0,0 @@
#!/bin/bash
cd "$(dirname "$0")" || exit 1
echo "Iniciando"
# Check if git is installed
if ! command -v git >/dev/null 2>&1; then
echo "Git no está instalado"
echo "Instálalo desde https://git-scm.com/downloads"
exit 1
fi
# If not already a git repo, initialize and fetch
if [ ! -d ".git" ]; then
echo "Git no esta inicializado"
git init
git remote add origin http://127.0.0.1:11001/SFKao/Las_3000-modpack.git
git fetch
git checkout -t origin/server -f
fi
echo "Bajando..."
# Fetch and pull updates
if ! git fetch --progress || ! git pull --rebase --autostash --progress; then
echo "Han habido errores actualizando, contactar con SFKao"
exit 1
fi
# === Sync datapacks ===
SOURCE="./datapacks"
TARGET="./world/datapacks"
if [ -d "$SOURCE" ]; then
echo "Sincronizando datapacks..."
mkdir -p "$TARGET"
rm -rf "$TARGET"/*
cp -r "$SOURCE"/* "$TARGET"/
echo "Datapacks copiados en $TARGET"
else
echo "No se encontró la carpeta $SOURCE"
fi