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

• 9713fcabd6 Should work fingers crossed Elmon11 2021-03-21 18:25:28 +01:00
• dc10c40578 noclear option in smite Elmon11 2021-03-21 13:57:24 +01:00
• db3c190b2b Merge branch 'development' into tfm-bugfix-001 Nathan Curran 2021-03-21 16:11:13 +11:00
• 2725857364 Merge pull request #38 from AtlasMediaGroup/FS-147 Paldiu 2021-03-20 22:14:10 -05:00
• 9f291f675c Use 'toEpochMilli()' instead (FS-147) Nathan Curran 2021-03-21 13:44:55 +11:00
• 561c192c27 Fix bans not expiring (FS-147) Nathan Curran 2021-03-21 12:21:15 +11:00
• 086dec28ac Merge branch 'development' into tfm-bugfix-001 Ryan 2021-03-19 23:31:31 +00:00
• b03870c0aa SQL Fixes Paldiu 2021-03-19 10:39:58 -05:00
• f5c08cd28b Merge pull request #34 from AtlasMediaGroup/2021.02-release Ryan 2021-03-19 14:26:02 +00:00
• 2a87271642 Should fix FS-143 Paldiu 2021-03-19 08:58:29 -05:00
• 3b57aec0e8 Merge branch 'development' into 2021.02-release Ryan 2021-03-18 23:57:10 +00:00
• efac65bc76 Merge pull request #35 from AtlasMediaGroup/FS-58 Ryan 2021-03-18 23:17:25 +00:00
• 9c8fe6c590 Fix checkstyle & other formatting Ryan Wild 2021-03-18 22:42:52 +00:00
• 9f52cdf753 Merge branch 'development' into 2021.02-release Ryan 2021-03-18 22:28:53 +00:00
• 216234ea01 Merge pull request #32 from AtlasMediaGroup/FS-33 Paldiu 2021-03-18 16:20:06 -05:00
• 881dead392 Merge branch 'development' into 2021.02-release Nathan Curran 2021-03-19 08:04:36 +11:00
• ff2bca26aa Merge branch 'development' into FS-33 Ryan 2021-03-18 19:58:10 +00:00
• 89ad934aa6 Bump version to 2021.02 Release Ryan Wild 2021-03-18 19:18:11 +00:00
• d0a195647c Merge pull request #33 from AtlasMediaGroup/FS-93 Paldiu 2021-03-17 09:06:45 -05:00
• eb05b05042 Fixed FS-93 Nathan Curran 2021-03-16 20:21:31 +11:00
• b9c1970d20 Update player's permission when opping. Nathan Curran 2021-03-16 19:56:29 +11:00
• 9eca9ac5b2 Remove double storage Nathan Curran 2021-03-08 11:34:48 +11:00
• 5b577fae07 Add myself to developer list Nathan Curran 2021-03-07 20:46:30 +11:00
• 452a8755c2 Properly fix FS-33 Nathan Curran 2021-03-07 20:43:25 +11:00
• 2fb8f224e7 Bump release to 2021.02-RC03 2021.02-RC03 2021.02 Ryan Wild 2021-03-06 23:38:46 +00:00
• b6a2c8e021 Merge pull request #29 from AtlasMediaGroup/abhi-test Ryan 2021-03-06 20:32:04 +00:00
• f0a25fde0c Merge branch 'development' into abhi-test Ryan 2021-03-06 20:03:19 +00:00
• 4324497831 Merge pull request #31 from AtlasMediaGroup/Wild1145-patch-1 Ryan 2021-03-06 20:03:02 +00:00
• 14c53b7370 Merge branch 'development' into Wild1145-patch-1 Ryan 2021-03-06 19:47:48 +00:00
• 0396b8ad86 Merge pull request #30 from AtlasMediaGroup/frontdoor-and-banExpiry-only Ryan 2021-03-06 19:46:57 +00:00
• 8ee7486afc Merge branch 'development' into frontdoor-and-banExpiry-only Ryan 2021-03-06 19:38:01 +00:00
• 694d9614c5 Tell Maven to also build Java 11 for once Ryan 2021-03-06 19:28:38 +00:00
• 150e25072a Tell CodeQL we're using Java 11 hopefully Ryan 2021-03-06 19:14:46 +00:00
• 7d990ae2c0 [+] Remove .idea abhiram 2021-03-06 23:50:23 +05:30
• 0dd5a26efa Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only Paldiu 2021-03-06 12:12:59 -06:00
• 5c097c83cb Here's to hoping this fixes that stupid ban crap. Paldiu 2021-03-06 12:00:32 -06:00
• a85dd014a0 Added .idea in gitignore abhiram 2021-03-06 13:05:42 +05:30
• 342df43f85 Added myself to TFM abhiram 2021-03-06 13:04:36 +05:30
• d4be858c46 2021.02-RC02 Release Bump 2021-02-RC02 Ryan Wild 2021-03-05 21:44:38 +00:00
• ec9a6e0d5b paldiu did some shit Ivan 2021-03-04 20:37:31 -05:00
• 9161016f73 Merge branch 'development' into frontdoor-and-banExpiry-only Paldiu 2021-03-03 11:52:37 -06:00
• bdd22f8d75 Update month to be 30 days instead of 4 weeks Paldiu 2021-03-03 12:50:45 -05:00
• ce103ffd50 Merge pull request #28 from AtlasMediaGroup/abhi-test Paldiu 2021-03-02 20:45:18 -06:00
• 85c35f25a3 [+] Fix codacy issue abhiram 2021-03-03 06:47:22 +05:30
• c29b312101 [+] Remove .idea abhiram 2021-03-02 23:11:17 +05:30
• a4ead85701 add annotations dependency Paldiu 2021-03-01 23:03:49 -06:00
• 46273b3301 Revert "SQL PreparedStatement Fixes" Paldiu 2021-03-01 23:03:13 -06:00
• d6b74a76bb [+] Fix of FS-33 abhiram 2021-02-28 21:28:20 +05:30
• 6f66957b17 Few fixes for JIRA issues.... abhiram 2021-02-28 21:08:39 +05:30
• 17347c23a5 SQL PreparedStatement Fixes Paldiu 2021-02-26 15:29:02 -06:00
• 718748f1a2 Commit Ultimate Paldiu 2021-02-26 15:26:13 -06:00
• 96d1c53ede First release candidate 2021-02-RC01 Ryan Wild 2021-02-26 16:53:00 +00:00
• 1293a8aa1e Merge pull request #26 from AtlasMediaGroup/ivan Ivan 2021-02-25 17:58:12 -05:00
• 96424694ee fix codacy errors Ivan 2021-02-25 17:03:31 -05:00
• 0367d9fd3a my end of the bargain Ivan 2021-02-25 16:42:30 -05:00
• 3b666f1fde Merge pull request #25 from AtlasMediaGroup/Elmon11-patch-1 Ivan 2021-02-17 18:25:19 -05:00
• ec51cb7408 removing BukkitTelnet from untouchable plugins Elmon11 2021-02-17 22:03:35 +01:00
• 4023394562 Merge pull request #24 from AtlasMediaGroup/FS-38 Ryan 2021-02-14 18:19:30 +00:00
• 5d312a12d4 Remove the duplicates that I can see based off of the recent warn Ryan Wild 2021-02-14 18:05:32 +00:00
• b88cdf1250 Re-Base Config against Freedom-01 Ryan Wild 2021-02-14 17:44:57 +00:00
• ebec598120 Fix file permissions Ryan Wild 2021-02-06 23:56:15 +00:00
• aa060ea4d8 Update README with security info Ryan 2021-02-06 23:42:03 +00:00
• fc3eef4d90 Fixed Travis Build Status Ryan 2021-02-06 23:06:15 +00:00
• 44ac012165 Re-adding Travis file based off of the original ones. Ryan 2021-02-06 22:44:50 +00:00
• 500d0e1044 Let's start using TravisCI Again Ryan 2021-02-06 22:43:29 +00:00
• 400a90b385 Merge pull request #21 from AtlasMediaGroup/smartnt-patch-1 Ivan 2021-01-25 21:28:43 -05:00
• b8a741aa58 Add new developers to util Ivan 2021-01-25 20:36:58 -05:00
• a3929ec07e Merge pull request #19 from AtlasMediaGroup/permission-changes Elmon11 2021-01-17 04:11:31 +01:00
• 8225daf6f1 permission changes & remove massmurder speed 2021-01-10 16:23:20 -05:00
• 8dce71eca1 Merge pull request #18 from AtlasMediaGroup/revert-15-sql-fix Ryan 2021-01-10 20:45:13 +00:00
• a2243abf2d Revert "SQL fix" Ryan 2021-01-10 20:44:57 +00:00
• 009b983c9a Merge pull request #15 from AtlasMediaGroup/sql-fix Ryan 2021-01-10 20:36:57 +00:00
• 1b3876cffa Merge branch 'development' into sql-fix speed 2021-01-10 15:06:40 -05:00
• ed48ce3a8f Merge pull request #11 from AtlasMediaGroup/paldiu-local speed 2021-01-10 15:06:22 -05:00
• 830daab8f4 Fix Daemon Error Paldiu 2021-01-08 17:32:54 -06:00
• 9688827a39 formatting speed 2021-01-08 10:10:54 -05:00
• 3464a33678 NPE on Thread.join() possible fix Paldiu 2021-01-08 00:25:46 -06:00
• 5754d70d05 Merge branch 'development' into sql-fix Paldiu 2021-01-07 14:46:13 -05:00
• fbf2972006 Merge branch 'sql-fix' into paldiu-local Paldiu 2021-01-07 13:40:59 -06:00
• aa2836b29a Merge branch 'mbw-fix' into paldiu-local Paldiu 2021-01-07 13:39:51 -06:00
• 260368585e reformat Paldiu 2021-01-07 13:29:47 -06:00
• 323fd1a031 Should be fine now Paldiu 2021-01-04 18:27:57 -06:00
• c7b0f77910 Merge branch 'development' into paldiu-local Paldiu 2021-01-04 13:14:53 -06:00
• 7fb6a2f087 Merge pull request #17 from AtlasMediaGroup/Elmon11-patch-1 speed 2021-01-03 13:47:14 -05:00
• e32c2eed15 Update FUtil.java Elmon11 2021-01-03 19:23:10 +01:00
• 7afa80c89f Update FUtil.java Elmon11 2021-01-03 19:18:14 +01:00
• a3cccc7ac0 Update FUtil.java Elmon11 2021-01-03 19:16:41 +01:00
• bc37ed5341 Fix developer title not showing up on Offline mode servers Elmon11 2021-01-03 19:04:23 +01:00
• 0a5ce5b9cc fix w/e in mbw speed 2020-12-31 13:06:05 -05:00
• a4e23dc03f Codacy Complacency Part 2 Paldiu 2020-12-29 22:14:57 -06:00
• 7a394e52e4 Codacy complacency Paldiu 2020-12-29 22:06:12 -06:00
• 9352a48650 Finalized lombok removal Paldiu 2020-12-29 21:37:50 -06:00
• a849e01ce5 Merge pull request #12 from AtlasMediaGroup/FS-59 Paldiu 2020-12-29 15:34:48 -05:00
• fd725ca6c5 Merge branch 'development' into paldiu-local Ryan 2020-12-28 22:51:44 +00:00
• 0703ea685e Merge branch 'development' into FS-59 Ryan 2020-12-28 22:51:21 +00:00
• 1ba468cbfc Merge branch 'development' into sql-fix speed 2020-12-28 17:49:11 -05:00
• 91dc89013c Merge pull request #14 from AtlasMediaGroup/mojangson-update Ryan 2020-12-28 22:44:20 +00:00
• 7cdeac451b SQL fix speed 2020-12-28 17:39:07 -05:00
• 5b8cf2798e Update pom.xml speed 2020-12-28 17:05:52 -05:00
• 98158e0f27 mojangson update speed 2020-12-28 17:04:14 -05:00