 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 |
|
|
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
|
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 |
|
|
Eloy Garcia
|
e8b50c6623
|
Create + Journeymap
|
2025-08-18 17:58:38 +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
|
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
|
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
|
5fda3b09fd
|
REQUIERE ACTUALIZAR MODLOADER, MIRAR GIT PARA COMO
Actualizados mods
|
2025-03-14 15:59:17 +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 |
|