Compare commits

...
59 Commits
Author SHA1 Message Date
SFKao 17aea7d942 Merge remote-tracking branch 'origin/main' into server 2025-08-18 19:41:01 +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 6682751a97 Merge remote-tracking branch 'origin/main' into server
# Conflicts:
#	mods/ImmediatelyFast-NeoForge-1.6.6+1.21.1.jar
#	mods/watermedia-2.1.30.jar
2025-08-18 18:58:18 +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 8109d6f937 Merge remote-tracking branch 'origin/main' into server 2025-08-18 18:36:22 +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 e611f39e49 Merge remote-tracking branch 'origin/main' into server 2025-08-18 18:02:16 +02:00
SFKao df2645f062 Merge remote-tracking branch 'origin/sho-create' 2025-08-18 18:01:33 +02:00
SFKao 3efac93a22 Merge remote-tracking branch 'origin/main' into server 2025-08-18 17:59:39 +02:00
SFKao 9e83b67d7c Waystones update 2025-08-18 17:59:12 +02:00
SFKao d7db2f577b Merge remote-tracking branch 'origin/main' into server 2025-08-18 17:57:27 +02:00
SFKao 0c3dbc83ca Remove 1 balm 2025-08-18 17:57:11 +02:00
SFKao 257b8e5d2f Merge remote-tracking branch 'origin/main' into server 2025-08-18 17:55:33 +02:00
SFKao 1ad7faecbf Added balm and cooking for blockheads 2025-08-18 17:50:27 +02:00
SFKao e3cdbab634 Merge branch 'main' into server
# Conflicts:
#	mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar
#	mods/watermedia-2.1.23.jar
2025-08-18 14:56:20 +02:00
SFKao 59dc6498fc Merge pull request 'Revert updating little tiles' (#14) from main into server
Reviewed-on: #14
2025-08-18 14:51:15 +02:00
SFKao 805fd84a86 Actualizar updateMods.sh 2025-08-18 14:38:05 +02:00
SFKao 3eff33a750 Actualizar updateMods.sh 2025-08-18 14:34:22 +02:00
SFKao a6e5ee5a46 Subir archivos a "/" 2025-08-18 14:27:43 +02:00
SFKao f8f2af651b Merge branch 'main' into server
# Conflicts:
#	mods/ImmediatelyFast-NeoForge-1.6.6+1.21.1.jar
#	mods/watermedia-2.1.30.jar
2025-08-18 13:59:28 +02:00
SFKao fc93ed868b Merge remote-tracking branch 'origin/main' into server
# Conflicts:
#	mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar
2025-04-06 13:05:23 +02:00
SFKao 7fd57a4a24 Merge remote-tracking branch 'origin/main' into server 2025-04-01 13:44:02 +02:00
SFKao d2cfa524ae Merge remote-tracking branch 'origin/main' into server 2025-04-01 13:14:55 +02:00
SFKao beeb8d4874 Merge remote-tracking branch 'origin/main' into server
# Conflicts:
#	mods/watermedia-2.1.23.jar
2025-03-27 20:11:42 +01:00
SFKao bbf4fc2fb1 Merge remote-tracking branch 'origin/main' into server 2025-03-24 12:11:44 +01:00
SFKao 516901ae85 Merge remote-tracking branch 'origin/main' into server
# Conflicts:
#	mods/ImmediatelyFast-NeoForge-1.6.2+1.21.1.jar
#	mods/watermedia-2.1.22.jar
2025-03-20 19:47:46 +01:00
SFKao 58c6302bb7 Merge remote-tracking branch 'origin/main' into server 2025-03-15 11:20:13 +01:00
SFKao 03ed0c0af0 Added backups 2025-03-15 11:20:03 +01:00
SFKao 257b5af7fb Merge remote-tracking branch 'origin/main' into server 2025-03-14 16:11:16 +01:00
SFKao d63921975b Merge remote-tracking branch 'origin/main' into server 2025-03-14 16:03:12 +01:00
SFKao b7aa589cf0 Merge branch 'server' of https://git.sfkao.net/SFKao/Las_3000-modpack into server 2025-03-14 16:03:04 +01:00
SFKao 2c44b01e07 Merge pull request 'Updated mods' (#10) from main into server
Reviewed-on: #10
2025-03-14 15:43:29 +01:00
SFKao b75b282a70 Merge remote-tracking branch 'origin/main' into server 2025-03-13 10:06:50 +01:00
SFKao a074f817f4 Removed client only mod 2025-03-11 11:32:08 +01:00
SFKao bbccf165b5 Merge remote-tracking branch 'origin/main' into server 2025-03-11 11:29:35 +01:00
SFKao a576d6c6d9 Merge remote-tracking branch 'origin/main' into server
# Conflicts:
#	README.md
#	mods/ImmediatelyFast-NeoForge-1.6.1+1.21.1.jar
2025-03-10 17:37:24 +01:00
SFKao 310c86082e Merge remote-tracking branch 'origin/main' into server
# Conflicts:
#	mods/ImmediatelyFast-NeoForge-1.6.0+1.21.1.jar
#	mods/watermedia-2.1.21.jar
2025-03-08 08:56:12 +01:00
SFKao 61018ac949 Merge pull request 'Gadgets' (#9) from main into server
Reviewed-on: #9
2025-03-07 22:33:30 +01:00
SFKao b15510147a Merge pull request 'Updated create and added extra cobblemon mods' (#8) from main into server
Reviewed-on: #8
2025-03-06 21:14:42 +01:00
SFKao 3ff031dce2 Merge branch 'server' of https://git.sfkao.net/SFKao/Las_3000-modpack into server 2025-03-04 17:26:35 +01:00
SFKao 8e76306ff8 Added performance mods and discord 2025-03-04 17:26:19 +01:00
SFKao 6f67c1e0b9 Eliminar mods/ImmediatelyFast-NeoForge-1.3.5+1.21.1.jar 2025-03-04 10:51:08 +01:00
SFKao d04db0a512 Merge pull request 'main' (#7) from main into server
Reviewed-on: #7
2025-03-04 10:50:52 +01:00
SFKao d0eeae5338 Merge pull request 'Sync server' (#5) from main into server
Reviewed-on: #5
2025-03-03 22:22:53 +01:00
SFKao 070f9a079b Eliminar README.md 2025-03-03 21:55:52 +01:00
SFKao 100e0c83be Merge pull request 'Removed dissabled mods' (#2) from main into server
Reviewed-on: #2
2025-03-03 21:55:38 +01:00
SFKao 348cea31d4 Actualizar updateMods.bat 2025-03-03 18:53:09 +01:00
SFKao ce0389b5ad Actualizar updateMods.bat 2025-03-03 16:45:51 +01:00
SFKao d405f1dda7 Eliminar mods/watermedia-2.1.19.jar 2025-03-03 16:33:59 +01:00
97 changed files with 40 additions and 1 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.
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/main -f git checkout -t origin/server -f
) )
call git fetch call git fetch
call git pull --rebase --autostash call git pull --rebase --autostash
+39
View File
@@ -0,0 +1,39 @@
#!/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