Commit Graph

Select branches

Hide Pull Requests

Elmon11-patch-1

FS-177

FS-200

FS-24-Again

FS-283

FS-308

FS-396

RELEASE-2021.04

RELEASE-2021.05

RELEASE-2021.06

RELEASE-2021.09

RELEASE-2023.03

RELEASE-2023.03-LUCKPERMS

dependabot/github_actions/development/actions/checkout-4

dependabot/github_actions/development/actions/setup-java-3.11.0

dependabot/github_actions/development/codacy/codacy-analysis-cli-action-4.3.0

dependabot/maven/development/com.sk89q.worldedit-worldedit-bukkit-7.2.17

dependabot/maven/development/com.sk89q.worldguard-worldguard-bukkit-7.0.8

dependabot/maven/development/commons-io-commons-io-2.13.0

dependabot/maven/development/io.papermc-paperlib-1.0.8

dependabot/maven/development/net.coreprotect-coreprotect-22.2

dependabot/maven/development/net.dv8tion-JDA-4.4.1_353

dependabot/maven/development/net.essentialsx-EssentialsX-2.20.1

dependabot/maven/development/org.apache.maven.plugins-maven-checkstyle-plugin-3.3.0

dependabot/maven/development/org.apache.maven.plugins-maven-compiler-plugin-3.11.0

dependabot/maven/development/org.apache.maven.plugins-maven-shade-plugin-3.4.1

dependabot/maven/development/org.bstats-bstats-bukkit-3.0.2

dependabot/maven/development/org.codehaus.mojo-buildnumber-maven-plugin-3.2.0

dependabot/maven/development/org.codehaus.mojo-properties-maven-plugin-1.2.1

dependabot/maven/development/org.javassist-javassist-3.29.2-GA

dependabot/maven/development/org.jetbrains-annotations-24.0.1

development

feat/build-changes/main

main

merge-branch-between-main-and-dev

proper-resultset-retrieval

ptero-update

relea

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#292

#293

#294

#295

#296

#296

#297

#297

#298

#299

#3

#30

#300

#301

#302

#302

#303

#303

#304

#304

#305

#305

#306

#307

#308

#309

#309

#31

#310

#310

#311

#311

#312

#313

#314

#315

#315

#316

#317

#318

#319

#32

#320

#320

#321

#321

#322

#323

#323

#324

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#345

#346

#346

#347

#348

#348

#349

#349

#35

#350

#351

#351

#352

#352

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

1.15

2020.10

2020.11

2020.9

2020.9-beta

2021-02-RC01

2021-02-RC02

2021.02

2021.02-RC03

2021.04

2021.04-RC01

2021.04-RC02

2021.05

2021.05-RC01

2021.06

2021.06-RC01

2021.09

2021.09-RC01

2021.09-RC02

2021.09-RC03

2022.02

2022.02-RC01

2022.02-RC02

2022.02-RC03

2022.06

2022.06-RC1

2022.06-RC2

2022.06-RC3

2022.06.1

2023.07-LEGACY-RC01

TFM-1.15

V5.1-alpha1

v2.14

v2.15

v2.16

v2.17

v2.18

v2.19

v2.20

v2.21

v2.22

v3.0

v3.1

v3.2

v3.3

v3.4

v3.5

v4.0

v4.0-dev

v4.1

v4.2

v4.2-pre1

v4.3

v4.3-pre1

v5.0-mc1.10

v5.0-mc1.9

v5.0-pre1

v5.5

Mono Color

