1ecfb0b066
Merge branch 'development' into FS-7
2021-11-29 03:01:22 -07:00
706229004c
Merge pull request #131 from AtlasMediaGroup/FS-273
...
Moves /rainbowtrail to the shop (FS-273)
2021-11-29 03:00:15 -07:00
a4adfa9bee
Merge branch 'development' into FS-273
2021-11-29 02:46:41 -07:00
225ade8753
Merge branch 'development' into FS-7
2021-11-29 02:46:02 -07:00
bf2323bed2
Squashed commit of the following:
...
commit a42cb6aff92ecfb88601fdf766videogamesm12@gmail.com >
Date: Mon Nov 29 02:41:34 2021 -0700
Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
Shitcans SavedFlags
commit 01fdf766ee58c21bb12ecfb886videogamesm12@gmail.com >
Date: Tue Nov 23 09:28:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit 2ecfb8860442143c11bb2ddf11videogamesm12@gmail.com >
Date: Tue Nov 23 09:15:16 2021 -0700
Merge pull request #130 from AtlasMediaGroup/FS-215
Makes [Discord] a hyperlink (FS-215)
commit bb2ddf1129cf9fdc6f42143c11videogamesm12@gmail.com >
Date: Tue Nov 23 03:31:19 2021 -0700
Merge branch 'development' into FS-215
commit 58c21bb1aafdba119d42143c11videogamesm12@gmail.com >
Date: Tue Nov 23 03:30:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit cf9fdc6fe4387ea6f7a598c933videogamesm12@gmail.com >
Date: Fri Oct 8 01:43:33 2021 -0600
Merge branch 'development' into FS-215
commit 387ea6f71ea1ecf881180cd811videogamesm12@gmail.com >
Date: Fri Oct 1 00:35:12 2021 -0600
Merge branch 'development' into FS-215
commit a1ecf88109bd647afe213a4338Wild1145@users.noreply.github.com >
Date: Sun Sep 12 13:48:59 2021 +0100
Merge branch 'development' into FS-215
commit fdba119d5d61857dd0213a4338Wild1145@users.noreply.github.com >
Date: Sun Sep 12 13:48:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 61857dd06f2d18d4610e12f5e7videogamesm12@gmail.com >
Date: Sun Sep 12 03:01:37 2021 -0600
Merge branch 'development' into shitcan-savedflags
commit bd647afe9269f17ef20e12f5e7videogamesm12@gmail.com >
Date: Sun Sep 12 02:50:39 2021 -0600
Merge branch 'development' into FS-215
commit 69f17ef2d7ee1b27faaebe1acevideogamesm12@gmail.com >
Date: Sun Sep 12 02:01:56 2021 -0600
Merge branch 'development' into FS-215
commit ee1b27fa0d2bdf14f30a9b95bfWild1145@users.noreply.github.com >
Date: Sat Sep 11 01:24:00 2021 +0100
Merge branch 'development' into FS-215
commit 2d18d461fea4c81f200a9b95bfWild1145@users.noreply.github.com >
Date: Sat Sep 11 01:23:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 2bdf14f38cf6d46b6144ff621dvideogamesm12@gmail.com >
Date: Mon Sep 6 15:26:13 2021 -0600
Merge branch 'development' into FS-215
commit a4c81f202c0d09c3a523caa4e8Wild1145@users.noreply.github.com >
Date: Sat Sep 4 01:23:06 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit f6d46b6178ee804d5223caa4e8Wild1145@users.noreply.github.com >
Date: Sat Sep 4 01:07:33 2021 +0100
Merge branch 'development' into FS-215
commit ee804d52ffvideogamesm12@gmail.com >
Date: Fri Sep 3 12:52:15 2021 -0600
Makes [Discord] a hyperlink (FS-215)
I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily.
commit 0d09c3a550e2ccd14e4c3f188bWild1145@users.noreply.github.com >
Date: Sun Aug 29 20:09:03 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit e2ccd14eb3videogamesm12@gmail.com >
Date: Fri Aug 27 16:54:55 2021 -0600
Unsaves SavedFlags
2021-11-29 02:44:23 -07:00
8cbfde8bbc
Merge branch 'development' into FS-37
2021-11-29 02:41:49 -07:00
a42cb6aff9
Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
...
Shitcans SavedFlags
2021-11-29 02:41:34 -07:00
5849947c6b
This should fix it
2021-11-29 02:35:36 -07:00
01fdf766ee
Merge branch 'development' into shitcan-savedflags
2021-11-23 09:28:48 -07:00
afe755f5c1
Merge branch 'development' into FS-7
2021-11-23 09:26:59 -07:00
5f97e68e0e
fuck it, it works
2021-11-23 09:26:49 -07:00
1b5bbd1c05
Merge branch 'development' into FS-273
2021-11-23 09:16:21 -07:00
2ecfb88604
Merge pull request #130 from AtlasMediaGroup/FS-215
...
Makes [Discord] a hyperlink (FS-215)
2021-11-23 09:15:16 -07:00
8356e831a5
Redundancy fix and better protection system
2021-11-23 09:11:16 -07:00
ab00cb840f
Merge branch 'development' into FS-273
2021-11-23 03:31:45 -07:00
bb2ddf1129
Merge branch 'development' into FS-215
2021-11-23 03:31:19 -07:00
bba5ec922b
Merge branch 'development' into FS-37
2021-11-23 03:31:13 -07:00
58c21bb1aa
Merge branch 'development' into shitcan-savedflags
2021-11-23 03:30:48 -07:00
f190bbeac1
FS-292
2021-11-23 00:27:57 -07:00
42143c1163
Merge pull request #168 from AtlasMediaGroup/main
...
merge down into development
2021-11-22 12:35:18 -07:00
6453e4efca
Merge pull request #145 from AtlasMediaGroup/RELEASE-2021.09
...
Release 2021.09
2021-11-22 18:43:06 +00:00
9155ac90b5
Official Release
2021-11-22 12:29:54 -06:00
1e1367d08f
Bump to RC03
2021-11-13 02:58:36 -07:00
3f690e2ca1
Merge pull request #167 from AtlasMediaGroup/whoops
...
Fixes an oopsie I made whilst sleep deprived
2021-11-13 02:48:51 -07:00
abfa3b977c
Whoops
...
This commit fixes 2 things:
1. A redundant check that was completely unnecessary
2. A loophole in my original bugfix commit I didn't initially discover until afterwards which enables players to do the same thing except with right clicking instead
The block inspector should be completely rewritten in the future, but for now it works.
2021-11-13 02:35:30 -07:00
68adaed997
Merge branch 'development' into FS-37
2021-10-09 00:09:24 -06:00
ecce62f6b4
Merge branch 'development' into FS-273
2021-10-09 00:01:22 -06:00
cf9fdc6fe4
Merge branch 'development' into FS-215
2021-10-08 01:43:33 -06:00
a728ec24d4
Merge pull request #156 from AtlasMediaGroup/critical-inspect-bugfix
...
Critical Bugfix
2021-10-04 17:59:10 -05:00
74a71b1843
Important bugfix
...
It appears someone had an extremely big brain moment.
2021-10-04 16:02:39 -06:00
4d469cdc0a
Move from Java 16 to Java 17 ( #149 )
...
* Move from Java 16 to Java 17
* Update java17-maven.yml
2021-10-03 15:57:47 +01:00
4c287ca9b8
Bump to RC02
2021-10-03 15:50:33 +01:00
912bc1a1e4
Merge pull request #154 from AtlasMediaGroup/development
...
Development
2021-10-03 07:02:37 -06:00
a598c933ec
Merge pull request #151 from AtlasMediaGroup/FS-421
...
Two fixes (FS-421)
2021-10-03 06:52:45 -06:00
936f0b621e
Stupid simple fix
...
Fixes an oopsie I made and an oopsie someone else made which broke the entire plugin.
2021-10-03 06:45:02 -06:00
387ea6f71e
Merge branch 'development' into FS-215
2021-10-01 00:35:12 -06:00
e122c4c5fa
Bump to 2021.09-RC01 Release
2021-09-19 17:32:05 +01:00
180cd81132
Bump junit-jupiter from 5.7.2 to 5.8.0 ( #139 )
...
Bumps [junit-jupiter](https://github.com/junit-team/junit5 ) from 5.7.2 to 5.8.0.
- [Release notes](https://github.com/junit-team/junit5/releases )
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.8.0 )
---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-13 09:58:54 +01:00
d814853036
Merge branch 'development' into FS-273
2021-09-12 13:49:05 +01:00
a1ecf88109
Merge branch 'development' into FS-215
2021-09-12 13:48:59 +01:00
5a6a5ff75d
Merge branch 'development' into FS-7
2021-09-12 13:48:50 +01:00
fdba119d5d
Merge branch 'development' into shitcan-savedflags
2021-09-12 13:48:44 +01:00
087b8dd7ea
Merge branch 'development' into FS-37
2021-09-12 13:48:21 +01:00
213a43380e
Bump git-commit-id-plugin from 4.0.2 to 4.9.10 ( #113 )
...
Bumps git-commit-id-plugin from 4.0.2 to 4.9.10.
---
updated-dependencies:
- dependency-name: pl.project13.maven:git-commit-id-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 12:13:56 +01:00
8a31b4c5c0
Bump javassist from 3.27.0-GA to 3.28.0-GA ( #110 )
...
Bumps [javassist](https://github.com/jboss-javassist/javassist ) from 3.27.0-GA to 3.28.0-GA.
- [Release notes](https://github.com/jboss-javassist/javassist/releases )
- [Commits](https://github.com/jboss-javassist/javassist/commits )
---
updated-dependencies:
- dependency-name: org.javassist:javassist
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 11:33:52 +01:00
3818aab454
Merge branch 'development' into FS-37
2021-09-12 03:04:08 -06:00
61857dd06f
Merge branch 'development' into shitcan-savedflags
2021-09-12 03:01:37 -06:00
bd647afe92
Merge branch 'development' into FS-215
2021-09-12 02:50:39 -06:00
0e12f5e792
Bump commons-lang3 from 3.11 to 3.12.0 ( #111 )
...
Bumps commons-lang3 from 3.11 to 3.12.0.
---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 09:09:28 +01:00
69f17ef2d7
Merge branch 'development' into FS-215
2021-09-12 02:01:56 -06:00
