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

• 90e2f440e7
  Merge ff47adf987b337e8010afd68e92465f0b349f368 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-10-25 01:26:25 +00:00
• ff47adf987
  Bump org.codehaus.mojo:properties-maven-plugin from 1.1.0 to 1.2.1 dependabot/maven/development/org.codehaus.mojo-properties-maven-plugin-1.2.1 dependabot[bot] 2023-10-25 01:26:23 +00:00
• 699468c6b3
  Merge c39d030e85c29cd9f7da468b4c1a31f062a2ed1b into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-10-12 02:01:24 +00:00
• c39d030e85
  Bump com.sk89q.worldedit:worldedit-bukkit from 7.2.15 to 7.2.17 dependabot/maven/development/com.sk89q.worldedit-worldedit-bukkit-7.2.17 dependabot[bot] 2023-10-12 02:01:23 +00:00
• e1894c3ac8
  Bump com.sk89q.worldedit:worldedit-bukkit from 7.2.15 to 7.2.16 dependabot[bot] 2023-10-02 01:26:02 +00:00
• c2166791fe
  Merge eea8cef3b5c21d6830e0e96efd00099cf334e702 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-09-26 01:05:42 +00:00
• eea8cef3b5
  Bump net.coreprotect:coreprotect from 21.3 to 22.2 dependabot/maven/development/net.coreprotect-coreprotect-22.2 dependabot[bot] 2023-09-26 01:05:40 +00:00
• eca99091b5
  Merge 45c4fbe0eab3972c78256555330218fa4eac443c into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-09-05 01:06:38 +00:00
• 45c4fbe0ea
  Bump actions/checkout from 3 to 4 dependabot/github_actions/development/actions/checkout-4 dependabot[bot] 2023-09-05 01:06:37 +00:00
• c68170d137
  Bump net.coreprotect:coreprotect from 21.3 to 22.1 dependabot[bot] 2023-08-30 01:13:56 +00:00
• 04c83202b2
  Merge e2bfab49db004698b2803ad95c14923f7f7071ea into 1615ab416c8087e0f409a076c28f513552385636 Pharma 2023-08-19 20:45:39 +01:00
• 0495b5a77b
  Merge d71cdf9b957860ce4067431d5827acb1280b1eb4 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-07 01:37:53 +00:00
• d71cdf9b95
  Bump net.essentialsx:EssentialsX from 2.20.0 to 2.20.1 dependabot/maven/development/net.essentialsx-EssentialsX-2.20.1 dependabot[bot] 2023-08-07 01:37:52 +00:00
• 2841c15e73
  Merge 1615ab416c8087e0f409a076c28f513552385636 into 8fee6c7f143b39342d098cbc949c79f779f7f960 allinkdev 2023-08-01 07:22:36 +00:00
• c54d6a12da
  Bump org.codehaus.mojo:properties-maven-plugin from 1.1.0 to 1.2.0 dependabot[bot] 2023-08-01 02:27:06 +00:00
• c70b449825
  Bump net.coreprotect:coreprotect from 21.3 to 22.0 dependabot[bot] 2023-08-01 02:27:03 +00:00
• bbedfe51e0
  Merge 91ebe261819631d9cc1953e370ed87f1210aa8d6 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:27 +00:00
• c6904f0c90
  Merge a5c3597bb9dac99441760a4b59ac7c84f3406303 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:27 +00:00
• 8989d5ae9e
  Merge 47d429a8f92c54530fcf83cb95bff9ab2c9a0aaf into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:26 +00:00
• 0f11808cc8
  Merge e6f3b745236bfa3c8c4e4be1300d2c10fa3fcb0b into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:24 +00:00
• fb2496db91
  Merge cf868ca81cae01df0ac4e1524ccf1b40186aa52d into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:23 +00:00
• 22a33fcf01
  Merge 5fee35e2b75a579153f68381d4ffcba1f9dd35f9 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:21 +00:00
• b37889db5f
  Merge f77c071fa0fdbb37f162755746d815b3effbf3ef into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:20 +00:00
• 31d0b8a95f
  Merge 577cc53281952ead7b26ae0d7330926f5cc4be99 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:19 +00:00
• 6f81106ca2
  Merge 2b90d6516ae80db40821139bd62668a8969d5164 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:17 +00:00
• 1530f531e9
  Merge 4cd54e0259f49018493dd596e256dcb0a5d16884 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:16 +00:00
• 74fc4a8165
  Merge 3548daa3e5794ec6c94e7c78d18b003362981973 into 1615ab416c8087e0f409a076c28f513552385636 dependabot[bot] 2023-08-01 02:26:16 +00:00
