Compare commits

..
29 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
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
24 changed files with 0 additions and 0 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.