Video
bf2323bed2
Squashed commit of the following:
...
commit a42cb6aff98f97469202f686f67c010fffe8bc2c
Merge: 2ecfb886 01fdf766
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:41:34 2021 -0700
Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
Shitcans SavedFlags
commit 01fdf766ee831bd4f9ae1b887b75b559e1171bd7
Merge: 58c21bb1 2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:28:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit 2ecfb88604dcea061b1fb142f18ca2becec8cfef
Merge: 42143c11 bb2ddf11
Author: Video <videogamesm12@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 bb2ddf11292cb0945d7be2c5cd012cd96aee40ff
Merge: cf9fdc6f 42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:19 2021 -0700
Merge branch 'development' into FS-215
commit 58c21bb1aab8b80829663343a9677cfd79d09e19
Merge: fdba119d 42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:30:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit cf9fdc6fe4fc278c5cc46745f535bdb7dfce185b
Merge: 387ea6f7 a598c933
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 8 01:43:33 2021 -0600
Merge branch 'development' into FS-215
commit 387ea6f71e36dddcd376ac0f6a555e30a9735067
Merge: a1ecf881 180cd811
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 1 00:35:12 2021 -0600
Merge branch 'development' into FS-215
commit a1ecf881094de1da26b181370d08bddb425b4e98
Merge: bd647afe 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:59 2021 +0100
Merge branch 'development' into FS-215
commit fdba119d5d7b016a9fddaa05568776f43d02d442
Merge: 61857dd0 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 61857dd06f05f1ba7242f308de671ea65f33ca80
Merge: 2d18d461 0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 03:01:37 2021 -0600
Merge branch 'development' into shitcan-savedflags
commit bd647afe92d21e9dff65ae9c4c07323f56bfd1cd
Merge: 69f17ef2 0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:50:39 2021 -0600
Merge branch 'development' into FS-215
commit 69f17ef2d742cfc77bc659c21fa0ef3007ab2337
Merge: ee1b27fa aebe1ace
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:01:56 2021 -0600
Merge branch 'development' into FS-215
commit ee1b27fa0df9ee1b579ce4ea6e0f768bb1ac7ca4
Merge: 2bdf14f3 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:24:00 2021 +0100
Merge branch 'development' into FS-215
commit 2d18d461fea83aef743967e10f8c6d6afd67a09c
Merge: a4c81f20 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 2bdf14f38c07c70e392879e2c18be02e0c847af2
Merge: f6d46b61 44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 15:26:13 2021 -0600
Merge branch 'development' into FS-215
commit a4c81f202cd041d4f084135bbd9b0a1d77cd6505
Merge: 0d09c3a5 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:23:06 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit f6d46b6178a9c135df11b5305ba6fb16404381c5
Merge: ee804d52 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:33 2021 +0100
Merge branch 'development' into FS-215
commit ee804d52ff0747fdf67398b12080f708460b402c
Author: Video <videogamesm12@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 0d09c3a550eb014793cc800021a0064aaad5e3b1
Merge: e2ccd14e 4c3f188b
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Aug 29 20:09:03 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit e2ccd14eb383844c1bfb5d0e56e7924bb47f5997
Author: Video <videogamesm12@gmail.com>
Date: Fri Aug 27 16:54:55 2021 -0600
Unsaves SavedFlags
2021-11-29 02:44:23 -07:00
Video
8cbfde8bbc
Merge branch 'development' into FS-37
2021-11-29 02:41:49 -07:00
Video
a42cb6aff9
Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
...
Shitcans SavedFlags
2021-11-29 02:41:34 -07:00
Video
5849947c6b
This should fix it
2021-11-29 02:35:36 -07:00
Video
01fdf766ee
Merge branch 'development' into shitcan-savedflags
2021-11-23 09:28:48 -07:00
Video
afe755f5c1
Merge branch 'development' into FS-7
2021-11-23 09:26:59 -07:00
Video
5f97e68e0e
fuck it, it works
2021-11-23 09:26:49 -07:00
Video
1b5bbd1c05
Merge branch 'development' into FS-273
2021-11-23 09:16:21 -07:00
Video
2ecfb88604
Merge pull request #130 from AtlasMediaGroup/FS-215
...
Makes [Discord] a hyperlink (FS-215)
2021-11-23 09:15:16 -07:00
Video
8356e831a5
Redundancy fix and better protection system
2021-11-23 09:11:16 -07:00
Video
ab00cb840f
Merge branch 'development' into FS-273
2021-11-23 03:31:45 -07:00
Video
bb2ddf1129
Merge branch 'development' into FS-215
2021-11-23 03:31:19 -07:00
Video
bba5ec922b
Merge branch 'development' into FS-37
2021-11-23 03:31:13 -07:00
Video
58c21bb1aa
Merge branch 'development' into shitcan-savedflags
2021-11-23 03:30:48 -07:00
Video
f190bbeac1
FS-292
2021-11-23 00:27:57 -07:00
Video
42143c1163
Merge pull request #168 from AtlasMediaGroup/main
...
merge down into development
2021-11-22 12:35:18 -07:00
Ryan
6453e4efca
Merge pull request #145 from AtlasMediaGroup/RELEASE-2021.09
...
Release 2021.09
2021-11-22 18:43:06 +00:00
Paldiu
9155ac90b5
Official Release
2021-11-22 12:29:54 -06:00
Video
1e1367d08f
Bump to RC03
2021-11-13 02:58:36 -07:00
Video
3f690e2ca1
Merge pull request #167 from AtlasMediaGroup/whoops
...
Fixes an oopsie I made whilst sleep deprived
2021-11-13 02:48:51 -07:00
Video
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
Video
68adaed997
Merge branch 'development' into FS-37
2021-10-09 00:09:24 -06:00
Video
ecce62f6b4
Merge branch 'development' into FS-273
2021-10-09 00:01:22 -06:00
Video
cf9fdc6fe4
Merge branch 'development' into FS-215
2021-10-08 01:43:33 -06:00
Paldiu
a728ec24d4
Merge pull request #156 from AtlasMediaGroup/critical-inspect-bugfix
...
Critical Bugfix
2021-10-04 17:59:10 -05:00
Video
74a71b1843
Important bugfix
...
It appears someone had an extremely big brain moment.
2021-10-04 16:02:39 -06:00
Ryan
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
Ryan Wild
4c287ca9b8
Bump to RC02
2021-10-03 15:50:33 +01:00
Video
912bc1a1e4
Merge pull request #154 from AtlasMediaGroup/development
...
Development
2021-10-03 07:02:37 -06:00
Video
a598c933ec
Merge pull request #151 from AtlasMediaGroup/FS-421
...
Two fixes (FS-421)
2021-10-03 06:52:45 -06:00
Video
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
Video
387ea6f71e
Merge branch 'development' into FS-215
2021-10-01 00:35:12 -06:00
Wild1145
e122c4c5fa
Bump to 2021.09-RC01 Release
2021-09-19 17:32:05 +01:00
dependabot[bot]
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
Ryan
d814853036
Merge branch 'development' into FS-273
2021-09-12 13:49:05 +01:00
Ryan
a1ecf88109
Merge branch 'development' into FS-215
2021-09-12 13:48:59 +01:00
Ryan
5a6a5ff75d
Merge branch 'development' into FS-7
2021-09-12 13:48:50 +01:00
Ryan
fdba119d5d
Merge branch 'development' into shitcan-savedflags
2021-09-12 13:48:44 +01:00
Ryan
087b8dd7ea
Merge branch 'development' into FS-37
2021-09-12 13:48:21 +01:00
dependabot[bot]
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
dependabot[bot]
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
Video
3818aab454
Merge branch 'development' into FS-37
2021-09-12 03:04:08 -06:00
Video
61857dd06f
Merge branch 'development' into shitcan-savedflags
2021-09-12 03:01:37 -06:00
Video
bd647afe92
Merge branch 'development' into FS-215
2021-09-12 02:50:39 -06:00
dependabot[bot]
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
Video
69f17ef2d7
Merge branch 'development' into FS-215
2021-09-12 02:01:56 -06:00
Video
aebe1acec2
Merge pull request #136 from AtlasMediaGroup/multiple-birds-one-stone
...
Multiple fixes, one commit
2021-09-12 01:57:32 -06:00
Video
938b3aa630
Merge branch 'development' into multiple-birds-one-stone
2021-09-11 20:53:16 -06:00
dependabot[bot]
6772333eb4
Bump junit-jupiter from 5.4.2 to 5.7.2 ( #103 )
...
Bumps [junit-jupiter](https://github.com/junit-team/junit5 ) from 5.4.2 to 5.7.2.
- [Release notes](https://github.com/junit-team/junit5/releases )
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.7.2 )
---
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-12 00:10:47 +01:00
dependabot[bot]
0204961834
Bump commons-io from 2.8.0 to 2.11.0 ( #117 )
...
Bumps commons-io from 2.8.0 to 2.11.0.
---
updated-dependencies:
- dependency-name: commons-io:commons-io
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-11 23:53:41 +01:00