• f8e09665f5 [SHOP] Fixes bug where not having the Shop enabled would cause an error to be thrown then the server is shutting down Video 2023-03-11 02:55:51 -07:00
• a5135ef641 [DISCORD] Lots and lots of bugfixes - Fixes bug where sending any messages through Discord would result in errors about roles - Fixes bug where attempting to send any messages to Discord just didn't work - Discord integration now shows main chat messages in color Video 2023-03-11 02:38:33 -07:00
• 071d19c5e0 [COMMONS] Fixes minor bug that caused /tpr to teleport you partially into the ground Alco wouldn't stop annoying me about this. Video 2023-03-11 01:08:27 -07:00
• 2e7756ed0f [COMMONS] Bugfixes, cleanup, and a much-needed clownfish tweak - Fixes bug that caused non-shop items (like the mob tosser) to not work if the Shop plugin is not already installed - Finally makes the fucking clownfish something that can be turned down in the sound settings by having it play the sound at the Player sound category Video 2023-03-11 00:55:02 -07:00
• 5332dc88cd My life sucks - Fixes mistake that caused the shop plugin to not enable properly - Fixes issue that caused the Discord integration to block the main thread when it shouldn't - Removes old legacy code that still relied on JDA - Fixes issue that caused slash commands to fail to register properly Video 2023-03-11 00:27:43 -07:00
• 631b691518 General corrections - Removes JDA as a dependency as we do not use that shit - Fixes fuck-up on my end where I didn't think Paul used the libraries part of spigot.yml but he actually did Video 2023-03-10 23:52:24 -07:00
• 982a991fb0 Video man enters the scene - Fixes multiple issues that were preventing the project from building - Fixes an issue that was causing project build class files to be included in git commits Video 2023-03-10 23:41:06 -07:00
• adbad1ad9b Update TFD4J.java Paul Reilly 2023-03-10 20:17:38 -06:00
• cbd3caaab3 Another fix Paul Reilly 2023-03-10 19:27:20 -06:00
• 49696f0c30 Minor fix Paul Reilly 2023-03-10 19:25:18 -06:00
• 3a96c853d2 Cyclic Dependency Patch Paul Reilly 2023-03-10 19:21:03 -06:00
• b5804c7eb1 Attempt to fix maven compiler issues Paul Reilly 2023-03-09 09:41:13 -06:00
• f9ecebd5c9 Fix Minor Discrepancy Paul Reilly 2023-03-09 09:36:59 -06:00
• 3a6e7921cc Merge branch 'development' into RELEASE-2023.03 Paul Reilly 2023-03-09 09:13:44 -06:00
• b7ea1b8b3e 2023.03 update 2 / 2 Paul Reilly 2023-03-09 03:50:47 -06:00
• 2265783afb Part 1 / 2 Paul Reilly 2023-03-09 01:42:18 -06:00
• 41331e719d Updates version to 2022.06.1 2022.06.1 Video 2023-03-08 19:58:14 -07:00
• 72c83ba84a
  Merge pull request #306 from AtlasMediaGroup/critical-exploit-fix Video 2023-03-08 19:53:51 -07:00
• 3deaaafb88 Patches critical exploit Video 2023-03-08 19:52:30 -07:00
• 520bd97176
  Merge branch 'development' into ver/1.19.3 Allink 2023-03-04 05:14:30 +00:00
