TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-05-31 17:01:21 +00:00
Code Issues Projects Releases Wiki Activity
2189 commits 7 branches 35 tags 8.2 MiB
Commit graph

2189 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elmon b711ed517f
Merge branch 'development' into Elmon11-patch-2 2022-01-24 22:16:24 +01:00
Nathan Curran 2618d97a3e
Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 (#187) 
Co-authored-by: Paldiu <pawereus@gmail.com>
 2022-01-24 12:42:47 +11:00
Nathan Curran 1c4647290a
Merge branch 'development' into Elmon11-patch-2 2022-01-24 12:41:47 +11:00
elmon f00f67a844
order of messages fix 
https://media.discordapp.net/attachments/874713176082636882/934559012991680532/unknown.png
 2022-01-23 13:26:22 +01:00
Paldiu 850f12103c
Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1 
Correct CoreProtect Version
 2022-01-17 11:35:09 -06:00
Ryan 7fd77f3cbb
Correct CoreProtect Version 
To align with the version running on Freedom-01 at the moment.
 2022-01-16 18:22:16 +00:00
Video 2eb0ab4cb1
Merge pull request #179 from AtlasMediaGroup/FS-212 
Makes spawnmob configurable, increases the default limit to 25 (FS-212)
 2021-12-22 20:56:46 -07:00
Video 2612aaec31 Makes spawnmob configurable and increases the default limit to 25 2021-12-15 21:46:56 -07:00
Video 8cff0124ea
Merge pull request #93 from AtlasMediaGroup/FS-37 
Fixes FS-37
 2021-11-29 06:36:20 -07:00
Video 1162f10ebb
Merge branch 'development' into FS-37 2021-11-29 06:31:18 -07:00
Video 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
Video 1253732f77
Merge branch 'development' into FS-256 2021-11-29 06:25:25 -07:00
Video 7ce173e02b
Merge branch 'development' into FS-37 2021-11-29 06:24:34 -07:00
Video 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
Video 4d006ed172
Merge branch 'development' into FS-37 2021-11-29 03:04:42 -07:00
Video 1ecfb0b066
Merge branch 'development' into FS-7 2021-11-29 03:01:22 -07:00
Video 706229004c
Merge pull request #131 from AtlasMediaGroup/FS-273 
Moves /rainbowtrail to the shop (FS-273)
 2021-11-29 03:00:15 -07:00
Video a4adfa9bee
Merge branch 'development' into FS-273 2021-11-29 02:46:41 -07:00
Video 225ade8753
Merge branch 'development' into FS-7 2021-11-29 02:46:02 -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 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 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