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

• ac32d06dc6
  Bump bstats-bukkit from 2.2.1 to 3.0.0 dependabot[bot] 2022-03-12 00:11:37 +0000
• b0aeb4dd1a
  Bump junit-jupiter from 5.8.0 to 5.8.2 dependabot[bot] 2022-03-12 00:11:36 +0000
• 6dc9dc709c
  Bump annotations from 22.0.0 to 23.0.0 dependabot[bot] 2022-03-12 00:11:36 +0000
• 0f694e2101
  Bump JDA from 4.2.1_255 to 4.4.0_352 dependabot[bot] 2022-03-12 00:11:36 +0000
• 8bab47c37e
  Bump paperlib from 1.0.6 to 1.0.7 dependabot[bot] 2022-03-12 00:11:36 +0000
• 3dbb2e0a88
  Bump buildnumber-maven-plugin from 1.4 to 3.0.0 dependabot[bot] 2022-03-12 00:11:35 +0000
• 00d1cf0e83
  Bump org.eclipse.sisu.inject from 0.3.4 to 0.3.5 dependabot[bot] 2022-03-12 00:11:32 +0000
• 7ab781a8bf
  Bump TF-LibsDisguises from 5a340341b0 to 10.0.14 dependabot[bot] 2022-03-12 00:11:31 +0000
• 945f140c30
  Bump actions/setup-java from 2.3.0 to 3 dependabot[bot] 2022-03-12 00:10:19 +0000
• 2551d184ca
  Merge pull request #211 from AtlasMediaGroup/RELEASE-2022.02 Paldiu 2022-03-11 18:09:21 -0600
• f9532eba74
  Update Groups.java DragonSlayer2189 2022-03-08 23:53:43 -0500
• 19eb8b0da7
  Updated groups.java with 1.17 mob types DragonSlayer2189 2022-03-08 23:52:35 -0500
• ec05ebd54f
  Bump coreprotect from 20.4 to 21.0 dependabot[bot] 2022-03-09 01:40:36 +0000
• f9eabf27d5
  Merge pull request #205 from AtlasMediaGroup/fs-442 Video 2022-03-06 16:15:53 -0700
• 76ce98621a
  Corrected now that we're targeting the 2022.02 relase. Ryan 2022-03-06 14:42:45 +0000
• bc0495a68f Update SECURITY.md Ryan 2022-02-05 23:32:19 +0000
• 846154a723 will this work Video 2022-03-06 03:20:47 -0700
• e2908dcf19
  Bump codacy/codacy-analysis-cli-action from 4.0.0 to 4.0.1 dependabot[bot] 2022-03-04 01:18:13 +0000
• 8ed8b77efc
  Bump actions/setup-java from 2.3.0 to 3.0.0 dependabot[bot] 2022-02-25 01:19:57 +0000
• baaafa7267
  Bump EssentialsX from 2.19.0 to 2.19.2 dependabot[bot] 2022-02-24 01:28:53 +0000
• 804614d011
  Bump to 2022.02-RC01 Release 2022.02-RC01 Ryan Wild 2022-02-23 23:23:14 +0000
• 8fbd775bf4 why can't you edit things on the github mobile app DragonSlayer2189 2021-09-23 21:02:46 -0400
• 3999656461 block /editsign and aliases in protected worlds DragonSlayer2189 2021-09-17 16:21:37 -0400
• 6f89faa935
  Bump maven-compiler-plugin from 3.8.1 to 3.10.0 dependabot[bot] 2022-02-23 23:12:28 +0000
• 422ce2fe1c
  Bump actions/setup-java from 2.3.0 to 2.5.0 dependabot[bot] 2022-02-23 23:10:56 +0000
• 2c22c6c52d
  Merge pull request #194 from AtlasMediaGroup/Wild1145-patch-1 Paldiu 2022-02-23 17:10:09 -0600
• 68989d9fe7
  Bump coreprotect from 19.5 to 20.4 dependabot[bot] 2022-02-23 22:50:54 +0000
• e2bd186c54
  Bump worldguard-bukkit from 7.0.4 to 7.0.6 dependabot[bot] 2022-02-23 22:50:46 +0000
• 5ef0f29ffe
  Merge branch 'development' into Wild1145-patch-1 Ryan 2022-02-23 22:48:53 +0000
• 11134f4109
  Merge pull request #197 from AtlasMediaGroup/FS-292 Ryan 2022-02-23 22:48:32 +0000