• 1615ab416c
  Merge pull request #343 from AtlasMediaGroup/port/1.20.1 development Paldiu 2023-07-31 21:26:12 -05:00
• ed7f8b4b8e
  Add new developers to the dev list Allink 2023-07-31 06:03:43 +00:00
• 9149b279a7
  Bump dependency versions Allink 2023-07-31 05:06:47 +00:00
• 243cba689f
  Bump API version to 1.20 Allink 2023-07-31 05:04:36 +00:00
• f11d9d650e
  Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.13.0 dependabot[bot] 2023-07-31 01:31:29 +00:00
• 1364b551d8
  Merge pull request #340 from AtlasMediaGroup/merge/main/development Paldiu 2023-07-25 14:29:10 -05:00
• 372ac965a9
  Merge branch 'development' into dependabot/maven/development/net.essentialsx-EssentialsX-2.20.0 allinkdev 2023-07-25 19:58:37 +01:00
• d8a38fc538
  Bump org.junit.jupiter:junit-jupiter from 5.9.0 to 5.10.0 dependabot[bot] 2023-07-25 18:39:17 +00:00
• 059c92b0de
  Merge dc30f4e4133c6eeea95207ed89e9bce74cf8776b into d471490a946be1e877d315d0a4620c22fc31f0f4 dependabot[bot] 2023-07-25 18:38:41 +00:00
• 8fee6c7f14
  Merge pull request #339 from AtlasMediaGroup/merge/development/main main 2023.07-LEGACY-RC01 Paldiu 2023-07-25 13:38:29 -05:00
• 0559e99fb1
  Drop ptero_id column from admin table Allink 2023-07-25 18:56:06 +01:00
• 1251276451
  Fix formatting in AdminList Allink 2023-07-25 18:32:59 +01:00
• e2bfab49db
  Merge branch 'development' into development allinkdev 2023-07-25 17:45:19 +01:00
• 9e584069e6
  Ignore interact events from Spectators Allink 2023-07-25 17:43:15 +01:00
• 11c24cff68
  Ignore cancelled interact events Allink 2023-07-25 17:42:32 +01:00
• 476c87ceb0
  Improve Discord bridge sanitization Allink 2023-07-25 17:32:28 +01:00
• 9bef4581aa
  Use Bukkit.getScheduler().runTaskAsynchronously to execute the report Allink 2023-07-25 17:08:05 +01:00
• 794a25ba16
  Remove getCommandMap() method in CommandBlocker Allink 2023-07-25 16:40:25 +01:00
• b4dd35c4df
  Stop pinning minor & patch revisions of workflows Allink 2023-07-25 15:13:17 +01:00
• ec19b6d398
  Make the Discord command parsing more forgiving Allink 2023-07-25 04:13:40 +01:00
• b2c636f919
  Fix invalid Discord command handling Allink 2023-07-25 03:57:24 +01:00
• 8876076a9d
  Fix JDA deprecation issue Allink 2023-07-25 03:47:33 +01:00
• 80f19f0349
  Disable mentions in archival message Allink 2023-07-25 03:47:05 +01:00
• 011535cf16
  Make Discord report filing system asynchronous Allink 2023-07-25 03:45:22 +01:00
• eb99dcd3a3
  Optimize EssentialsBridge imports Allink 2023-07-25 02:00:34 +01:00
• 597a464623
  Add run/ to .gitignore Allink 2023-07-25 01:59:46 +01:00
• 08c8393abc
  Fix ArrayIndexOutOfBounds when a newly added admin leaves the game Allink 2023-07-25 01:50:46 +01:00
• ac704614c0
  Fix updated plugin versions Allink 2023-07-25 00:38:02 +01:00
• 04029eb144
  Don't try to vanish/unvanish offline players... Luna 2023-06-19 15:56:19 -03:00
• 00e5403491
  Remove SK89Q maven repositories Allink 2023-07-25 00:30:46 +01:00
• 08115470b0
  Fix reactions showing up in Discord bridge & colour codes showing up in bridge Allink 2023-07-25 00:28:58 +01:00
• bed6c71aef
  Merge e7d4d79903735a2186d387188569102947ca14e6 into d471490a946be1e877d315d0a4620c22fc31f0f4 dependabot[bot] 2023-07-25 01:02:51 +00:00
• 6e140ace7d
  Fix /ci tab completion throwing exceptions Allink 2023-07-25 00:26:47 +01:00
