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

• e7992c7eb4 Merge branch 'development' into Wild1145-patch-1 Ryan 2022-02-22 21:17:02 +00:00
• 82e966dfb0 Delete java11-maven.yml Ryan 2022-02-22 20:50:41 +00:00
• f457c4cde2 Merge branch 'development' into FS-292 Paldiu 2022-02-21 18:08:29 -06:00
• 004a0f3d7c Update Groups.java Video 2022-02-21 17:04:53 -07:00
• cf5199f28e Squashed commit of the following: Video 2022-02-21 16:45:03 -07:00
• 43c68579e5 Merge pull request #190 from AtlasMediaGroup/Elmon11-patch-2 elmon 2022-02-21 10:01:39 +01:00
• 127ee7d9f9 Move CodeQL to Java 17 Ryan 2022-02-18 16:50:45 +00:00
• c873fd4abc Update pom.xml Ryan 2022-02-16 21:02:00 +00:00
• fa90e1d239 Update various dependencies based on Freedom-01 State Ryan 2022-02-05 23:25:57 +00:00
• b711ed517f Merge branch 'development' into Elmon11-patch-2 elmon 2022-01-24 22:16:24 +01:00
• 2618d97a3e Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 (#187) Nathan Curran 2022-01-24 12:42:47 +11:00
• 1c4647290a Merge branch 'development' into Elmon11-patch-2 Nathan Curran 2022-01-24 12:41:47 +11:00
• f00f67a844 order of messages fix elmon 2022-01-23 13:26:22 +01:00
• 850f12103c Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1 Paldiu 2022-01-17 11:35:09 -06:00
• 7fd77f3cbb Correct CoreProtect Version Ryan 2022-01-16 18:22:16 +00:00
• 2eb0ab4cb1 Merge pull request #179 from AtlasMediaGroup/FS-212 Video 2021-12-22 20:56:46 -07:00
• 2612aaec31 Makes spawnmob configurable and increases the default limit to 25 Video 2021-12-15 21:46:56 -07:00
• 6e7ad73152 Nevermind that didn't work Video 2021-11-29 07:03:29 -07:00
• af6411b82c Wait a second Video 2021-11-29 06:54:04 -07:00
• e9ba958a4e Squashed commit of the following: Video 2021-11-29 06:40:26 -07:00
• 8cff0124ea Merge pull request #93 from AtlasMediaGroup/FS-37 Video 2021-11-29 06:36:20 -07:00
• 1162f10ebb Merge branch 'development' into FS-37 Video 2021-11-29 06:31:18 -07:00
• 35965b0b10 Merge pull request #174 from AtlasMediaGroup/FS-256 Video 2021-11-29 06:31:11 -07:00
• 1253732f77 Merge branch 'development' into FS-256 Video 2021-11-29 06:25:25 -07:00
• 7ce173e02b Merge branch 'development' into FS-37 Video 2021-11-29 06:24:34 -07:00
• aa20a6e579 Merge pull request #129 from AtlasMediaGroup/FS-7 Video 2021-11-29 06:23:57 -07:00
• e1bee32163 Forces the server to recalculate the permissions server-wide in /opall Video 2021-11-29 03:27:07 -07:00
• 4d006ed172 Merge branch 'development' into FS-37 Video 2021-11-29 03:04:42 -07:00
• a29392cab2 Squashed commit of the following: Video 2021-11-29 03:03:00 -07:00
• 1ecfb0b066 Merge branch 'development' into FS-7 Video 2021-11-29 03:01:22 -07:00
• 706229004c Merge pull request #131 from AtlasMediaGroup/FS-273 Video 2021-11-29 03:00:15 -07:00
• a4adfa9bee Merge branch 'development' into FS-273 Video 2021-11-29 02:46:41 -07:00
• 225ade8753 Merge branch 'development' into FS-7 Video 2021-11-29 02:46:02 -07:00
• bf2323bed2 Squashed commit of the following: Video 2021-11-29 02:44:23 -07:00
• 8cbfde8bbc Merge branch 'development' into FS-37 Video 2021-11-29 02:41:49 -07:00
• a42cb6aff9 Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags Video 2021-11-29 02:41:34 -07:00
• 5849947c6b This should fix it Video 2021-11-29 02:35:36 -07:00
• 01fdf766ee Merge branch 'development' into shitcan-savedflags Video 2021-11-23 09:28:48 -07:00
• afe755f5c1 Merge branch 'development' into FS-7 Video 2021-11-23 09:26:59 -07:00
• 5f97e68e0e fuck it, it works Video 2021-11-23 09:26:49 -07:00
• 1b5bbd1c05 Merge branch 'development' into FS-273 Video 2021-11-23 09:16:21 -07:00
• 2ecfb88604 Merge pull request #130 from AtlasMediaGroup/FS-215 Video 2021-11-23 09:15:16 -07:00
• 8356e831a5 Redundancy fix and better protection system Video 2021-11-23 09:11:16 -07:00
• ab00cb840f Merge branch 'development' into FS-273 Video 2021-11-23 03:31:45 -07:00
• bb2ddf1129 Merge branch 'development' into FS-215 Video 2021-11-23 03:31:19 -07:00
• bba5ec922b Merge branch 'development' into FS-37 Video 2021-11-23 03:31:13 -07:00
• 58c21bb1aa Merge branch 'development' into shitcan-savedflags Video 2021-11-23 03:30:48 -07:00
• f190bbeac1 FS-292 Video 2021-11-23 00:27:57 -07:00
• 42143c1163 Merge pull request #168 from AtlasMediaGroup/main Video 2021-11-22 12:35:18 -07:00
• 6453e4efca Merge pull request #145 from AtlasMediaGroup/RELEASE-2021.09 2022.02-RC03 2022.02-RC02 relea Ryan 2021-11-22 18:43:06 +00:00
• 9155ac90b5 Official Release 2021.09 RELEASE-2021.09 Paldiu 2021-11-22 12:29:54 -06:00
• 1e1367d08f Bump to RC03 2021.09-RC03 Video 2021-11-13 02:58:36 -07:00
• 3f690e2ca1 Merge pull request #167 from AtlasMediaGroup/whoops Video 2021-11-13 02:48:51 -07:00
• abfa3b977c Whoops Video 2021-11-13 02:35:30 -07:00
• 68adaed997 Merge branch 'development' into FS-37 Video 2021-10-09 00:09:24 -06:00
• ecce62f6b4 Merge branch 'development' into FS-273 Video 2021-10-09 00:01:22 -06:00
• cf9fdc6fe4 Merge branch 'development' into FS-215 Video 2021-10-08 01:43:33 -06:00
• 97a0c77fa6 Update DiscordToMinecraftListener.java Elmon11-patch-1 elmon 2021-10-06 14:29:54 +02:00
• dc17d0f25e Update DiscordToMinecraftListener.java elmon 2021-10-06 14:28:20 +02:00
• d3a383f578 Update DiscordToMinecraftListener.java elmon 2021-10-06 14:26:55 +02:00
• 8f6674628c [SUBJECT TO TESTING DO NOT PUSH] elmon 2021-10-06 14:24:43 +02:00
• a728ec24d4 Merge pull request #156 from AtlasMediaGroup/critical-inspect-bugfix Paldiu 2021-10-04 17:59:10 -05:00
• 74a71b1843 Important bugfix Video 2021-10-04 16:02:39 -06:00
• 4d469cdc0a Move from Java 16 to Java 17 (#149) Ryan 2021-10-03 15:57:47 +01:00
• 4c287ca9b8 Bump to RC02 2021.09-RC02 Ryan Wild 2021-10-03 15:50:33 +01:00
• fb914734ce Proof of concept implementation FS-283 Video 2021-10-03 08:26:22 -06:00
• 912bc1a1e4 Merge pull request #154 from AtlasMediaGroup/development Video 2021-10-03 07:02:37 -06:00
• a598c933ec Merge pull request #151 from AtlasMediaGroup/FS-421 Video 2021-10-03 06:52:45 -06:00
• 936f0b621e Stupid simple fix Video 2021-10-03 06:45:02 -06:00
• 387ea6f71e Merge branch 'development' into FS-215 Video 2021-10-01 00:35:12 -06:00
• e122c4c5fa Bump to 2021.09-RC01 Release 2021.09-RC01 Wild1145 2021-09-19 17:32:05 +01:00
• 180cd81132 Bump junit-jupiter from 5.7.2 to 5.8.0 (#139) dependabot[bot] 2021-09-13 09:58:54 +01:00
• d814853036 Merge branch 'development' into FS-273 Ryan 2021-09-12 13:49:05 +01:00
• a1ecf88109 Merge branch 'development' into FS-215 Ryan 2021-09-12 13:48:59 +01:00
• 5a6a5ff75d Merge branch 'development' into FS-7 Ryan 2021-09-12 13:48:50 +01:00
• fdba119d5d Merge branch 'development' into shitcan-savedflags Ryan 2021-09-12 13:48:44 +01:00
• 087b8dd7ea Merge branch 'development' into FS-37 Ryan 2021-09-12 13:48:21 +01:00
• 213a43380e Bump git-commit-id-plugin from 4.0.2 to 4.9.10 (#113) dependabot[bot] 2021-09-12 12:13:56 +01:00
• 8a31b4c5c0 Bump javassist from 3.27.0-GA to 3.28.0-GA (#110) dependabot[bot] 2021-09-12 11:33:52 +01:00
• 3818aab454 Merge branch 'development' into FS-37 Video 2021-09-12 03:04:08 -06:00
• 61857dd06f Merge branch 'development' into shitcan-savedflags Video 2021-09-12 03:01:37 -06:00
• bd647afe92 Merge branch 'development' into FS-215 Video 2021-09-12 02:50:39 -06:00
• 0e12f5e792 Bump commons-lang3 from 3.11 to 3.12.0 (#111) dependabot[bot] 2021-09-12 09:09:28 +01:00
• 69f17ef2d7 Merge branch 'development' into FS-215 Video 2021-09-12 02:01:56 -06:00
• aebe1acec2 Merge pull request #136 from AtlasMediaGroup/multiple-birds-one-stone Video 2021-09-12 01:57:32 -06:00
• 938b3aa630 Merge branch 'development' into multiple-birds-one-stone Video 2021-09-11 20:53:16 -06:00
• 6772333eb4 Bump junit-jupiter from 5.4.2 to 5.7.2 (#103) dependabot[bot] 2021-09-12 00:10:47 +01:00
• 0204961834 Bump commons-io from 2.8.0 to 2.11.0 (#117) dependabot[bot] 2021-09-11 23:53:41 +01:00
• 2f332a8c42 Bump annotations from 20.1.0 to 22.0.0 (#104) dependabot[bot] 2021-09-11 18:48:33 +01:00
• e288668c92 Bump maven-antrun-plugin from 1.8 to 3.0.0 (#102) dependabot[bot] 2021-09-11 18:42:31 +01:00
• caeda219fa Merge branch 'development' into FS-37 Ryan 2021-09-11 15:26:37 +01:00
• e50101df43 Merge branch 'development' into multiple-birds-one-stone Ryan 2021-09-11 15:24:52 +01:00
• ee1b27fa0d Merge branch 'development' into FS-215 Ryan 2021-09-11 01:24:00 +01:00
• 6ca61d9c6c Merge branch 'development' into FS-7 Ryan 2021-09-11 01:23:52 +01:00
• 2d18d461fe Merge branch 'development' into shitcan-savedflags Ryan 2021-09-11 01:23:44 +01:00
• 47e6386907 Merge branch 'development' into FS-273 Ryan 2021-09-11 01:23:13 +01:00
• 0a9b95bfce Move to new ATLAS Nexus (#138) Ryan 2021-09-11 01:19:08 +01:00
• fedf80b834 Merge branch 'development' into FS-7 Video 2021-09-10 01:39:16 -06:00
• 2bdf14f38c Merge branch 'development' into FS-215 Video 2021-09-06 15:26:13 -06:00
• b1062fbb6c Merge branch 'development' into FS-273 Video 2021-09-06 14:39:32 -06:00