• 71127c3152
  Add configuration option for disabling books (#275) Allink 2023-02-20 23:39:40 +00:00
• 654f5900ba
  Update to 1.19.3 Allink 2023-02-20 17:44:57 +00:00
• f53696aa9e dissc Paul Reilly 2023-02-16 20:28:38 -06:00
• ea60be4c48 Implemenn Matt Masters 2023-02-16 18:30:34 -06:00
• 3bd177ea6f
  Bump actions/setup-java from 3.6.0 to 3.9.0 (#291) dependabot[bot] 2023-01-07 20:21:19 +00:00
• 1c0b768e4f
  Add logging to ro command - FS-233 (#282) Nathan Curran 2023-01-08 05:31:11 +11:00
• 67b0656e61
  Merge pull request #285 from AtlasMediaGroup/fs24 Paldiu 2023-01-06 20:37:26 -06:00
• b3e1a8b528 Aggressive debloat - Removes unused Logviewer functionality - Removes several unused bits of code from FPlayer - Changes the build configuration to not shade in org.apache.commons:commons-lang3, commons-io.commons-io, jetbrains.annotation, and org.javassist:javassist, opting instead to load them in on runtime using a little-known Spigot trick Video 2022-11-21 07:09:59 -07:00
• 99a5897d44 Go fuck yourself Codacy Codacy complained about me forgetting a "default" case in my rewrite of /moblimiter, so I have to do this shit. Video 2022-11-20 23:02:00 -07:00
• 9064f4b1f2 A few more changes - Cleans up /potion a tiny bit - Rewrites part of /moblimiter - Resolves FS-346 by cleaning up /setlever - Modernizes /opall a bit - Changes more components to use Adventure Video 2022-11-20 22:57:31 -07:00
• 2698cbf46d Too much shit to list in the commit name - Removes ancient unused code - General code cleanup in some places - Rewrites a few components to use Adventure (testing needed) - Rewrites a few commands to use more modern Java features like Streams - Fixes oversight where vanishing still worked by names and not UUIDs - Removes unused Pterodactyl integration - Removes AutoEject's IP range banning functionality - Does some minor cleanup to HTTPD's list & players modules - Fixes ages-old bug in the AntiSpam that caused it to falsely mute players Video 2022-11-17 01:34:45 -07:00
• d3b4feaec9
  Merge branch 'development' into fs24 Video 2022-11-16 03:04:35 -07:00
• c9adb0c5a8 Codacy is incredibly picky and I hope it burns in hell Video 2022-11-16 03:01:51 -07:00
• cb642eba08 Completely rewrites the Block Inspector, fixes bug in BukkitTelnetBridge caused when Essentials is not installed Video 2022-11-15 21:32:21 -07:00
• fa85b8e160
  Merge pull request #284 from AtlasMediaGroup/FS-454 Paldiu 2022-11-14 17:12:17 -06:00
• 69a06167a1 Resolves FS-464 Banners had a cap in them to mitigate the effects of chunk bans back in like 2019. This removes that ancient broken cap. Video 2022-11-14 11:41:38 -07:00
• 550ff492ee Resolves FS-339 by aggressively rewriting /list and removing ancient unused code Video 2022-11-14 10:54:59 -07:00
• 88914632f5 Resolves FS-321 by aggressively rewriting /plugincontrol Video 2022-11-14 00:38:42 -07:00
• 47445933f3 Resolves FS-320 and fixes FS-471 Video 2022-11-13 23:20:46 -07:00
• 94d6f0a872 Attempts to resolve FS-311 and mitigates FS-396 Video 2022-11-13 20:53:50 -07:00
• 3d67c83ea4 Resolves FS-322 Video 2022-11-13 07:01:30 -07:00
• 22161b2e90 Resolves FS-331 Video 2022-11-13 06:55:17 -07:00
• b1f08c3b7f God fucking dammit Video 2022-11-13 06:49:32 -07:00
• 466745d51f Resolves FS-348 Video 2022-11-13 06:46:48 -07:00
• 98921b975f Resolves FS-340 and improves some surrounding code a bit Video 2022-11-13 06:44:56 -07:00
• 35d53ece4e Resolves FS-338 Video 2022-11-13 06:40:36 -07:00
• 33146fa161 Resolves FS-337 Video 2022-11-13 06:35:44 -07:00
• d7fddc3765 Resolves FS-333 Video 2022-11-13 06:31:45 -07:00
• 0db765af43
  Merge branch 'development' into FS-454 Ryan 2022-11-13 13:31:33 +00:00
• f4cb736c17 Resolves FS-325 Video 2022-11-13 06:28:53 -07:00
• 3763e0728d Resolves FS-341 Video 2022-11-13 06:25:56 -07:00
• af18299613 Resolves FS-318 by rewriting the /mute command This has the fortunate side-effect of also fixing several bugs present in the original command. Video 2022-11-13 06:19:10 -07:00
• f0d6549eec Resolves FS-316 by aggressively rewriting /blockedit Disclaimer: I did this whilst sleep deprvied. I didn't know how the fuck NPath is calculated so to play it safe I aggressively rewrote the command. I also took the opportunity to make some of the command's messages more consistent with eachother (using restrict/restore instead of block/unblock). Video 2022-11-13 04:49:58 -07:00
• 3b61ba408f Fixes FS-314 Video 2022-11-04 22:58:36 -06:00
• af710edc88 Fixes FS-323 by rewriting ride modes to make sense Video 2022-11-04 22:26:19 -06:00
• 459a11e638 Fixes FS-349 Video 2022-11-04 21:32:23 -06:00
• 2e41414358 Fixes FS-343 Video 2022-11-04 21:30:28 -06:00
• a3d7fe19a0
  Bump codacy/codacy-analysis-cli-action from 4.1.0 to 4.2.0 (#269) dependabot[bot] 2022-11-03 12:20:56 +00:00
• 3548daa3e5
  Merge branch 'development' into dependabot/maven/development/org.apache.maven.plugins-maven-shade-plugin-3.4.1 dependabot/maven/development/org.apache.maven.plugins-maven-shade-plugin-3.4.1 Ryan 2022-10-29 18:29:12 +01:00
• 7f4000aff9
  Remove indefinite wording for bans with expiry Focusvity 2022-10-29 22:09:58 +11:00
• d2884f007b
  Remove ParseException from IConfig Focusvity 2022-10-29 21:36:05 +11:00
• 58b1890183
  Add expiry to indefinite bans Focusvity 2022-10-29 21:33:00 +11:00
• 8317b1f881
  Remove unused imports, variables and other minor oversights in the Discord bridge (#280) Allink 2022-10-28 13:46:16 +01:00
• fc796bd340
  Bump maven-shade-plugin from 3.3.0 to 3.4.1 dependabot[bot] 2022-10-28 12:26:57 +00:00
• 706e9540ce
  Remove Broken Downstream Merge Action (#281) Ryan 2022-10-28 13:25:59 +01:00
• ac00d36dc6
  Bump actions/setup-java from 3.5.1 to 3.6.0 (#279) dependabot[bot] 2022-10-25 00:32:07 +01:00
• a2133369d2
  Merge pull request #276 from AtlasMediaGroup/FS-460-remove-sit-command-from-tfm Video 2022-10-17 11:32:36 -06:00
• 48728c9524
  Merge branch 'development' into FS-460-remove-sit-command-from-tfm Video 2022-10-17 09:51:09 -06:00
• d343bbc3d7
  Merge pull request #268 from AtlasMediaGroup/FS-452-not-fucked Video 2022-10-16 20:14:26 -06:00
• 2c357d1d49
  Remove /sit command Allink 2022-10-13 19:53:04 +01:00
• 5246639608
  Merge branch 'development' into FS-452-not-fucked Ryan 2022-10-12 21:37:18 +01:00
• 7fb4a477dc
  Removes TFGuilds integration (#264) Video 2022-10-12 14:36:49 -06:00
• 612499ff0a
  Merge pull request #274 from AtlasMediaGroup/main Ryan 2022-10-12 17:41:40 +01:00
• edb3dbfdbe
  Merge pull request #273 from AtlasMediaGroup/RELEASE-2022.06 Ryan 2022-10-12 17:37:09 +01:00
• a332ecfbea
  Merge pull request #272 from AtlasMediaGroup/fix-interact-blocking Paldiu 2022-10-12 11:29:00 -05:00
• 7f78549f9d
  Merge branch 'development' into fix-interact-blocking Paldiu 2022-10-09 15:15:57 -05:00
• fd6f8a2d17
  Merge branch 'main' into RELEASE-2022.06 Ryan 2022-10-08 15:08:52 +01:00
• 21c84d76d3
  Bump actions/setup-java from 3.3.0 to 3.5.1 (#271) dependabot[bot] 2022-10-08 15:06:56 +01:00
• 88f53c05b9
  Remove guard clause causing unintended side effects Allink 2022-10-05 08:55:34 +01:00
• 51cc527697 Removes /nh and code associated with it (except this time its based on the right branch) Video 2022-09-14 19:24:58 -06:00
• ae5038ef0f
  Uplifts pom version to release 2022.06 Video 2022-09-13 21:54:42 -06:00
• ec5aa0304e Uplifts version 2022.06-RC3 Video 2022-09-12 21:42:04 -06:00
• ebafc1c669
  Hopefully fixing it this time (#119) Ryan 2022-09-12 22:54:44 +01:00
• 9f8dafb075
  Merge pull request #257 from AtlasMediaGroup/update-squash Ryan 2022-09-12 22:53:58 +01:00
• 1eaaf5fcdb Fixes bug where the whitelist wasn't working Video 2022-09-11 22:10:57 -06:00
• 42458084d7 Untitled bugfix Video 2022-09-11 16:47:12 -06:00
• 0cd2886e40 Fixes oversight where not having Essentials installed causes Discord reporting to fail Video 2022-09-11 16:14:31 -06:00
• 575568cb05 Fixes severe bug where changes to player data wouldn't save Video 2022-09-11 15:33:05 -06:00
• 26be5d0f44 Fixes bug where adminchat messages were duplicated when sent from in-game Yet another bug discovered during testing before the release was to be cut 2022.06-RC2 Video 2022-09-11 12:47:58 -06:00
• 7a724c2f13 Fixes bug that prevented /saconfig add from working properly This popped up during testing right before RC2 was intended to be cut. Video 2022-09-11 12:12:36 -06:00
• 9e1aa5d34e Uplifts version to 2022.06-RC2 Video 2022-09-11 11:36:21 -06:00
• 4564ad0449 Fix SAConfig NPE (originally by Allink) Video 2022-09-11 11:34:16 -06:00
• 1ddeb4b621
  Merge pull request #263 from AtlasMediaGroup/FS-450 Video 2022-09-11 11:30:37 -06:00
• a8665a15d4
  Merge pull request #262 from AtlasMediaGroup/FS-449 Video 2022-09-11 11:30:21 -06:00
• c0f3712c8d Fixes several bugs caused by any potential issues in TFM's admin loading system Video 2022-09-11 06:35:32 -06:00
• 0dd7bc06eb FS-449 Video 2022-09-11 06:04:01 -06:00
• 4d98108a46
  Remove uptime command (#250) Allink 2022-09-11 12:31:52 +01:00
• 02b2810488
  Merge remote-tracking branch 'origin/dependabot/maven/development/org.junit.jupiter-junit-jupiter-5.9.0' into megabranch Allink 2022-08-18 23:47:37 +01:00
• 7e110e8ac6
  Merge remote-tracking branch 'origin/dependabot/maven/development/org.javassist-javassist-3.29.1-GA' into megabranch Allink 2022-08-18 23:47:34 +01:00
• 6d3f365878
  Merge remote-tracking branch 'origin/dependabot/maven/development/net.essentialsx-EssentialsX-2.19.6' into megabranch Allink 2022-08-18 23:47:25 +01:00