Commit Graph
61 Commits
Author SHA1 Message Date
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
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
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 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
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 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 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 49b8a1c13f Gadgets 2025-03-07 22:32:54 +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
SFKao 8e76306ff8 Added performance mods and discord 2025-03-04 17:26:19 +01:00
SFKao 978513b1eb Added ImmediatelyFast-NeoForge-1.3.5+1.21.1 so it goes faster 2025-03-04 10:47:33 +01:00
SFKao 0f518ae21d Fixed menus 2025-03-03 22:21:51 +01:00
SFKao 12d9574390 Deleted dissabled mods 2025-03-03 21:52:12 +01:00
SFKao 4d9a0d3c0d removed test.txt 2025-03-03 16:03:21 +01:00
SFKao 459f9b1047 Test 2 2025-03-03 15:58:05 +01:00
SFKao b8a48dacd8 Fixed bat 2025-03-03 15:57:03 +01:00
SFKao 27491713eb Test 2025-03-03 15:38:13 +01:00
SFKao d5d1794c34 1.0.6 2025-03-03 15:36:59 +01:00
SFKao 9a8843b4ae 1.0.6 2025-03-03 15:35:18 +01:00