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

• 05bb64ce85 Bump EssentialsX from 2.19.4 to 2.19.6 dependabot[bot] 2022-08-15 01:45:49 +00:00
• b05238c51f Bump javassist from 3.29.0-GA to 3.29.1-GA dependabot[bot] 2022-08-12 01:27:24 +00:00
• 7bda4beab0 Bump worldedit-bukkit from 7.2.10 to 7.2.12 dependabot[bot] 2022-08-08 01:42:07 +00:00
• 97544977b0 Bump junit-jupiter from 5.8.2 to 5.9.0 dependabot[bot] 2022-07-27 01:34:57 +00:00
• 073356be49 Properly patch Game Master Blocks (#245) Allink 2022-07-16 23:03:23 +01:00
• c472c5d5ce Merge pull request #243 from AtlasMediaGroup/beds Paldiu 2022-06-20 07:25:27 -05:00
• cb401577a4 Fix beds exploding in the Nether & End dimensions with explosions off Allink 2022-06-20 02:46:09 +01:00
• 9d3165694a Update version 2022.06-RC1 Telesphoreo 2022-06-17 16:04:55 -05:00
• cffb5d9326 Bump codacy/codacy-analysis-cli-action from 4.0.2 to 4.1.0 (#242) dependabot[bot] 2022-06-16 12:33:31 +01:00
• 4e8df0938f Merge pull request #240 from AtlasMediaGroup/add-devs Telesphoreo 2022-06-08 18:11:49 -05:00
• 511f172d84 Add developers and improve code readability Telesphoreo 2022-06-08 17:57:22 -05:00
• bfa8b2a752 Merge pull request #239 from AtlasMediaGroup/FS-222 Telesphoreo 2022-06-05 18:47:21 -05:00
• 594b1f5605 Merge branch 'development' into FS-222 Telesphoreo 2022-06-05 18:42:51 -05:00
• b9ca4f52a2 Merge pull request #238 from AtlasMediaGroup/properly-update Telesphoreo 2022-06-05 18:41:34 -05:00
• d298e923b8 Merge pull request #227 from allinkdev/FS-222 Allink 2022-06-06 00:37:29 +01:00
• d0d97c0681 Merge branch 'development' into properly-update Telesphoreo 2022-06-05 18:36:50 -05:00
• 2540c7c589 Merge pull request #237 from AtlasMediaGroup/discord Telesphoreo 2022-06-05 18:35:35 -05:00
• 6bc91fc779 Merge pull request #236 from allinkdev/properly-update Allink 2022-06-06 00:35:22 +01:00
• 9a54ef66d1 Merge pull request #231 from allinkdev/discord Allink 2022-06-06 00:31:13 +01:00
• 722ef5f99a Merge branch 'development' into discord Allink 2022-06-05 23:11:39 +01:00
• 6bf6eeec91 Merge branch 'development' into properly-update Allink 2022-06-05 22:53:56 +01:00
• 9df30a9556 Merge branch 'development' into FS-222 Ryan 2022-06-05 22:52:30 +01:00
• 83bb892056 Merge pull request #233 from AtlasMediaGroup/fix-readme Telesphoreo 2022-06-05 16:51:23 -05:00
• 62ff195ec5 Merge branch 'development' into fix-readme Ryan 2022-06-05 22:48:25 +01:00
• 495fe79d94 Properly update Allink 2022-06-05 22:44:38 +01:00
• 422b41dc8d Merge branch 'development' into FS-222 Allink 2022-06-05 22:41:02 +01:00
• f44a1c7e69 Merge branch 'development' into discord Allink 2022-06-05 22:40:48 +01:00
• 9f8dd91457 Merge pull request #235 from AtlasMediaGroup/update-deps Telesphoreo 2022-06-05 16:30:08 -05:00
• ee45256764 Update all dependencies, confirmed working Telesphoreo 2022-06-05 16:09:23 -05:00
• f6faf3b8bc Merge pull request #166 from AtlasMediaGroup/dependabot/maven/development/org.jetbrains-annotations-23.0.0 Telesphoreo 2022-06-05 15:38:43 -05:00
• 8210dafcd3 Bump annotations from 22.0.0 to 23.0.0 dependabot[bot] 2022-06-05 20:04:42 +00:00
• 4eb8174aa9 Merge pull request #164 from AtlasMediaGroup/dependabot/maven/development/org.reflections-reflections-0.10.2 Telesphoreo 2022-06-05 15:02:37 -05:00
• ab309032e5 Update README to fix badge Telesphoreo 2022-06-05 14:22:46 -05:00
• 0db661600f Merge remote-tracking branch 'origin/development' into discord Allink 2022-06-05 20:21:58 +01:00
• d94b184703 Bump reflections from 0.9.12 to 0.10.2 dependabot[bot] 2022-06-05 19:18:11 +00:00
• c07473ef6d Merge pull request #216 from AtlasMediaGroup/dependabot/maven/development/com.sk89q.worldedit-worldedit-bukkit-7.2.10 Telesphoreo 2022-06-05 14:15:46 -05:00
• d7261627ff Bump worldedit-bukkit from 7.2.8 to 7.2.10 dependabot[bot] 2022-06-05 18:39:30 +00:00
• 6ac7090fef Merge pull request #213 from AtlasMediaGroup/dependabot/maven/development/org.apache.maven.plugins-maven-compiler-plugin-3.10.1 Telesphoreo 2022-06-05 13:37:09 -05:00
• 611ee619a0 Merge branch 'development' into FS-222 Ryan 2022-06-05 18:18:55 +01:00
• 9d2555cd03 Bump maven-compiler-plugin from 3.8.1 to 3.10.1 dependabot[bot] 2022-06-05 15:31:57 +00:00
• 3c4b4140ce Bump actions/checkout from 2 to 3 (#202) dependabot[bot] 2022-06-05 16:29:29 +01:00
• 0f2d596b7a Bump actions/setup-java from 2.3.0 to 3.3.0 (#228) dependabot[bot] 2022-06-05 13:43:26 +01:00
• dcdaecf9b0 Bump aormsby/Fork-Sync-With-Upstream-action from 2.1 to 3.3 (#230) dependabot[bot] 2022-06-05 13:15:26 +01:00
• b4b10a3020 A single space Allink 2022-06-05 12:14:49 +01:00
• fb259ca9b7 Merge branch 'development' into FS-222 Ryan 2022-06-05 00:18:55 +01:00
• 52a39aa992 Bump github/codeql-action from 1 to 2 (#225) dependabot[bot] 2022-06-05 00:15:42 +01:00
• b4e7251e3b Merge pull request #232 from AtlasMediaGroup/main Ryan 2022-06-04 15:06:28 +01:00
• 0f1fbf9481 Merge pull request #198 from AtlasMediaGroup/RELEASE-2022.02 2022.02 Ryan 2022-06-04 15:04:16 +01:00
• 73eb3226ee allow spawn eggs to do SOMETHING (#219) ayunami2000 2022-06-04 09:59:35 -04:00
• 8edc87034f Merge branch 'development' into FS-222 Ryan 2022-06-03 19:21:07 +01:00
• 68bcabe5c2 fix httpd log spam (#223) ayunami2000 2022-06-03 13:27:37 -04:00
• ecc92589e9 Bump codacy/codacy-analysis-cli-action from 4.0.0 to 4.0.2 (#209) dependabot[bot] 2022-06-03 15:04:13 +01:00
• bf41d08580 Mention the user who completes the report so we can have their current Discord name (includes their current name & tag in-case they delete their account) Allink 2022-05-26 22:13:57 +01:00
• 0fc20b6c56 Merge branch 'development' into FS-222 Paldiu 2022-05-26 10:11:01 -05:00
• 9c91166319 Allow players to report offline players & allow admins to mark reports as completed, deleting them and sending them to an archive channel Allink 2022-05-26 16:10:00 +01:00
• 09a220e0a2 VPS -> Host Allink 2022-05-25 20:18:01 +01:00
• ad9dd42edb Remove unused import Allink 2022-05-25 19:55:25 +01:00
• c9f5db0141 Add Discord commands like the old bot Allink 2022-05-25 19:44:45 +01:00
• 47c30c3283 Add plural to Displayables Allink 2022-05-25 19:41:58 +01:00
• 6c426644f6 Add uptime & memory related functions to FUtil Allink 2022-05-25 18:49:53 +01:00
• 72bab1e2ed Add mean averaging to FUtil Allink 2022-05-25 18:41:35 +01:00
• 1726050d65 Clean up DiscordToMinecraftListener Allink 2022-05-25 17:18:49 +01:00
• 0fc5b01b29 Clean up message sanitization and properly strip section signs from nicks/messages Allink 2022-05-25 17:15:04 +01:00
• dfd90af017 Merge pull request #224 from AtlasMediaGroup/dependabot/maven/development/org.apache.maven.plugins-maven-antrun-plugin-3.1.0 Paldiu 2022-05-24 20:47:32 -05:00
• f63362a9fb Properly check for permissions using NM, add prefixes support to chats Fix up the list module a bit more FS-200 Taah 2022-05-24 18:32:27 -07:00
• 54b803e09b Work on the module list to support permissions Taah 2022-05-23 23:15:12 -07:00
• 9fba895088 Begin working on permissions implementation. I don't know where every usage is but I've done a generalized implementation so far for commands. Taah 2022-05-23 22:44:08 -07:00
• feba260744 Bump aormsby/Fork-Sync-With-Upstream-action from 2.1 to 3.3 dependabot[bot] 2022-05-23 01:40:31 +00:00
• 5af45a2154 Do the disabling in the admin class, so it works with commands like doom & also disable potion spy Business Goose 2022-05-03 09:44:36 +01:00
• 54df28022f Remove offline vanished players & check if the player is online before attempting to get the FPlayer Business Goose 2022-05-03 09:23:37 +01:00
• 0326171e85 Unvanish, remove commandspy & set fuckoff radius to 0 for removed admins Business Goose 2022-05-03 08:58:14 +01:00
• d13ecea947 Merge branch 'RELEASE-2022.02' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2022.02 Paldiu 2022-05-01 09:55:58 -05:00
• 7ec053c867 Adjusted version Paldiu 2022-05-01 09:55:47 -05:00
• 1dcc05e7f5 Merge pull request #195 from AtlasMediaGroup/Wild1145-patch-3 Ryan 2022-05-01 15:45:16 +01:00
• c913b7ae74 Set Maven Shade version to 3.3.0 Paldiu 2022-05-01 09:41:53 -05:00
• 951f3c91d9 2022.02-RELEASE Versioning Paldiu 2022-05-01 09:31:20 -05:00
• b573871c14 Bump maven-antrun-plugin from 3.0.0 to 3.1.0 dependabot[bot] 2022-05-01 11:42:11 +00:00
• 78654eb5e8 Merge pull request #222 from AtlasMediaGroup/stabilization Video 2022-05-01 05:39:48 -06:00
• adbe125283 increments version Video 2022-04-20 17:03:13 -06:00
• e6a20e1757 fix httpd log spam ayunami2000 2022-04-17 14:58:58 -07:00
• d71d8edf53 Merge branch 'development' into stabilization Video 2022-04-15 08:09:05 -06:00
• 6af9f240f4 Stage 3 of IP -> UUID migration: completely removing the verification system Video 2022-04-15 07:52:06 -06:00
• 05745c4210 Stage 2 of IP -> UUID migration: changing the admin list to use UUIDs Video 2022-04-15 07:09:23 -06:00
• 98388d0d23 Stage 1 of IP -> UUID migration: changing player data to use UUIDs instead Video 2022-04-15 06:27:32 -06:00
• 1da87eeb37 Merge pull request #217 from AtlasMediaGroup/dependabot/maven/development/net.coreprotect-coreprotect-21.2 Video 2022-04-15 05:44:33 -06:00
• b656925e4f Fixes two bugs related to commands Video 2022-04-15 05:28:32 -06:00
• d4f44e988c Additional future-proofing Video 2022-04-15 05:08:11 -06:00
• c39c632a67 Removes useless code Video 2022-04-15 05:03:41 -06:00
• 733f002a87 Bump to RC02 and fix Netbeans compile issue. Wild1145 2022-03-27 19:49:16 +01:00
• adcccb10e5 Removes dependency on NMS Video 2022-03-25 14:45:32 -06:00
• 3fdc0c05bb Bump coreprotect from 20.4 to 21.2 dependabot[bot] 2022-03-22 01:56:59 +00:00
• 2551d184ca Merge pull request #211 from AtlasMediaGroup/RELEASE-2022.02 Paldiu 2022-03-11 18:09:21 -06:00
• f9eabf27d5 Merge pull request #205 from AtlasMediaGroup/fs-442 Video 2022-03-06 16:15:53 -07:00
• 76ce98621a Corrected now that we're targeting the 2022.02 relase. Ryan 2022-03-06 14:42:45 +00:00
• bc0495a68f Update SECURITY.md Ryan 2022-02-05 23:32:19 +00:00
• 846154a723 will this work Video 2022-03-06 03:20:47 -07:00
• 804614d011 Bump to 2022.02-RC01 Release 2022.02-RC01 Ryan Wild 2022-02-23 23:23:14 +00:00
• 2c22c6c52d Merge pull request #194 from AtlasMediaGroup/Wild1145-patch-1 Paldiu 2022-02-23 17:10:09 -06:00
• 5ef0f29ffe Merge branch 'development' into Wild1145-patch-1 Ryan 2022-02-23 22:48:53 +00:00
• 11134f4109 Merge pull request #197 from AtlasMediaGroup/FS-292 Ryan 2022-02-23 22:48:32 +00:00