2291 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ryan	7258d7f1bf	Merge pull request #58 from AtlasMediaGroup/FS-221 ... Remove a number of wipe commands we don't want anyway	2021-05-04 12:59:31 +01:00
Video	8a504bff07	Merge branch 'development' into FS-221	2021-05-03 22:15:20 -06:00
Ryan	c00e64f736	Merge pull request #54 from VideoGameSmash12/FS-137 ... Assistant executive discord integration (FS-137)	2021-05-03 20:14:35 +01:00
Ryan	9e73db0f24	Merge branch 'development' into FS-137	2021-05-03 19:46:59 +01:00
Ryan	951c061d77	Merge pull request #57 from AtlasMediaGroup/Elmon11-patch-2 ... grammar fix	2021-05-03 19:46:37 +01:00
Ryan	579d3e0719	Merge branch 'development' into Elmon11-patch-2	2021-05-03 19:13:39 +01:00
Ryan	9777733d04	Merge pull request #53 from VideoGameSmash12/ride-typo ... Fixes typo in /ride	2021-05-03 19:13:26 +01:00
Ryan	05e118dcb4	Merge branch 'development' into ride-typo	2021-05-03 18:21:16 +01:00
Ryan	7a0d6f49f4	Merge pull request #52 from VideoGameSmash12/FS-156 ... Fixes typo in the Lightning Rod's name (FS-156)	2021-05-03 18:20:20 +01:00
Ryan	19f1b7f6bd	Merge branch 'development' into Elmon11-patch-2	2021-05-03 15:45:54 +01:00
Ryan	b12afbdc1f	Merge branch 'development' into FS-137	2021-05-03 15:45:45 +01:00
Ryan	49e77d4f93	Merge branch 'development' into ride-typo	2021-05-03 15:45:36 +01:00
Ryan	eb9107bedf	Merge branch 'development' into FS-156	2021-05-03 15:45:25 +01:00
Ryan	951c699ed0	Remove a number of wipe commands we don't want anyway ... We shouldn't be wiping any of this data within the server now anyway so let's not tempt fate again.	2021-05-03 15:44:05 +01:00
Ryan	9e676143b8	2021.04 Release ... Formal Release for 2021.04	2021-05-03 15:19:42 +01:00
Elmon11	6895e46375	Merge branch 'development' into ride-typo	2021-05-02 14:15:15 +02:00
Ryan	c8b20bc255	RC2 Release	2021-05-02 13:12:37 +01:00
Elmon11	1cf46c7337	grammar fix	2021-05-02 14:03:48 +02:00
Nathan Curran	f240a15af3	Force the count to be zero if the value is negative (FS-216) (#56)	2021-05-01 23:58:03 +10:00
Ryan	6073712fdf	Bump Version ... Bump Version to 2021.04-RC01	2021-04-26 20:46:11 +01:00
Video	407b63e48b	Fixes FS-137	2021-04-26 01:23:24 -06:00
Video	be562fe722	ok, done (FS-156)	2021-04-26 00:58:28 -06:00
Video	928ab41d7f	Update Command_ride.java	2021-04-26 00:37:16 -06:00
Nathan Curran	d11d55b218	Vanished admins are no longer being counted (FS-148) (#41)	2021-04-24 14:06:28 +10:00
Video	debb95fb4c	video dev man (#51)	2021-04-24 13:03:11 +10:00
Nathan Curran	b9f7ab3ec3	Change punishment from kicking to muting on spam (FS-97) (#45)	2021-04-22 21:54:29 +10:00
Video	2cdf1e66a6	Disables block gravity and makes it togglable (FS-89) (#50) ... * Disables block gravity by default (FS-89) * Combine these checks as Codacy ever so kindly suggested	2021-04-19 17:34:36 +10:00
Nathan Curran	20c2c4c96e	Delete /wipeuserdata (FS-196) (#49)	2021-04-15 22:07:22 +10:00
Video	d5238150d0	Curse be gone (#47) ... Co-authored-by: Ryan <Wild1145@users.noreply.github.com> Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>	2021-04-13 14:13:47 +10:00
Paldiu	64a4e70c41	Merge pull request #48 from AtlasMediaGroup/abhi-fix ... Strip role/user mentions (FS-191)	2021-04-12 16:45:13 -05:00
abhiram	0c2f0a714c	[+] Fix #replace()	2021-04-12 16:31:48 +05:30
abhiram	4c67553bdd	[+] Whitespace change!	2021-04-12 16:26:06 +05:30
abhiram	ffab5e3c12	[+] Allman style formating	2021-04-12 16:01:31 +05:30
abhiram	f7556a4861	[+] Remove redundant comments	2021-04-12 15:59:27 +05:30
abhiram	385fc77771	[+] Done all the requested changes!	2021-04-12 15:44:51 +05:30
abhiram	b852ea1822	[+] Update my account in developers list	2021-04-12 14:44:27 +05:30
abhiram	4a5a3a1a2d	[+] Fix FS-191	2021-04-12 13:57:58 +05:30
Ryan	37762e5470	Merge pull request #39 from AtlasMediaGroup/Elmon11-patch-2 ... clearinv option in smite (FS-161)	2021-04-11 22:15:26 +01:00
Ryan	85d90090c8	Merge branch 'development' into Elmon11-patch-2	2021-04-11 18:41:54 +01:00
Ryan	09930c2d9a	Merge pull request #43 from VideoGameSmash12/development ... Consistency fixes (across 46 commands), additional CoreProtect integration (/dispfill and /setlever), and a critical bugfix (/setlever) (FS-162)	2021-04-10 12:56:32 +01:00
Ryan	7ae1ab035a	Merge branch 'development' into development	2021-04-10 12:50:52 +01:00
Ryan	2bd1787663	Updated supported versions for TFM.	2021-04-10 12:45:56 +01:00
Ryan	765b7dcc4b	Merge branch 'development' into development	2021-04-10 12:39:47 +01:00
Ryan	091381a076	Merge pull request #44 from AtlasMediaGroup/FS-145 ... Update JDA version and location (FS-145)	2021-04-10 12:39:08 +01:00
Nathan Curran	27dfd71b2e	Update JDA version and location (FS-145)	2021-04-09 21:20:33 +10:00
Video	16e06bd932	Forgot I had this there	2021-04-07 19:45:03 -06:00
Video	a33c310757	Fucking shit	2021-04-07 19:41:13 -06:00
Video	df21bdfa7e	Other bug fixes ... Credit to Fleek for some of the code here. Bugs that were fixed: * [Media] showing up with an extra space at the beginning of blank messages with attachments * Admin chat using incorrect colors for its ranks in messages from Discord to Minecraft * Admin notes not sending to admins, only admin impostors	2021-04-07 19:40:19 -06:00
Nathan Curran	d7e2c0da42	Merge branch 'development' into Elmon11-patch-2	2021-04-07 11:52:16 +10:00
Video	a7529b41fb	Oops	2021-04-05 18:08:24 -06:00