Commit Graph
35 Commits
Author SHA1 Message Date
Kao-server 6fc89aef47 Merge remote-tracking branch 'origin/main' into server 2026-05-25 17:47:05 +02:00
SFKao bcb8f70100 Comida, inventario y olas 2026-05-25 17:42:05 +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 13d43b91ee.
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 49f9d09d15 Changed world generator 2026-05-11 09:38:39 +02:00
SFKao 446d908695 Update mods 2026-05-10 13:00:38 +02:00
SFKao 47721cc239 Revert "Zombies 2"
This reverts commit 17c371276c.
2026-05-10 11:30:01 +02:00
SFKao b5be48da58 Dead nights 2026-05-09 20:14:47 +02:00
SFKao 17c371276c Zombies 2 2026-05-08 15:54:44 +02:00
SFKao 69b5480b18 gearbox, pa los bugas 2026-05-08 08:59:13 +02:00
SFKao b29c6e5bba Addons aero 2026-05-07 15:35:40 +02:00
SFKao 43f1d36fe2 Worldmap 2026-05-07 13:03:39 +02:00
SFKao d0982f2b68 Mods, update mods 2026-05-07 12:07:21 +02:00
SFKao 8e2e694680 Guns, artifacts and mods 2026-05-07 11:47:48 +02:00
SFKao d04ec0301e Aeronautics y base 2026-05-06 19:15:59 +02:00