Commit Graph
2180 Commits
Author SHA1 Message Date
VideoandGitHub 1162f10ebb Merge branch 'development' into FS-37 2021-11-29 06:31:18 -07:00
VideoandGitHub 35965b0b10 Merge pull request #174 from AtlasMediaGroup/FS-256
Forces the server to recalculate the permissions server-wide in /opall (FS-256)
2021-11-29 06:31:11 -07:00
VideoandGitHub 1253732f77 Merge branch 'development' into FS-256 2021-11-29 06:25:25 -07:00
VideoandGitHub 7ce173e02b Merge branch 'development' into FS-37 2021-11-29 06:24:34 -07:00
VideoandGitHub aa20a6e579 Merge pull request #129 from AtlasMediaGroup/FS-7
Allow players to pay other players coins [FS-7]
2021-11-29 06:23:57 -07:00
Video e1bee32163 Forces the server to recalculate the permissions server-wide in /opall 2021-11-29 03:27:07 -07:00
VideoandGitHub 4d006ed172 Merge branch 'development' into FS-37 2021-11-29 03:04:42 -07:00
VideoandGitHub 1ecfb0b066 Merge branch 'development' into FS-7 2021-11-29 03:01:22 -07:00
VideoandGitHub 706229004c Merge pull request #131 from AtlasMediaGroup/FS-273
Moves /rainbowtrail to the shop (FS-273)
2021-11-29 03:00:15 -07:00
VideoandGitHub a4adfa9bee Merge branch 'development' into FS-273 2021-11-29 02:46:41 -07:00
VideoandGitHub 225ade8753 Merge branch 'development' into FS-7 2021-11-29 02:46:02 -07:00
VideoandGitHub 8cbfde8bbc Merge branch 'development' into FS-37 2021-11-29 02:41:49 -07:00
VideoandGitHub a42cb6aff9 Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
Shitcans SavedFlags
2021-11-29 02:41:34 -07:00
VideoandGitHub 01fdf766ee Merge branch 'development' into shitcan-savedflags 2021-11-23 09:28:48 -07:00
VideoandGitHub 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
VideoandGitHub 1b5bbd1c05 Merge branch 'development' into FS-273 2021-11-23 09:16:21 -07:00
VideoandGitHub 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
VideoandGitHub ab00cb840f Merge branch 'development' into FS-273 2021-11-23 03:31:45 -07:00
VideoandGitHub bb2ddf1129 Merge branch 'development' into FS-215 2021-11-23 03:31:19 -07:00
VideoandGitHub bba5ec922b Merge branch 'development' into FS-37 2021-11-23 03:31:13 -07:00
VideoandGitHub 58c21bb1aa Merge branch 'development' into shitcan-savedflags 2021-11-23 03:30:48 -07:00
VideoandGitHub 42143c1163 Merge pull request #168 from AtlasMediaGroup/main
merge down into development
2021-11-22 12:35:18 -07:00
RyanandGitHub 6453e4efca Merge pull request #145 from AtlasMediaGroup/RELEASE-2021.09
Release 2021.09
2022.02-RC03 2022.02-RC02
2021-11-22 18:43:06 +00:00
PaldiuandGitHub 9155ac90b5 Official Release 2021.09 2021-11-22 12:29:54 -06:00
Video 1e1367d08f Bump to RC03 2021.09-RC03 2021-11-13 02:58:36 -07:00
VideoandGitHub 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
VideoandGitHub 68adaed997 Merge branch 'development' into FS-37 2021-10-09 00:09:24 -06:00
VideoandGitHub ecce62f6b4 Merge branch 'development' into FS-273 2021-10-09 00:01:22 -06:00
VideoandGitHub cf9fdc6fe4 Merge branch 'development' into FS-215 2021-10-08 01:43:33 -06:00
PaldiuandGitHub 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
RyanandGitHub 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.09-RC02 2021-10-03 15:50:33 +01:00
VideoandGitHub 912bc1a1e4 Merge pull request #154 from AtlasMediaGroup/development
Development
2021-10-03 07:02:37 -06:00
VideoandGitHub 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
VideoandGitHub 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-RC01 2021-09-19 17:32:05 +01:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-13 09:58:54 +01:00
RyanandGitHub d814853036 Merge branch 'development' into FS-273 2021-09-12 13:49:05 +01:00
RyanandGitHub a1ecf88109 Merge branch 'development' into FS-215 2021-09-12 13:48:59 +01:00
RyanandGitHub 5a6a5ff75d Merge branch 'development' into FS-7 2021-09-12 13:48:50 +01:00
RyanandGitHub fdba119d5d Merge branch 'development' into shitcan-savedflags 2021-09-12 13:48:44 +01:00
RyanandGitHub 087b8dd7ea Merge branch 'development' into FS-37 2021-09-12 13:48:21 +01:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 12:13:56 +01:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 11:33:52 +01:00
VideoandGitHub 3818aab454 Merge branch 'development' into FS-37 2021-09-12 03:04:08 -06:00