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

• f00f075551
  Merge branch 'development' into multiple-birds-one-stone Video 2021-09-06 14:38:42 -06:00
• 44ff621d73
  Bump bstats-bukkit from 1.8 to 2.2.1 (#99) dependabot[bot] 2021-09-06 20:21:49 +01:00
• 032e54e2d4 Multiple birds, one commit Video 2021-09-06 04:44:39 -06:00
• 3ca9835257
  Merge branch 'development' into FS-37 Video 2021-09-06 01:16:04 -06:00
• f69feed469 fixed Video 2021-09-06 01:14:21 -06:00
• 8253f94ac4
  Merge branch 'development' into FS-273 Video 2021-09-06 01:12:00 -06:00
• 54cb0cfac4
  FS-409 (#124) Video 2021-09-05 07:51:43 -06:00
• a4c81f202c
  Merge branch 'development' into shitcan-savedflags Ryan 2021-09-04 01:23:06 +01:00
• da82b27016
  Merge branch 'development' into FS-37 Ryan 2021-09-04 01:07:55 +01:00
• daf0126f45
  Merge branch 'development' into FS-273 Ryan 2021-09-04 01:07:39 +01:00
• f6d46b6178
  Merge branch 'development' into FS-215 Ryan 2021-09-04 01:07:33 +01:00
• a2d11d4b93
  Merge branch 'development' into FS-7 Ryan 2021-09-04 01:07:28 +01:00
• 23caa4e853
  Dependency Fix & Improvements (#132) Ryan 2021-09-04 01:07:04 +01:00
• a51f5c9bbf FS-273 Video 2021-09-03 13:53:33 -06:00
• ee804d52ff Makes [Discord] a hyperlink (FS-215) Video 2021-09-03 12:52:15 -06:00
• dc490659c1 Begins implementing FS-7 Video 2021-09-03 00:07:20 -06:00
• 0d09c3a550
  Merge branch 'development' into shitcan-savedflags Ryan 2021-08-29 20:09:03 +01:00
• 4c3f188bb8
  Bump actions/setup-java from 2.2.0 to 2.3.0 (#122) dependabot[bot] 2021-08-29 20:08:43 +01:00
• e2ccd14eb3 Unsaves SavedFlags Video 2021-08-27 16:54:55 -06:00
• af1df22812
  Merge branch 'development' into FS-37 Video 2021-08-26 23:05:58 -06:00
• f380898bb7
  yo remove my name (#123) Ivan 2021-08-26 11:22:08 -04:00
• 464ed85f1b
  Update java16-maven.yml Ryan 2021-08-26 16:18:58 +01:00
• 7dd235b166
  Update java11-maven.yml Ryan 2021-08-26 16:18:49 +01:00
• 1474a80875
  Merge branch 'development' into FS-37 Ryan 2021-08-26 13:26:44 +01:00
• f45466ee24
  Create java16-maven.yml Ryan 2021-08-26 13:01:20 +01:00
• d70b7bbec2
  Split out Java 11 and Java 16 for faster runs Ryan 2021-08-26 13:00:19 +01:00
• 541c66c3de
  Bump codacy/codacy-analysis-cli-action from 1.1.0 to 4.0.0 (#101) dependabot[bot] 2021-08-21 21:50:45 +01:00
• 77fd4ff66a
  Merge branch 'development' into FS-37 Ryan 2021-08-21 21:34:04 +01:00
• d901cbaa81
  Update pom.xml (#121) Ryan 2021-08-21 21:25:56 +01:00
• 538ed7020d Merge branch 'development' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development Wild1145 2021-08-21 15:36:32 +01:00
• 18e6ef16be Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development Wild1145 2021-08-21 15:36:26 +01:00
• a335a2acf7
  Bump maven-checkstyle-plugin from 3.1.1 to 3.1.2 (#114) dependabot[bot] 2021-08-21 15:21:18 +01:00
• 2eb6cc0036
  Correct CoreProtect POM Version (#108) Ryan 2021-08-18 23:45:56 +01:00
• 5322d8ab64
  Fixing Github Actions (#107) Ryan 2021-08-18 23:45:34 +01:00
• dccc315869
  Bump actions/setup-java from 1.4.3 to 2.2.0 (#98) dependabot[bot] 2021-08-17 20:50:03 +01:00
• 7657ae1928
  Fix Dependabot to target the right branch and open all PR (#106) Ryan 2021-08-17 19:28:14 +01:00
• dcaf1ec11a
  Release 2021.06 (#97) Ryan 2021-08-15 01:06:21 +01:00
• 4a6ad2059a Bump to release version 2021.06 RELEASE-2021.06 Wild1145 2021-08-14 21:17:21 +01:00
• 33aca2a482
  Merge branch 'development' into FS-37 Video 2021-08-10 22:38:51 -06:00
• 0582c2e5be
  Merge pull request #94 from AtlasMediaGroup/FS-381 Video 2021-08-10 22:38:24 -06:00
• 159eda73a1
  Merge branch 'development' into FS-37 Ryan 2021-08-10 17:34:12 +01:00
• 101987cc17
  Merge branch 'development' into FS-381 Ryan 2021-08-10 17:34:03 +01:00
• 6874b2ce13
  Fixes /setlevel by completely removing it (FS-82) (#95) Video 2021-08-10 10:33:48 -06:00
• 3be0ffba4e
  Merge branch 'development' into FS-381 Ryan 2021-08-10 17:31:26 +01:00
• da2d25252b
  Merge branch 'development' into FS-37 Ryan 2021-08-10 17:31:13 +01:00
• c8a4382a7b
  Merge pull request #96 from AtlasMediaGroup/FS-218 Video 2021-08-10 07:41:42 -06:00
• 3f89f3f48e Shut the fuck up Codacy Video 2021-08-10 06:58:04 -06:00
• 871acc2eeb Actually, let's make it possible to disable it if needed Video 2021-08-10 04:13:23 -06:00
• a9c9979b1c FS-218 Video 2021-08-10 04:06:41 -06:00
• fc3fe871b3 FS-381 Video 2021-08-05 00:43:01 -06:00
• e99aaa2eb4 Fixes FS-37 Video 2021-08-05 00:32:23 -06:00
• 618d5c5ecb FS-308: Should fix invalid names by checking if the name matches the A-z regex and if the name's length is between 3-16 FS-308 spacerocket62 2021-08-01 01:08:50 -07:00
• f8c305a23c FS-396: Check if chat event is cancelled before pinging FS-396 spacerocket62 2021-07-31 02:40:35 -07:00
• 13e04475f0 FS-326 & quick formatting fix FS-24-Again Video 2021-07-29 17:06:31 -06:00
• b99520b491 FS-177: Part 1: This completely revamps the admin and player saving system, as well as removed multiple methods which involved getting data via player name. Most of the data is now UUID based and only thing that should be IP based is imposter system FS-177 spacerocket62 2021-07-29 15:50:04 -07:00
• adc7b4a754 FS-333 Video 2021-07-29 05:58:14 -06:00
• 40498c03f4 FS-334 Video 2021-07-29 05:54:00 -06:00
• cc9c07d498 FS-335 Video 2021-07-29 05:49:37 -06:00
• 5fa3f9f26a FS-337 Video 2021-07-29 05:48:11 -06:00
• a79b2cbe0f FS-338 Video 2021-07-29 05:45:21 -06:00
• 6c8d1934e7 FS-313 Video 2021-07-29 05:38:30 -06:00
• a1de7ac9ff FS-314 Video 2021-07-29 05:35:28 -06:00
• 62529a6171
  Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development Ryan Wild 2021-07-17 13:18:18 +01:00
• ad80011de2
  Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2021.06 2021.06-RC01 Ryan Wild 2021-07-17 13:14:39 +01:00
• c732b40203
  Bump release to 2021.06-RC01 Ryan Wild 2021-07-17 13:10:35 +01:00
• 0caf972248
  Merge pull request #90 from AtlasMediaGroup/FS-309 Paldiu 2021-07-16 09:05:57 -05:00
• a37364d07e
  Correct JDK Version in README (#92) Ryan 2021-07-16 11:43:46 +01:00
• 4ac9844534
  Merge branch 'development' into FS-309 Video 2021-07-12 22:53:44 -06:00
• 939e98b759
  Update badges (#88) Ryan 2021-07-08 20:48:41 +01:00
• d99f3e657b
  Let's actually do dependency uplifts (#89) Ryan 2021-07-08 20:48:27 +01:00
• 92bbb62379
  Temporarily re-naming /clearchat to /cleanchat (#91) Ryan 2021-07-05 23:29:22 +01:00
• e4a0943af2
  Merge branch 'development' into FS-309 Video 2021-06-29 22:00:13 -06:00
• 36bd8c0fad 2 bugfixes Video 2021-06-29 21:52:46 -06:00
• 8949ee75eb fix requested by packs ptero-update Video 2021-06-29 20:36:23 -06:00
• d88509bf11
  Rewrite Pterodactyl integration (#86) Telesphoreo 2021-06-29 03:28:30 -07:00
• d77f59435b
  Use 'getPlayer()' to prevent NPE (FS-159) (#87) Nathan Curran 2021-06-27 00:06:15 +10:00
• a08fd2afb6
  Adds /seed command (FS-225) (#85) Video 2021-06-26 07:25:08 -06:00
• 6fd075fe96
  Start building Java 16 (#84) Ryan 2021-06-24 21:21:39 +01:00
• f57fc56f4a
  Merge pull request #83 from AtlasMediaGroup/FS-239-to-FS-242 Video 2021-06-19 03:20:47 -06:00
• a6ca6b122c
  Merge branch 'development' into FS-239-to-FS-242 Ryan 2021-06-18 13:24:15 +01:00
• 064e73f58b
  ez (#77) Video 2021-06-18 06:16:52 -06:00
• 32138b2e59 Order of operations fix Video 2021-06-17 13:41:25 -06:00
• e1c3bad4d0 Even more punishment log types Video 2021-06-17 06:56:52 -06:00
• 4e78027f0c
  Merge pull request #79 from AtlasMediaGroup/FS-307 Video 2021-06-17 06:12:26 -06:00
• 721f4f9fc3
  Merge branch 'development' into FS-307 Video 2021-06-17 05:56:56 -06:00
• 24ad2611a9
  Merge pull request #81 from AtlasMediaGroup/FS-201 Video 2021-06-17 05:54:10 -06:00
• c238f251f2
  Merge branch 'development' into FS-201 Video 2021-06-17 05:46:40 -06:00
• 02848e3439
  Merge pull request #82 from AtlasMediaGroup/FS-199 Video 2021-06-17 05:46:28 -06:00
• 9550f54e2b
  Merge branch 'development' into FS-199 Video 2021-06-17 05:37:30 -06:00
• 39dade78e3
  Merge pull request #80 from AtlasMediaGroup/FS-24-Round-2 Video 2021-06-17 05:35:55 -06:00
• 5b6d8b01a4
  Merge branch 'development' into FS-24-Round-2 Video 2021-06-17 05:25:42 -06:00
• 96bc83cead
  Merge pull request #78 from AtlasMediaGroup/FS-207 Video 2021-06-17 04:58:26 -06:00
• be700a90ce Simple fix Video 2021-06-16 22:42:45 -06:00
• 6d1fce1716 FS-201 Video 2021-06-16 22:06:12 -06:00
• d3665f31fe Shut up Codacy Video 2021-06-16 21:56:25 -06:00
• 4188cb80fa FS-54 Video 2021-06-16 20:56:18 -06:00
• 62fe72d99b Code quality and consistency improvements Video 2021-06-16 20:36:29 -06:00
• f4749559d2 FS-25 Video 2021-06-10 17:53:17 -06:00
• ed815794ed FS-26 Video 2021-06-10 17:44:09 -06:00
• 0c12a19d1d FS-27 Video 2021-06-10 17:40:02 -06:00