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 · 2025-04-01 13:44:02 +02:00 · 2025-04-01 13:14:55 +02:00 · 2025-03-27 20:11:42 +01:00 · 2025-03-24 12:11:44 +01:00 · 2025-03-20 19:47:46 +01:00
8 changed files with 1 additions and 1 deletions
--- a/mods/AdvancedBackups-neoforge-1.21-3.7.1.jar
+++ b/mods/AdvancedBackups-neoforge-1.21-3.7.1.jar
--- a/mods/CraterLib-NeoForge-1.21-2.1.3.jar
+++ b/mods/CraterLib-NeoForge-1.21-2.1.3.jar
--- a/mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar
+++ b/mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar
--- a/mods/SimpleDiscordLink-Universal-3.2.3.jar
+++ b/mods/SimpleDiscordLink-Universal-3.2.3.jar
--- a/mods/moreoverlays-1.23.2-mc1.21-neoforge.jar
+++ b/mods/moreoverlays-1.23.2-mc1.21-neoforge.jar
--- a/mods/noisium-neoforge-2.3.0+mc1.21-1.21.1.jar
+++ b/mods/noisium-neoforge-2.3.0+mc1.21-1.21.1.jar
--- a/mods/watermedia-2.1.23.jar
+++ b/mods/watermedia-2.1.23.jar
--- a/updateMods.bat
+++ b/updateMods.bat
@ -10,7 +10,7 @@ if %errorlevel% neq 0 (
        git init
        git remote add origin https://git.sfkao.net/SFKao/Las_3000-modpack.git
        git fetch     
-        git checkout -t origin/main -f
+        git checkout -t origin/server -f
    )
    call git fetch
    call git pull --rebase --autostash
Author	SHA1	Message	Date
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