Cambios de solo server

Merge remote-tracking branch 'origin/main' into server
2026-06-21 20:56:15 +02:00 · 2026-06-10 09:17:45 +02:00 · 2026-06-10 08:33:54 +02:00 · 2026-06-09 18:49:14 +02:00 · 2026-06-01 17:00:28 +02:00 · 2026-05-30 20:14:33 +02:00
82 changed files with 1 additions and 1 deletions
@@ -11,4 +11,4 @@

 !*/

-!.analogaudio/internal/analogplayer-1.0.0.jar
+!.analogaudio/internal/analogplayer-1.0.0.jar
Author	SHA1	Message	Date
Kao-server	6e66a28656	Cambios de solo server	2026-06-21 20:56:15 +02:00
Kao-server	0f11ea3fc7	Merge remote-tracking branch 'origin/main' into server	2026-06-10 09:17:45 +02:00
Kao-server	ca1006f202	Merge remote-tracking branch 'origin/main' into server	2026-06-10 08:33:54 +02:00
Kao-server	aeea4c2f89	Merge remote-tracking branch 'origin/main' into server	2026-06-09 18:49:14 +02:00
Kao-server	609398f53d	Merge remote-tracking branch 'origin/main' into server	2026-06-01 17:00:28 +02:00
Kao-server	aca6b92034	Merge remote-tracking branch 'origin/main' into server	2026-05-30 20:14:33 +02:00
Kao-server	4019f90220	Merge remote-tracking branch 'origin/main' into server	2026-05-30 19:52:19 +02:00
Kao-server	5cb0578f75	Merge remote-tracking branch 'origin/main' into server	2026-05-27 13:08:07 +02:00
Kao-server	6675d82e35	Merge remote-tracking branch 'origin/main' into server	2026-05-25 19:01:41 +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
Kao-server	9d0880500a	Merge remote-tracking branch 'origin/main' into server	2026-05-21 21:11:02 +02:00
Kao-server	3c5e66b618	Merge remote-tracking branch 'origin/main' into server	2026-05-21 21:09:40 +02:00
Kao-server	5bf6ecab25	Merge remote-tracking branch 'origin/main' into server	2026-05-19 18:22:00 +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
Kao-server	776f95d4d7	Merge remote-tracking branch 'origin/main' into server	2026-05-17 11:33:57 +02:00
Kao-server	fd37a25677	Merge remote-tracking branch 'origin/main' into server	2026-05-16 10:01:55 +02:00
Kao-server	0225183cce	Merge remote-tracking branch 'origin/main' into server	2026-05-16 09:41:33 +02:00
Kao-server	29bca9e502	Merge remote-tracking branch 'origin/main' into server	2026-05-15 17:59:58 +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	3b02d54769	Merge remote-tracking branch 'origin/main' into server	2026-05-11 09:39:43 +02:00
SFKao	81e05b5633	Merge remote-tracking branch 'origin/main' into server	2026-05-10 13:01:47 +02:00