• e7992c7eb4
  Merge branch 'development' into Wild1145-patch-1 Ryan 2022-02-22 21:17:02 +0000
• 82e966dfb0
  Delete java11-maven.yml Ryan 2022-02-22 20:50:41 +0000
• f457c4cde2
  Merge branch 'development' into FS-292 Paldiu 2022-02-21 18:08:29 -0600
• 004a0f3d7c Update Groups.java Video 2022-02-21 17:04:53 -0700
• cf5199f28e Squashed commit of the following: Video 2022-02-21 16:45:03 -0700
• 43c68579e5
  Merge pull request #190 from AtlasMediaGroup/Elmon11-patch-2 elmon 2022-02-21 10:01:39 +0100
• 127ee7d9f9
  Move CodeQL to Java 17 Ryan 2022-02-18 16:50:45 +0000
• c873fd4abc
  Update pom.xml Ryan 2022-02-16 21:02:00 +0000
• fa90e1d239
  Update various dependencies based on Freedom-01 State Ryan 2022-02-05 23:25:57 +0000
• de7d6c404d
  Merge branch 'development' into 1.17 Paldiu 2022-01-25 18:15:47 -0600
• b711ed517f
  Merge branch 'development' into Elmon11-patch-2 elmon 2022-01-24 22:16:24 +0100
• 6eb3f1d864
  Merge pull request #191 from AtlasMediaGroup/Fix-formatting-for-the-API-Version Paldiu 2022-01-24 04:19:14 -0600