• 9ce4dc6f3a
  Fix CommandSpy colours Allink 2023-07-25 00:21:41 +01:00
• f67db2286d
  Update GitHub actions dependencies Allink 2023-07-25 00:18:26 +01:00
• 07b3553748
  Update Essentials & WorldGuard Allink 2023-07-25 00:16:26 +01:00
• bbbccc2b10
  Update some dependencies Allink 2023-07-25 00:10:19 +01:00
• d471490a94
  Merge pull request #338 from AtlasMediaGroup/merge/main/development Paldiu 2023-07-24 17:56:29 -05:00
• 8f6d276bb6
  Merge branch 'main' of github.com:AtlasMediaGroup/TotalFreedomMod into merge/main/development Allink 2023-07-24 23:39:09 +01:00
• b5178e6761
  Merge pull request #336 from AtlasMediaGroup/feat/configurable-item-drops Paldiu 2023-07-24 17:35:30 -05:00
• e11d72b54b
  Merge branch 'main' into merge/main/development Allink 2023-07-24 23:23:01 +01:00
• ee594e7c63
  Add configuration value for player item drops Allink 2023-07-23 00:04:46 +01:00
• 0333a0988c
  Merge branch 'development' into feat/build-changes/main feat/build-changes/main allinkdev 2023-07-14 20:21:48 +01:00
• beddbe42dd Merge branch 'main' into merge-branch-between-main-and-dev merge-branch-between-main-and-dev Paul Reilly 2023-07-11 12:12:09 -05:00
• fefb750b47 Merge branch 'development' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development Paul Reilly 2023-07-11 12:11:25 -05:00
• bd5edc3156 Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod Paul Reilly 2023-07-11 12:10:51 -05:00
• cc13d9cf49 Remove UUID from vanished list on removal (#298) allinkdev 2023-07-05 16:10:07 +01:00
• 96be5f1149 Bump worldedit-bukkit from 7.2.12 to 7.2.15 dependabot[bot] 2023-07-01 22:28:55 +00:00
• d7da199d26 Bump actions/setup-java from 3.6.0 to 3.9.0 (#291) dependabot[bot] 2023-01-07 20:21:19 +00:00
• 64f4fbfe18 Add logging to ro command - FS-233 (#282) Nathan Curran 2023-01-08 05:31:11 +11:00
• fa1b6dde4c 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
• 6a5b5c241e 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
• cec506f148 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
• 4602e2246b Remove indefinite wording for bans with expiry Focusvity 2022-10-29 22:09:58 +11:00
• 3ac893db50 Remove ParseException from IConfig Focusvity 2022-10-29 21:36:05 +11:00
• bcf8c2f04a Add expiry to indefinite bans Focusvity 2022-10-29 21:33:00 +11:00
• 88eceab480 Codacy is incredibly picky and I hope it burns in hell Video 2022-11-16 03:01:51 -07:00
• df756d43ef Completely rewrites the Block Inspector, fixes bug in BukkitTelnetBridge caused when Essentials is not installed Video 2022-11-15 21:32:21 -07:00
• 91c4153037 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
• c5f0886df6 Resolves FS-339 by aggressively rewriting /list and removing ancient unused code Video 2022-11-14 10:54:59 -07:00
• ca990bc526 Resolves FS-321 by aggressively rewriting /plugincontrol Video 2022-11-14 00:38:42 -07:00
• 546827cd5a Resolves FS-320 and fixes FS-471 Video 2022-11-13 23:20:46 -07:00
• e7e08c060e Attempts to resolve FS-311 and mitigates FS-396 Video 2022-11-13 20:53:50 -07:00
• eb6a91323d Resolves FS-322 Video 2022-11-13 07:01:30 -07:00
• 2fbd7578ab Resolves FS-331 Video 2022-11-13 06:55:17 -07:00
• 75cd1864f6 God fucking dammit Video 2022-11-13 06:49:32 -07:00
• a420339017 Resolves FS-348 Video 2022-11-13 06:46:48 -07:00
• 2b5ea048cc Resolves FS-340 and improves some surrounding code a bit Video 2022-11-13 06:44:56 -07:00
• 20f341ea45 Resolves FS-338 Video 2022-11-13 06:40:36 -07:00
• eadbc504e5 Resolves FS-337 Video 2022-11-13 06:35:44 -07:00
• 760ab3c622 Resolves FS-333 Video 2022-11-13 06:31:45 -07:00
• b804459dcc Resolves FS-325 Video 2022-11-13 06:28:53 -07:00
• 63f805935f Resolves FS-341 Video 2022-11-13 06:25:56 -07:00