TotalFreedomMod

AtlasMediaGroup/TotalFreedomMod

Fork 0

mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-09 04:43:07 +00:00

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

d4d1000c16

Merge pull request #289 from Focusvity/pr/discord Telesphoreo 2020-10-16 21:36:38 -05:00
5a96204f1b

Tidy things up a bit Nathan Curran 2020-10-16 17:51:21 +11:00
3bd72dacda

Enable media tag to be included in messages Nathan Curran 2020-10-16 17:33:58 +11:00
a4c8dad865

Merge pull request #288 from Focusvity/pr/perm-config-fix Telesphoreo 2020-10-15 21:40:14 -05:00
82e7a3b659

Fix NPE (https://github.com/TFPatches/TotalFreedomMod/issues/287) Nathan Curran 2020-10-16 13:37:25 +11:00
586fa98c32

Merge pull request #286 from Focusvity/pr/discord-media Telesphoreo 2020-10-15 21:37:15 -05:00
a8f95bcb19

Use Component API for attachments Nathan Curran 2020-10-16 13:20:20 +11:00
82d92565e7

lol Seth 2020-10-13 13:37:11 -07:00
df7e30ba4e

Merge pull request #283 from TFPatches/development 2020.10 Seth 2020-10-02 02:35:24 -07:00
533e4fe369

Login messages for players. Still need to come up with login messaghes Seth 2020-10-02 02:27:06 -07:00
f8304aecd7

fix 24 hour bans Seth 2020-09-29 23:54:17 -07:00
ac6e58ff9e

and this is why I approve things before it goes on the server Seth 2020-09-29 17:24:28 -07:00
4be2a1e05b throwback thursday Telesphoreo 2020-09-27 22:53:11 -05:00
59831ef1f3 Finish the job Telesphoreo 2020-09-27 22:17:01 -05:00
54e6e2f9b1 relying on someone else to look this over to see if i missed anything Telesphoreo 2020-09-27 21:51:15 -05:00
d203772a9a This somehow got reverted back to the old version Telesphoreo 2020-09-26 14:52:13 -05:00
55522e8191 quick bump for the october 2020 update Telesphoreo 2020-09-25 20:36:58 -05:00
ac3d0fca88

Allow executives to manage the shop Seth 2020-09-18 18:04:21 -07:00
eb6514332e fix the config issues 2020.9-beta Telesphoreo 2020-09-14 21:58:46 -05:00
098d3e4cf1 i hope thisll work Telesphoreo 2020-09-14 20:54:14 -05:00
81eb333b6a

Pterodactyl Seth 2020-09-14 02:36:25 -07:00
3057421d6d Fixed the last bug for now Telesphoreo 2020-09-12 14:42:12 -05:00
9cb96e81ac Fix all the bugs Telesphoreo 2020-09-11 22:27:26 -05:00
d67189e170 e Telesphoreo 2020-09-07 15:14:30 -05:00
451ef8f009

Merge pull request #280 from CoolJWB/development CoolJWB 2020-09-06 21:28:22 +02:00
7af53448be Potion command fix and refreshment William Bergh 2020-09-06 21:25:15 +02:00
2072c89f77 Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development William Bergh 2020-09-06 18:52:04 +02:00
43b266f17d Update NMS + Use PaperLib for teleportAsync Telesphoreo 2020-08-30 19:13:46 -05:00
c61f7e78fd Update for 1.16.2 Telesphoreo 2020-08-30 14:39:07 -05:00
14ab1e95b5 Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development William Bergh 2020-08-30 00:27:13 +02:00
44fe8f6f94

Merge pull request #279 from speedxx/development Telesphoreo 2020-08-28 10:16:37 -05:00
1c487a6a60 fix spectral arrows bypassing pvp blocking speedxx 2020-08-27 14:55:39 -04:00
6f4cc8d4b5 Optimized FAWE bridge William Bergh 2020-08-24 22:44:45 +02:00
f98f6990ea

Merge pull request #278 from speedxx/patch-1 Telesphoreo 2020-08-23 00:19:48 -05:00
4c81c94702

:) speed 2020-08-22 13:04:03 -04:00
aaa495cf41

Merge pull request #277 from speedxx/development 2020.9 Seth 2020-08-19 19:42:54 -07:00
72322f2e56 use UUIDs for developers speedxx 2020-08-19 21:19:15 -04:00
04fee7d5c1

Merge pull request #276 from speedxx/development Telesphoreo 2020-08-18 23:18:34 -05:00
d38ddac311 fix vanish bug speedxx 2020-08-18 22:56:32 -04:00
d65f584707

Merge pull request #275 from CoolJWB/development CoolJWB 2020-08-18 17:24:30 +02:00
ff42713f92 Mistakes were made William Bergh 2020-08-18 17:22:43 +02:00
5047363f83

Merge pull request #274 from Focusvity/patch-1 Telesphoreo 2020-08-18 09:48:07 -05:00
34a0dae305

Make sure you check the code @CoolJWB Nathan Curran 2020-08-18 18:23:19 +10:00
ebc07f6259

Merge pull request #273 from CoolJWB/development CoolJWB 2020-08-18 09:40:56 +02:00
6a7a6e74e3 Update code William Bergh 2020-08-18 09:37:19 +02:00
1e36b484ac Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development William Bergh 2020-08-18 09:32:05 +02:00
efae9e314f

Merge pull request #264 from DragonSlayer2189/patch-4 CoolJWB 2020-08-18 09:29:35 +02:00
ea946fe14f

Merge pull request #265 from DragonSlayer2189/patch-3 CoolJWB 2020-08-18 09:29:14 +02:00
fc08761e70