• 6d550c261a Use the max variable and reimport ConfigEntry spacerocket62 2022-01-23 21:45:52 -0800
• 2618d97a3e
  Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 (#187) Nathan Curran 2022-01-24 12:42:47 +1100
• 1c4647290a
  Merge branch 'development' into Elmon11-patch-2 Nathan Curran 2022-01-24 12:41:47 +1100
• a2296e7f35
  Update plugin.yml Paldiu 2022-01-23 14:28:26 -0600
• f00f67a844
  order of messages fix elmon 2022-01-23 13:26:22 +0100
• 5e4f46bc90 Merge branch 'development' into 1.17 Paldiu 2022-01-17 15:01:26 -0600
• 05e3a7468a
  Bump worldedit-bukkit from 7.2.4 to 7.2.8 dependabot[bot] 2022-01-17 17:36:06 +0000
• 2948e1dead
  Bump maven-compiler-plugin from 3.8.1 to 3.9.0 dependabot[bot] 2022-01-17 17:36:06 +0000
• 33042c2b0a
  Merge branch 'development' into FS-429 Paldiu 2022-01-17 11:35:52 -0600
• 850f12103c
  Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1 Paldiu 2022-01-17 11:35:09 -0600
• 7fd77f3cbb
  Correct CoreProtect Version Ryan 2022-01-16 18:22:16 +0000
• 529264af52
  Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 Focusvity 2022-01-16 11:56:15 +1100
• 9135ea8ba9
  Merge branch 'development' into main IllagerCaptain 2022-01-04 18:12:13 -0600
• 939c4a7132
  Update Command_loginmessage.java IllagerCaptain 2022-01-04 18:07:13 -0600
• 2eb0ab4cb1
  Merge pull request #179 from AtlasMediaGroup/FS-212 Video 2021-12-22 20:56:46 -0700
• 96f6353d15
  Merge branch 'development' into repo-cleanup Ryan 2021-12-19 10:37:02 +0000
• 6c88ac256e
  Merge branch 'main' into Wild1145-patch-2 Ryan 2021-12-19 10:35:37 +0000
• e8c3448b4d
  Bump coreprotect from 19.5 to 20.3 dependabot[bot] 2021-12-19 10:24:08 +0000
• 19ad495ea6
  Bump coreprotect from 19.5 to 20.2 dependabot[bot] 2021-12-17 01:14:36 +0000
• 2612aaec31 Makes spawnmob configurable and increases the default limit to 25 Video 2021-12-15 21:46:56 -0700
• 3c22de71de A lot of re-organization included in this. This is a combination of Video's 1.17 update with my structural changes and NMS removals. This technically isn't a Jira issue so I wasn't aware what to call it, so I'll call it 1.17. spacerocket62 2021-12-04 23:01:02 -0800
• f520210477
  Bump JDA from 4.2.1_255 to 4.4.0_351 dependabot[bot] 2021-11-30 01:13:56 +0000
• c19f1db4d0
  Bump actions/setup-java from 2.3.0 to 2.4.0 dependabot[bot] 2021-11-30 01:13:32 +0000
• 6e7ad73152 Nevermind that didn't work Video 2021-11-29 07:03:29 -0700
• af6411b82c Wait a second Video 2021-11-29 06:54:04 -0700
• e9ba958a4e Squashed commit of the following: Video 2021-11-29 06:40:26 -0700
• 8cff0124ea
  Merge pull request #93 from AtlasMediaGroup/FS-37 Video 2021-11-29 06:36:20 -0700
• 1162f10ebb
  Merge branch 'development' into FS-37 Video 2021-11-29 06:31:18 -0700
• 35965b0b10
  Merge pull request #174 from AtlasMediaGroup/FS-256 Video 2021-11-29 06:31:11 -0700
• 1253732f77
  Merge branch 'development' into FS-256 Video 2021-11-29 06:25:25 -0700
• 7ce173e02b
  Merge branch 'development' into FS-37 Video 2021-11-29 06:24:34 -0700
• aa20a6e579
  Merge pull request #129 from AtlasMediaGroup/FS-7 Video 2021-11-29 06:23:57 -0700
• e1bee32163 Forces the server to recalculate the permissions server-wide in /opall Video 2021-11-29 03:27:07 -0700
• 4d006ed172
  Merge branch 'development' into FS-37 Video 2021-11-29 03:04:42 -0700
• a29392cab2 Squashed commit of the following: Video 2021-11-29 03:03:00 -0700
• 1ecfb0b066
  Merge branch 'development' into FS-7 Video 2021-11-29 03:01:22 -0700
• 706229004c
  Merge pull request #131 from AtlasMediaGroup/FS-273 Video 2021-11-29 03:00:15 -0700
• a4adfa9bee
  Merge branch 'development' into FS-273 Video 2021-11-29 02:46:41 -0700
• 225ade8753
  Merge branch 'development' into FS-7 Video 2021-11-29 02:46:02 -0700
• bf2323bed2 Squashed commit of the following: Video 2021-11-29 02:44:23 -0700
• 8cbfde8bbc
  Merge branch 'development' into FS-37 Video 2021-11-29 02:41:49 -0700
• a42cb6aff9
  Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags Video 2021-11-29 02:41:34 -0700
• 5849947c6b This should fix it Video 2021-11-29 02:35:36 -0700
• 7cc87acdd6
  Bump JDA from 4.2.1_255 to 4.4.0_350 dependabot[bot] 2021-11-29 01:33:14 +0000
• 9de790f9ed
  Bump JDA from 4.2.1_255 to 4.3.0_348 dependabot[bot] 2021-11-24 01:16:54 +0000
• 01fdf766ee
  Merge branch 'development' into shitcan-savedflags Video 2021-11-23 09:28:48 -0700
• afe755f5c1
  Merge branch 'development' into FS-7 Video 2021-11-23 09:26:59 -0700
• 5f97e68e0e fuck it, it works Video 2021-11-23 09:26:49 -0700
• 1b5bbd1c05
  Merge branch 'development' into FS-273 Video 2021-11-23 09:16:21 -0700
• 2ecfb88604
  Merge pull request #130 from AtlasMediaGroup/FS-215 Video 2021-11-23 09:15:16 -0700
• 8356e831a5 Redundancy fix and better protection system Video 2021-11-23 09:11:16 -0700
• ab00cb840f
  Merge branch 'development' into FS-273 Video 2021-11-23 03:31:45 -0700
• bb2ddf1129
  Merge branch 'development' into FS-215 Video 2021-11-23 03:31:19 -0700
• bba5ec922b
  Merge branch 'development' into FS-37 Video 2021-11-23 03:31:13 -0700
• 58c21bb1aa
  Merge branch 'development' into shitcan-savedflags Video 2021-11-23 03:30:48 -0700
• f190bbeac1 FS-292 Video 2021-11-23 00:27:57 -0700
• b9cd901438
  Bump JDA from 4.2.1_255 to 4.3.0_346 dependabot[bot] 2021-11-22 19:36:14 +0000
• b5b6cedd79
  Bump worldedit-bukkit from 7.2.4 to 7.2.7 dependabot[bot] 2021-11-22 19:36:10 +0000