61 Commits

Author SHA1 Message Date
Kao-server
6e66a28656 Cambios de solo server 2026-06-21 20:56:15 +02:00
SFKao
859731ddf6 Updated mods 2026-06-17 18:38:55 +02:00
Kao-server
0f11ea3fc7 Merge remote-tracking branch 'origin/main' into server 2026-06-10 09:17:45 +02:00
SFKao
1039e92db4 Updated mods 2026-06-10 09:17:22 +02:00
SFKao
1ad1297406 Cuerdas 2026-06-10 09:11:59 +02:00
SFKao
5e2b57757d Updated sohisticated suite 2026-06-10 09:03:27 +02:00
SFKao
2c79da40db Updated mods 2026-06-10 08:41:48 +02:00
Kao-server
ca1006f202 Merge remote-tracking branch 'origin/main' into server 2026-06-10 08:33:54 +02:00
SFKao
4b53b30e4b Sable Hose 2026-06-10 08:33:19 +02:00
Kao-server
aeea4c2f89 Merge remote-tracking branch 'origin/main' into server 2026-06-09 18:49:14 +02:00
SFKao
76822f786d Added furniture, updated wakes and added gravestones 2026-06-09 18:41:19 +02:00
Kao-server
609398f53d Merge remote-tracking branch 'origin/main' into server 2026-06-01 17:00:28 +02:00
SFKao
6bd0ad6bff RUEDAS GRANDES 2026-06-01 16:59:06 +02:00
Kao-server
aca6b92034 Merge remote-tracking branch 'origin/main' into server 2026-05-30 20:14:33 +02:00
SFKao
0a9693cff0 Distant horizons 2026-05-30 20:13:24 +02:00
Kao-server
4019f90220 Merge remote-tracking branch 'origin/main' into server 2026-05-30 19:52:19 +02:00
SFKao
48df8f4aa2 Drive by 2026-05-30 19:50:21 +02:00
Kao-server
5cb0578f75 Merge remote-tracking branch 'origin/main' into server 2026-05-27 13:08:07 +02:00
SFKao
3d6e5eda34 Aero cables 2026-05-27 13:01:56 +02:00
Kao-server
6675d82e35 Merge remote-tracking branch 'origin/main' into server 2026-05-25 19:01:41 +02:00
SFKao
2202dfd1b2 Jei for recipes 2026-05-25 19:01:20 +02:00
Kao-server
6fc89aef47 Merge remote-tracking branch 'origin/main' into server 2026-05-25 17:47:05 +02:00
Kao-server
1fe5bb77b2 Git ignore actualizado 2026-05-25 17:45:49 +02:00
SFKao
bcb8f70100 Comida, inventario y olas 2026-05-25 17:42:05 +02:00
SFKao
0fbab9caa9 Analog player 2026-05-23 16:20:20 +02:00
Kao-server
9d0880500a Merge remote-tracking branch 'origin/main' into server 2026-05-21 21:11:02 +02:00
SFKao
861af0fc94 Disable original create 2026-05-21 21:10:52 +02:00
Kao-server
3c5e66b618 Merge remote-tracking branch 'origin/main' into server 2026-05-21 21:09:40 +02:00
SFKao
55da0cf6da Farmers delight 2026-05-21 21:05:42 +02:00
Kao-server
5bf6ecab25 Merge remote-tracking branch 'origin/main' into server 2026-05-19 18:22:00 +02:00
SFKao
fc1f557b30 Cosmetic armors 2026-05-19 18:20:50 +02:00
SFKao
c17e549f34 Merge remote-tracking branch 'origin/main' into server
# Conflicts:
#	mods/iris-neoforge-1.8.12+mc1.21.1.jar
#	mods/iris-neoforge-1.8.12+mc1.21.1.jar.disable
#	mods/iris-neoforge-1.8.12+mc1.21.1.jar.disabled
2026-05-17 18:27:58 +02:00
SFKao
66448032a1 Desactivo iris (a veces peta) y pongo el create con un parche 2026-05-17 18:25:08 +02:00
Kao-server
776f95d4d7 Merge remote-tracking branch 'origin/main' into server 2026-05-17 11:33:57 +02:00
SFKao
4db641f6bf Plugins y zombies no arden 2026-05-17 11:26:52 +02:00
SFKao
dc35518ebc Updated some mods 2026-05-16 12:28:45 +02:00
SFKao
7fcf0fbcce Skins and more zombies 2026-05-16 12:26:01 +02:00
SFKao
50aa727083 Create bees 2026-05-16 11:51:41 +02:00
Kao-server
fd37a25677 Merge remote-tracking branch 'origin/main' into server 2026-05-16 10:01:55 +02:00
SFKao
fe3371fe9c Revert "Removed lost cities (again)"
This reverts commit 13d43b91ee54ee8ab7e208d0309dbfcbc0b3d3b8.
2026-05-16 09:58:33 +02:00
Kao-server
0225183cce Merge remote-tracking branch 'origin/main' into server 2026-05-16 09:41:33 +02:00
SFKao
13d43b91ee Removed lost cities (again) 2026-05-16 09:40:37 +02:00
Kao-server
29bca9e502 Merge remote-tracking branch 'origin/main' into server 2026-05-15 17:59:58 +02:00
SFKao
fd67bb97b2 Lost souls 2026-05-15 17:58:23 +02:00
Kao-server
d5528c9845 Merge remote-tracking branch 'origin/main' into server 2026-05-15 17:46:08 +02:00
SFKao
957b7fa18e Removed mods client only. Added discord and map 2026-05-15 17:41:01 +02:00
SFKao
c5952aa8c1 Lost cities 2026-05-15 17:37:39 +02:00
SFKao
3b02d54769 Merge remote-tracking branch 'origin/main' into server 2026-05-11 09:39:43 +02:00
SFKao
49f9d09d15 Changed world generator 2026-05-11 09:38:39 +02:00
SFKao
81e05b5633 Merge remote-tracking branch 'origin/main' into server 2026-05-10 13:01:47 +02:00