Commit Graph
90 Commits
Author SHA1 Message Date
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 30f80f254a Revert updating little tiles 2025-08-18 14:49:06 +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 3e83a0e050 CAMBIADO FORGE VERSION, MIRAR GIT PARA COMO CAMBIARLO
Actualizado todo
2025-08-18 13:54:01 +02:00
SFKao 9ffc04d939 Added decoration mods from ATM10, updated EMI 2025-08-18 13:43:41 +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 503b623df3 Updated mods, added some addons for cobblemon 2025-04-06 12:59:30 +02:00
SFKao 7fd57a4a24 Merge remote-tracking branch 'origin/main' into server 2025-04-01 13:44:02 +02:00
SFKao 463e3d0e97 Whataburger????? 2025-04-01 13:43:40 +02:00
SFKao d2cfa524ae Merge remote-tracking branch 'origin/main' into server 2025-04-01 13:14:55 +02:00
SFKao 46610f3108 Added food and furniture, updated mega showdown and artifacts 2025-04-01 13:14:04 +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 cf22fcdfe7 Updated mods 2025-03-27 20:10:32 +01:00
SFKao bbf4fc2fb1 Merge remote-tracking branch 'origin/main' into server 2025-03-24 12:11:44 +01:00
SFKao e91b5ae817 Updated mods, added pokeFUCK 2025-03-24 12:11:09 +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 0c4e32d68f Updated mods 2025-03-20 19:46:42 +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 85e28c523e Added lootr, removed coins from chests 2025-03-15 11:19:28 +01:00
SFKao 257b5af7fb Merge remote-tracking branch 'origin/main' into server 2025-03-14 16:11:16 +01:00
SFKao 5143750e05 Added jei to see create recipes 2025-03-14 16:10:57 +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 5fda3b09fd REQUIERE ACTUALIZAR MODLOADER, MIRAR GIT PARA COMO
Actualizados mods
2025-03-14 15:59:17 +01:00
SFKao 6c8f1b874c Actualizar README.md 2025-03-14 15:57:55 +01:00
SFKao 1bf6f96c85 Actualizar README.md 2025-03-14 15:53:30 +01:00
SFKao b7f5f2a398 Actualizar README.md 2025-03-14 15:53:15 +01:00
SFKao d298db2289 Actualizar README.md 2025-03-14 15:44:36 +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 863d9a0320 Actualizar README.md 2025-03-13 21:21:04 +01:00
SFKao b75b282a70 Merge remote-tracking branch 'origin/main' into server 2025-03-13 10:06:50 +01:00
SFKao ccd3a69fb6 Added the Myths and legends datapack, the mods requires it 2025-03-13 10:06:20 +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 fd852f7b20 Added moreOverlays and dynamic lights 2025-03-11 11:29:01 +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 8d2992a840 Updated mods and added addon so JEI works on applied energistics 2025-03-10 17:35:51 +01:00
SFKao 6ab2f9dab3 Actualizar README.md 2025-03-08 18:30:45 +01:00
SFKao 5382a6e2e6 Resource pack para el cobre antiguo 2025-03-08 13:18:07 +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 c7815ec5c1 Updated mods 2025-03-08 08:49:43 +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 49b8a1c13f Gadgets 2025-03-07 22:32:54 +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 a228ea7dea Updated create and added extra cobblemon mods 2025-03-06 21:13:28 +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