Merge pull request #272 from Focusvity/pr/discord-msg CoolJWB 2020-08-18 09:27:05 +02:00
3f68677d99

Don't send empty messages Nathan Curran 2020-08-18 15:52:19 +10:00
f4007a7c9d Fix long standing bug with player notes Telesphoreo 2020-08-17 23:53:21 -05:00
f3a655d40d Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development Telesphoreo 2020-08-17 21:21:21 -05:00
6b3a765c90 shorten Administrator Telesphoreo 2020-08-17 21:21:13 -05:00
7e8a519c87

Update src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java DragonSlayer2189 2020-08-17 19:00:07 -04:00
388e1fd52d

Update src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java DragonSlayer2189 2020-08-17 18:59:26 -04:00
cdb28afba6

Merge pull request #271 from speedxx/development Telesphoreo 2020-08-17 17:54:50 -05:00
24575aba88 index httpd module speedxx 2020-08-17 18:17:45 -04:00
090c445aa9 seth kelly Telesphoreo 2020-08-16 22:33:35 -05:00
c936759b6c oup Telesphoreo 2020-08-15 21:18:47 -05:00
36fc1a00b6 bru Telesphoreo 2020-08-15 19:32:25 -05:00
7b9920dbc4

Merge pull request #268 from speedxx/development Telesphoreo 2020-08-15 19:24:47 -05:00
b0daf2066a

supervanish is gone speed 2020-08-15 20:17:54 -04:00
ed5d18c0df rip supervanish Telesphoreo 2020-08-15 18:03:26 -05:00
04a7b633a4 it compiles now Telesphoreo 2020-08-15 17:58:48 -05:00
7a810519f3 fuck intellij Telesphoreo 2020-08-15 17:44:50 -05:00
53038ca3b2 fuck intellij Telesphoreo 2020-08-15 17:42:46 -05:00
e77d92407c Revert "forgot to pull" Telesphoreo 2020-08-15 17:41:26 -05:00
da80f1b69e Revert "Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development" Telesphoreo 2020-08-15 17:41:23 -05:00
4407e9e6ec Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development Telesphoreo 2020-08-15 17:09:03 -05:00
e4c9ea656e forgot to pull Telesphoreo 2020-08-15 17:08:39 -05:00
63570d61d6 admins are seniors speedxx 2020-08-15 13:06:58 -04:00
257a2eec33

no speed 2020-08-15 12:37:20 -04:00
78b73b3b63 stuff seth missed speedxx 2020-08-15 12:35:48 -04:00
d74846cde6 Fixed my bad code William Bergh 2020-08-15 15:33:29 +02:00
3f4d34d172

Forgot to actually make sure this compiles lol Seth 2020-08-14 23:48:31 -07:00
f5b5fcd5ef

Admins are now known as staff Seth 2020-08-14 23:44:57 -07:00
f42e047723

Merge pull request #267 from speedxx/development Telesphoreo 2020-08-14 22:10:09 -05:00
e79145ee54 fix exceptions, properly teleport player in /ride speedxx 2020-08-14 21:56:04 -04:00
6dbc99690a

added "kicked (user) quietly" msg DragonSlayer2189 2020-08-14 00:34:01 -04:00
8628e88e3a

added "banned (user) quietly" message DragonSlayer2189 2020-08-14 00:29:50 -04:00
51e1191816 Increase range on tpr Telesphoreo 2020-08-13 22:14:12 -05:00
e294ef8312 Reimplement vanish command Telesphoreo 2020-08-13 14:34:03 -05:00
541abb1ba8 whoever commented the shit out in the pom.xml: i hope both sides of your pillow are warm tonight Telesphoreo 2020-08-12 22:07:15 -05:00
306c8bc8b9 ok Telesphoreo 2020-08-12 18:51:10 -05:00
9f006325b4

This is no longer needed Seth 2020-08-09 22:25:16 -07:00
aab4f55b7d

UUID definite bans Seth 2020-08-09 22:25:04 -07:00
00f94e47f1

github is a love hate relationship Seth 2020-08-09 17:49:52 -07:00
44b7307e4d

Revert "Revert "Permbans are now indefinite bans."" Seth 2020-08-09 17:49:35 -07:00
54df0e08f5

Revert "Permbans are now indefinite bans." Seth 2020-08-09 17:49:20 -07:00
4003db6dd9

Permbans are now indefinite bans. Seth 2020-08-09 17:48:42 -07:00
f4f25c1590

useless Seth 2020-08-09 17:47:53 -07:00
328225fe6e

Merge pull request #262 from speedxx/development Telesphoreo 2020-08-08 22:35:45 -05:00
087e4a0d9c fix adminchat bug speedxx 2020-08-08 23:20:06 -04:00
2ecde80b5f

AMP automation Seth 2020-08-07 22:51:09 -07:00
075299dbd9

Merge pull request #261 from speedxx/development Seth 2020-08-07 18:45:00 -07:00
30d5a1d888 -q arg for more commands speedxx 2020-08-07 20:51:47 -04:00
b6746acb44

Merge pull request #255 from Focusvity/pr/modifyitem-fix CoolJWB 2020-08-08 00:38:59 +02:00
560353e7cf

Merge pull request #258 from DragonSlayer2189/patch-1 CoolJWB 2020-08-08 00:36:12 +02:00
86cf9dc344

I hate PacksGamingHD. Telesphoreo 2020-08-06 16:18:32 -05:00
877c174e2d I hate PacksGamingHD. speedxx 2020-08-06 16:17:18 -04:00