10341 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
AngrySoundTech	0c07571c16	Create ansible gradle project to copy reobf artifacts into ansible for deployment	2024-05-09 18:07:02 -04:00
okx-code	0bba48a30a	Merge pull request #494 from CivMC/revert-factorymod ... Revert "Merge pull request #394 from MrJeremyFisher/maybe-fix-factory…	2024-05-09 00:49:50 +01:00
okx-code	642574265e	Revert "Merge pull request #394 from MrJeremyFisher/maybe-fix-factory-overflow" ... This reverts commit 504317513e, reversing changes made to c9bcc3c3c2.	2024-05-09 00:46:29 +01:00
okx-code	7243467ac4	Merge pull request #491 from CivMC/feature/fix-local-docker ... Fix local docker setup	2024-05-06 21:59:25 +01:00
AngrySoundTech	66e5681e4d	Fix local docker setup	2024-05-04 20:45:13 -04:00
RedDevel2	02bd4b75b1	Merge pull request #490 from CivMC/revertfm ... Revert change	2024-05-03 14:11:25 +02:00
RedDevel2	d665583c55	Revert factory change	2024-05-03 11:30:51 +02:00
RedDevel2	e273d0504d	Merge pull request #487 from CivMC/RedDevel2-patch-1 ... Update tag	2024-05-02 16:27:23 +02:00
RedDevel2	d697624ca5	Update tag	2024-05-02 15:37:57 +02:00
RedDevel2	bee303d49c	Merge pull request #486 from CivMC/127jars ... Upload new jars	2024-05-02 15:33:29 +02:00
RedDevel2	9fb4260798	Upload new jars	2024-05-02 09:53:35 +02:00
RedDevel2	5f63cec70e	Merge pull request #350 from MrJeremyFisher/nllim ... Add `/nllim` (Name Layer List Invited Members)	2024-05-01 23:16:25 +02:00
RedDevel2	a7815e5b7b	Merge pull request #347 from MrJeremyFisher/pot-glitch-fix ... Don't heal dead entities with health potions	2024-05-01 23:16:17 +02:00
RedDevel2	6b6fa21d8d	Merge pull request #383 from drekamor/main ... Proper /nldg confirmation	2024-05-01 23:15:55 +02:00
RedDevel2	85fc356749	Merge pull request #386 from CivMC/fix-portals ... Fix portal hack not triggering	2024-05-01 23:15:28 +02:00
RedDevel2	4d8bfeea4a	Merge pull request #391 from CivMC/fix-chunk-meta ... Fix chunk meta not saving	2024-05-01 23:15:18 +02:00
RedDevel2	5472b41937	Merge pull request #404 from Protonull/ignorelist-command ... Refactor /ignorelist command	2024-05-01 23:15:09 +02:00
RedDevel2	504317513e	Merge pull request #394 from MrJeremyFisher/maybe-fix-factory-overflow ... Fix Factory Overflow	2024-05-01 23:15:01 +02:00
AngrySoundTech	c9bcc3c3c2	Merge pull request #481 from CivMC/feature/eliminate-containers ... Eliminate Intermediate containers	2024-05-01 11:51:33 -04:00
AngrySoundTech	d4ebecf74a	Fix terra	2024-04-30 18:28:20 -04:00
AngrySoundTech	5e22d34ecf	Fix server icon	2024-04-30 18:14:47 -04:00
AngrySoundTech	309b1e514f	Add missing file >:(	2024-04-30 18:08:28 -04:00
AngrySoundTech	8152f86f9c	combine stack, fix files	2024-04-30 18:05:29 -04:00
AngrySoundTech	fa0f3fda34	Eliminate intermediate waterfall container	2024-04-30 17:41:42 -04:00
AngrySoundTech	8c8ff79c35	Eliminate intermediate paper container	2024-04-30 17:41:41 -04:00
AngrySoundTech	b035a6dbc3	Merge pull request #480 from CivMC/feature/fix-services ... Update auth and monitoring templates	2024-04-30 15:00:49 -04:00
AngrySoundTech	92b284549b	Update publish_container.yaml	2024-04-28 12:06:20 -04:00
AngrySoundTech	b84ad05ccf	Update publish_container.yaml	2024-04-28 12:05:41 -04:00
AngrySoundTech	f6b223ff56	Update auth and monitoring templates	2024-04-25 18:59:14 -04:00
drekamor	b56931ec85	Merge branch 'CivMC:main' into main	2024-04-17 17:44:24 +01:00
AngrySoundTech	0e1d36fe50	Merge pull request #479 from CivMC/feature/docker-ansible ... Fix working directory for actions	2024-04-16 13:37:54 -04:00
AngrySoundTech	4c90e9b050	Fix working directory for actions	2024-04-16 13:32:13 -04:00
AngrySoundTech	c03417d489	Merge pull request #406 from CivMC/feature/docker-ansible ... Move CivDocker and Ansible into Monorepo	2024-04-16 13:28:20 -04:00
AngrySoundTech	bc51d8bb35	Update docker repo	2024-04-16 13:26:21 -04:00
AngrySoundTech	84eaa92163	Update Ansible Workflows	2024-04-16 13:24:47 -04:00
AngrySoundTech	eb4ea5aa88	Merge remote-tracking branch 'ca/master' into feature/docker-ansible	2024-04-16 13:06:58 -04:00
AngrySoundTech	e2ddc32715	Assimilate CivDocker	2024-04-16 11:27:27 -04:00
AngrySoundTech	bcd22447e7	Merge remote-tracking branch 'cd/master' into feature/docker-ansible	2024-04-16 11:05:32 -04:00
Alexander	695a0f426a	Refactor /ignorelist command	2024-04-16 06:54:46 +01:00
RedDevel2	1dba7545e5	Update settings.yml	2024-04-15 14:38:29 +02:00
RedDevel2	d0f89b7ab2	Update IF	2024-04-15 13:30:55 +02:00
RedDevel2	b8d5e025c6	Update settings.yml	2024-04-13 13:01:10 +02:00
RedDevel2	4dbf6f8071	Disabled easter	2024-04-13 12:48:39 +02:00
RedDevel2	0e336f15c3	Switch test	2024-04-12 14:47:09 +02:00
RedDevel2	a524072132	Update settings.yml	2024-04-06 16:16:16 +02:00
RedDevel2	fd5a4df93c	Update settings.yml	2024-04-06 13:02:11 +02:00
RedDevel2	6688b44760	change	2024-04-06 12:55:59 +02:00
RedDevel2	854f3089a1	Test	2024-04-06 12:35:15 +02:00
RedDevel2	aaa652b5f7	Merge pull request #252 from CivMC/Easter ... Easter	2024-04-06 12:23:14 +02:00
RedDevel2	c9deadc268	Add	2024-04-06 12:21:32 +02:00