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

• 96d47e8e0c Update EntityWiper.java Video 2021-06-16 17:47:09 -06:00
• 3027e2a18c Two fixes, one commit Video 2021-06-16 17:29:57 -06:00
• 06025b2e69 Updated permissions to re-baseline with the dev server (#75) Ryan 2021-06-13 19:51:27 +01:00
• da7e8f64aa Continuation on that notes thing (#74) Video 2021-06-12 04:26:40 -06:00
• 17b051e2a7 Retired support for 2021.02 fully. (#72) Ryan 2021-06-07 16:16:10 +01:00
• 77a05f22a8 TotalFreedomMod May Update Nathan Curran 2021-06-06 14:06:01 +10:00
• 5c3ef1f107 Bump version Nathan Curran 2021-05-27 11:35:11 +10:00
• 53c5991971 Addresses FS-224 (#70) Video 2021-05-26 03:55:49 -06:00
• ff760a6c11 Use long instead of int and use offset to check time (FS-181) (#69) Nathan Curran 2021-05-25 21:45:53 +10:00
• 63069ff9ec Calculate the player count without offline players (FS-247) (#68) Nathan Curran 2021-05-23 00:40:55 +10:00
• 5e63b71861 Small modification to new TFGuilds (FS-255) (#67) Nathan Curran 2021-05-23 00:06:34 +10:00
• b72782de4f Add //g to blocked commands (#62) Ryan 2021-05-21 22:44:51 +01:00
• de9556c550 Name change for Fleek (#64) Nathan Curran 2021-05-17 20:31:34 +10:00
• 6590504545 Added new dependency to allow TFM to compile (#65) Nathan Curran 2021-05-17 15:50:09 +10:00
• 8d1e8dcf05 Switched from -c to -ci (#63) Ryan 2021-05-16 15:27:12 +01:00
• 07b5076717 Bug fixes, improvements, and removals (FS-192) (#46) Video 2021-05-09 09:42:31 -06:00
• 6fb9507a4c Why overcomplicating things is a horrifically bad idea (#55) Video 2021-05-04 06:31:55 -06:00
• 879a524bb4 Remove a number of wipe commands we don't want anyway Ryan 2021-05-03 15:44:05 +01:00
• c60b451ce7 grammar fix Elmon11 2021-05-02 14:03:48 +02:00
• f85f3e32ea Fixes FS-137 Video 2021-04-26 01:23:24 -06:00
• 57b3351047 ok, done (FS-156) Video 2021-04-26 00:58:28 -06:00
• dd10eb3f5e Update Command_ride.java Video 2021-04-26 00:37:16 -06:00
• a498104777 Merge branch 'main' of github.com:AtlasMediaGroup/TotalFreedomMod into development Ryan Wild 2021-06-07 16:22:43 +01:00
• a33a39af19 Retired support for 2021.02 fully. (#72) RELEASE-2021.05 Ryan 2021-06-07 16:16:10 +01:00
• e1e8f1b3b5 Merge branch 'main' into RELEASE-2021.05 Ryan 2021-06-06 11:37:44 +01:00
• 86a8e21d06 TotalFreedomMod May Update 2021.05 Nathan Curran 2021-06-06 14:06:01 +10:00
• 4e577f97fa Enable downward Sync from main (#60) Ryan 2021-05-28 15:22:07 +01:00
• da37ca52fa Bump version 2021.05-RC01 Nathan Curran 2021-05-27 11:35:11 +10:00
• 8c7bf365a0 Addresses FS-224 (#70) Video 2021-05-26 03:55:49 -06:00
• eedb7a5375 Use long instead of int and use offset to check time (FS-181) (#69) Nathan Curran 2021-05-25 21:45:53 +10:00
• d047cfc8ff Calculate the player count without offline players (FS-247) (#68) Nathan Curran 2021-05-23 00:40:55 +10:00
• 9ff5da8d8f Small modification to new TFGuilds (FS-255) (#67) Nathan Curran 2021-05-23 00:06:34 +10:00
• ac615f54f7 Add //g to blocked commands (#62) Ryan 2021-05-21 22:44:51 +01:00
• 21af722e23 Name change for Fleek (#64) Nathan Curran 2021-05-17 20:31:34 +10:00
• b1196fcf00 Added new dependency to allow TFM to compile (#65) Nathan Curran 2021-05-17 15:50:09 +10:00
• d170f6d323 Switched from -c to -ci (#63) Ryan 2021-05-16 15:27:12 +01:00
• 9dd0298f56 Bug fixes, improvements, and removals (FS-192) (#46) Video 2021-05-09 09:42:31 -06:00
• bdf4ca84e0 Why overcomplicating things is a horrifically bad idea (#55) Video 2021-05-04 06:31:55 -06:00
• caaa067096 Update Security Matrix (#59) Ryan 2021-05-04 13:30:17 +01:00
• 7258d7f1bf Merge pull request #58 from AtlasMediaGroup/FS-221 Ryan 2021-05-04 12:59:31 +01:00
• 8a504bff07 Merge branch 'development' into FS-221 Video 2021-05-03 22:15:20 -06:00
• c00e64f736 Merge pull request #54 from VideoGameSmash12/FS-137 Ryan 2021-05-03 20:14:35 +01:00
• 9e73db0f24 Merge branch 'development' into FS-137 Ryan 2021-05-03 19:46:59 +01:00
• 951c061d77 Merge pull request #57 from AtlasMediaGroup/Elmon11-patch-2 Ryan 2021-05-03 19:46:37 +01:00
• 579d3e0719 Merge branch 'development' into Elmon11-patch-2 Ryan 2021-05-03 19:13:39 +01:00
• 9777733d04 Merge pull request #53 from VideoGameSmash12/ride-typo Ryan 2021-05-03 19:13:26 +01:00
• 05e118dcb4 Merge branch 'development' into ride-typo Ryan 2021-05-03 18:21:16 +01:00
• 7a0d6f49f4 Merge pull request #52 from VideoGameSmash12/FS-156 Ryan 2021-05-03 18:20:20 +01:00
• 19f1b7f6bd Merge branch 'development' into Elmon11-patch-2 Ryan 2021-05-03 15:45:54 +01:00
• b12afbdc1f Merge branch 'development' into FS-137 Ryan 2021-05-03 15:45:45 +01:00
• 49e77d4f93 Merge branch 'development' into ride-typo Ryan 2021-05-03 15:45:36 +01:00
• eb9107bedf Merge branch 'development' into FS-156 Ryan 2021-05-03 15:45:25 +01:00
• 951c699ed0 Remove a number of wipe commands we don't want anyway Ryan 2021-05-03 15:44:05 +01:00
• 9e676143b8 2021.04 Release 2021.04 RELEASE-2021.04 Ryan 2021-05-03 15:19:42 +01:00
• 6895e46375 Merge branch 'development' into ride-typo Elmon11 2021-05-02 14:15:15 +02:00
• c8b20bc255 RC2 Release 2021.04-RC02 Ryan 2021-05-02 13:12:37 +01:00
• 1cf46c7337 grammar fix Elmon11 2021-05-02 14:03:48 +02:00
• f240a15af3 Force the count to be zero if the value is negative (FS-216) (#56) Nathan Curran 2021-05-01 23:58:03 +10:00
• 6073712fdf Bump Version 2021.04-RC01 Ryan 2021-04-26 20:46:11 +01:00
• 407b63e48b Fixes FS-137 Video 2021-04-26 01:23:24 -06:00
• be562fe722 ok, done (FS-156) Video 2021-04-26 00:58:28 -06:00
• 928ab41d7f Update Command_ride.java Video 2021-04-26 00:37:16 -06:00
• d11d55b218 Vanished admins are no longer being counted (FS-148) (#41) Nathan Curran 2021-04-24 14:06:28 +10:00
• debb95fb4c video dev man (#51) Video 2021-04-23 21:03:11 -06:00
• b9f7ab3ec3 Change punishment from kicking to muting on spam (FS-97) (#45) Nathan Curran 2021-04-22 21:54:29 +10:00
• 2cdf1e66a6 Disables block gravity and makes it togglable (FS-89) (#50) Video 2021-04-19 01:34:36 -06:00
• 20c2c4c96e Delete /wipeuserdata (FS-196) (#49) Nathan Curran 2021-04-15 22:07:22 +10:00
• d5238150d0 Curse be gone (#47) Video 2021-04-12 22:13:47 -06:00
• 64a4e70c41 Merge pull request #48 from AtlasMediaGroup/abhi-fix Paldiu 2021-04-12 16:45:13 -05:00
• 0c2f0a714c [+] Fix #replace() abhiram 2021-04-12 16:31:48 +05:30
• 4c67553bdd [+] Whitespace change! abhiram 2021-04-12 16:26:06 +05:30
• ffab5e3c12 [+] Allman style formating abhiram 2021-04-12 16:01:31 +05:30
• f7556a4861 [+] Remove redundant comments abhiram 2021-04-12 15:59:27 +05:30
• 385fc77771 [+] Done all the requested changes! abhiram 2021-04-12 15:44:51 +05:30
• b852ea1822 [+] Update my account in developers list abhiram 2021-04-12 14:44:27 +05:30
• 4a5a3a1a2d [+] Fix FS-191 abhiram 2021-04-12 13:57:58 +05:30
• 37762e5470 Merge pull request #39 from AtlasMediaGroup/Elmon11-patch-2 Ryan 2021-04-11 22:15:26 +01:00
• 85d90090c8 Merge branch 'development' into Elmon11-patch-2 Ryan 2021-04-11 18:41:54 +01:00
• 09930c2d9a Merge pull request #43 from VideoGameSmash12/development Ryan 2021-04-10 12:56:32 +01:00
• 7ae1ab035a Merge branch 'development' into development Ryan 2021-04-10 12:50:52 +01:00
• 2bd1787663 Updated supported versions for TFM. Ryan 2021-04-10 12:45:56 +01:00
• 765b7dcc4b Merge branch 'development' into development Ryan 2021-04-10 12:39:47 +01:00
• 091381a076 Merge pull request #44 from AtlasMediaGroup/FS-145 Ryan 2021-04-10 12:39:08 +01:00
• 27dfd71b2e Update JDA version and location (FS-145) Nathan Curran 2021-04-09 21:20:33 +10:00
• 16e06bd932 Forgot I had this there Video 2021-04-07 19:45:03 -06:00
• a33c310757 Fucking shit Video 2021-04-07 19:41:13 -06:00
• df21bdfa7e Other bug fixes Video 2021-04-07 19:40:19 -06:00
• d7e2c0da42 Merge branch 'development' into Elmon11-patch-2 Nathan Curran 2021-04-07 11:52:16 +10:00
• a7529b41fb Oops Video 2021-04-05 18:08:24 -06:00
• c4fce3f0f9 Right, so this change applies only to commands. For the sake of code consistency, I tried to change as many as possible to use FreedomCommand.msg instead of CommandSender.sendMessage for their messages. Here are a list of the files containing those changes: * Command_adminworld.java * Command_adventure.java * Command_banip.java * Command_blockedit.java * Command_blockpvp.java * Command_cage.java * Command_cartsit.java * Command_clearchat.java * Command_clearinventory.java * Command_commandlist.java * Command_creative.java * Command_deop.java * Command_deopall.java * Command_dispfill.java * Command_doom.java * Command_gcmd.java * Command_hubworld.java * Command_inspect.java * Command_list.java * Command_lockup.java * Command_manageshop.java * Command_manuallyverify.java * Command_masterbuilderworld.java * Command_mbconfig.java * Command_moblimiter.java * Command_mp44.java * Command_mute.java * Command_nickfilter.java * Command_op.java * Command_opall.java * Command_opme.java * Command_potion.java (Also corrected the inconsistent "player not found" message's color) * Command_rank.java * Command_ride.java * Command_saconfig.java * Command_scare.java * Command_setplayerlimit.java * Command_settotalvotes.java * Command_smite.java * Command_spectator.java * Command_survival.java * Command_unblockcmd.java * Command_uncage.java * Command_unmute.java * Command_verifynoadmin.java Video 2021-04-05 17:13:26 -06:00
• 27f5f18962 FS-143 Resolution (#42) Ryan 2021-04-05 22:11:12 +01:00
• dca5e30291 Actually display assistant exec in game (#37) Elmon11 2021-04-04 14:24:06 +02:00
• 09a435053e Merge pull request #40 from AtlasMediaGroup/phoenix-patch-1 TFTWPhoenix 2021-03-31 17:12:56 -05:00
• 14309275fb Remove /premium TFTWPhoenix 2021-03-31 15:16:01 -05:00
• 2375e92d90 Merge pull request #36 from AtlasMediaGroup/tfm-bugfix-001 Ryan 2021-03-26 15:43:22 +00:00
• 97672c2fff Update DiscordToAdminChatListener.java Paldiu 2021-03-22 09:57:09 -05:00
• 5837b05a35 Merge branch 'tfm-bugfix-001' of https://github.com/AtlasMediaGroup/TotalFreedomMod into tfm-bugfix-001 Paldiu 2021-03-21 14:02:51 -05:00
• b3b68ebd13 Switch to Allman Formatting Paldiu 2021-03-21 14:02:43 -05:00
• 2dbbb5c262 Intellij says this is fine so if it breaks again gg Elmon11 2021-03-21 19:07:07 +01:00
• e45655edbb im a clown Elmon11 2021-03-21 18:33:38 +01:00