Commit Graph

Select branches

Hide Pull Requests

1.12

1.13-support

1.6-release

acf

api

b-1.7.10

commandsonlevel

commandsonlevelup

config-validation-changes

configurable

cs

dependabot/maven/com.google.guava-guava-32.0.0-jre

dev-1.4.09

dev-alchemyTags

dev-asyncLoad

dev-capfan

dev-charge

dev-commandutils

dev-dblock

dev-events

dev-import-fixes

dev-partymanager

dev-queue

dev-queue-alt

dev-ranching

dev-serializedUserData

dev-sounds

dev-spout

dev-tag

dev-testbungee

dev-uuid-connectionpool

dev-wildcard

dev-worldsconfig

endgame

experiment

gradlelize

internals

javadocs

l10n_master

maces

master

nbt

newtiers

pr/4925

reformat-javadocs

spears

staves

translation

tridentsxbows

#1007

#1007

#1017

#1017

#1030

#1030

#1070

#1070

#108

#108

#1086

#1086

#1104

#1104

#1107

#1107

#1154

#1154

#1156

#1156

#1157

#1157

#1170

#1170

#1217

#1217

#1220

#1220

#1230

#1230

#1242

#1242

#1243

#1243

#1299

#1299

#130

#130

#1333

#1333

#138

#138

#139

#139

#1397

#1397

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#1462

#1462

#1478

#1478

#148

#148

#1480

#1480

#149

#149

#1490

#1490

#1503

#1503

#1512

#1512

#1513

#1513

#152

#152

#1538

#1538

#154

#154

#1540

#1540

#1548

#1548

#1550

#1556

#1556

#156

#156

#1613

#1613

#1622

#1622

#1626

#1626

#1631

#1631

#1642

#1642

#1746

#1746

#1775

#1775

#1807

#1807

#1809

#1809

#1822

#1822

#183

#183

#184

#184

#185

#185

#186

#186

#1865

#1865

#187

#187

#1875

#1875

#188

#188

#189

#189

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#1940

#1940

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#20

#20

#200

#200

#2006

#2006

#201

#201

#202

#202

#2020

#203

#203

#2034

#2034

#2036

#2036

#204

#204

#2045

#2045

#205

#205

#206

#206

#207

#207

#2118

#2118

#213

#213

#214

#2147

#2147

#2149

#215

#215

#2150

#2151

#2151

#2155

#2156

#2164

#2164

#2167

#2185

#2185

#2186

#2186

#221

#221

#2230

#2230

#2253

#2253

#2255

#2255

#2300

#2300

#2301

#2301

#2306

#2306

#232

#232

#2326

#233

#233

#2340

#2340

#2356

#2377

#2377

#2389

#2389

#240

#240

#242

#242

#2423

#2423

#2426

#2427

#2441

#2456

#246

#246

#247

#247

#2475

#2476

#2476

#248

#248

#2489

#249

#249

#252

#252

#2540

#2551

#2576

#2576

#2583

#2614

#262

#262

#263

#263

#2647

#2648

#2663

#2675

#2675

#268

#268

#269

#269

#2694

#2697

#2709

#271

#271

#2713

#2713

#2716

#2716

#2725

#2726

#2735

#274

#274

#276

#276

#278

#278

#2781

#2782

#2782

#2783

#279

#279

#2799

#280

#280

#2800

#2801

#2803

#281

#281

#2810

#282

#282

#2824

#2828

#2829

#2834

#2834

#284

#284

#285

#285

#2850

#287

#287

#290

#290

#291

#291

#2910

#2910

#2918

#2920

#2920

#293

#293

#2945

#2945

#295

#295

#2951

#2964

#2964

#297

#297

#298

#298

#299

#299

#3007

#3011

#304

#304

#305

#305

#3050

#3055

#3067

#307

#307

#3077

#3077

#3079

#3085

#3085

#3094

#3095

#3095

#31

#31

#3104

#311

#311

#312

#312

#3128

#3128

#313

#313

#3131

#3150

#3160

#3169

#3169

#3175

#318

#318

#3185

#3201

#3209

#321

#322

#322

#3234

#3235

#3235

#324

#324

#3252

#326

#326

#327

#327

#3279

#3285

#3285

#3286

#3286

#3297

#3297

#3300

#3302

#3302

#332

#332

#3329

#3329

#3330

#334

#334

#3355

#3355

#3384

#3395

#340

#340

#342

#342

#3427

#343

#343

#344

#344

#3440

#3441

#3445

#3445

#3449

#345

#345

#3451

#3451

#3453

#3481

#3500

#3500

#3502

#3503

#3503

#3505

#3505

#3506

#3507

#3508

#3509

#3523

#3526

#3528

#353

#353

#3533

#3534

#3534

#3537

#3541

#3551

#357

#357

#3576

#3577

#3578

#3579

#3580

#3581

#3582

#3583

#3584

#3585

#3591

#36

#36

#3616

#3617

#3623

#3628

#3629

#3631

#3637

#3639

#3644

#3645

#366

#366

#367

#367

#3680

#369

#369

#3722

#3730

#3783

#3788

#379

#379

#3793

#3828

#383

#383

#3830

#3841

#3843

#3844

#3848

#3856

#3857

#3861

#387

#387

#3877

#3878

#3879

#3881

#3884

#3890

#3891

#3892

#3897

#3900

#3903

#3904

#3905

#3906

#391

#391

#3910

#3911

#3914

#392

#392

#3921

#3922

#3925

#3928

#3930

#3932

#3934

#3940

#395

#395

#3950

#3952

#3953

#3954

#3958

#396

#396

#3960

#3966

#3967

#3968

#3973

#3976

#3977

#3978

#3988

#3991

#3993

#3996

#400

#400

#4003

#4006

#4008

#4009

#4012

#4021

#4027

#4029

#4031

#4032

#4035

#4037

#4039

#4040

#4041

#4042

#4047

#4048

#4051

#4052

#406

#406

#4064

#4065

#4068

#4070

#4078

#4088

#409

#409

#4092

#4094

#4096

#4097

#410

#410

#4100

#4104

#4107

#4111

#4118

#4128

#4152

#4154

#416

#416

#4162

#4163

#4169

#4170

#4173

#4175

#4179

#419

#419

#4195

#4198

#4202

#4209

#4211

#4219

#4220

#4226

#4229

#4230

#4231

#4233

#4235

#4236

#4250

#4253

#4255

#4263

#4264

#4266

#427

#427

#4275

#4276

#4282

#4290

#4296

#4298

#4305

#4308

#4321

#4322

#4324

#4328

#4336

#4340

#4348

#4349

#4351

#4373

#4375

#4384

#44

#44

#4400

#4406

#4408

#4409

#4411

#4418

#442

#442

#4423

#4425

#443

#443

#4432

#4439

#4440

#4445

#4446

#4453

#4454

#4455

#446

#446

#4460

#4465

#4470

#4475

#4479

#4481

#4482

#4483

#4484

#4486

#4494

#4498

#45

#45

#4508

#4512

#4515

#452

#452

#4529

#4536

#454

#454

#4546

#4552

#4555

#4557

#4559

#4560

#4566

#457

#457

#458

#458

#4580

#4582

#4584

#4585

#4588

#46

#46

#460

#461

#461

#4618

#4619

#4620

#4628

#4630

#4635

#4638

#4638

#4647

#4649

#4650

#4651

#4652

#4655

#4656

#4656

#4658

#4659

#4659

#4669

#4676

#4677

#4693

#4695

#4701

#4703

#4707

#471

#471

#4713

#4714

#472

#472

#473

#473

#474

#474

#4743

#4743

#475

#475

#4762

#4762

#4763

#4766

#4766

#4773

#4773

#4774

#4774

#4779

#4781

#4781

#4782

#4782

#4790

#4790

#4791

#4791

#4793

#4793

#4796

#4796

#4797

#4798

#4809

#4809

#4814

#4814

#4817

#4826

#4826

#4832

#4832

#4833

#4833

#4835

#4835

#4836

#4837

#4837

#4839

#4840

#4840

#4841

#4856

#4856

#4858

#4858

#4859

#4859

#4861

#4861

#4863

#4863

#487

#487

#4870

#4870

#488

#488

#4880

#4880

#4881

#4881

#4882

#4882

#4885

#4889

#4889

#4893

#4893

#4895

#4895

#49

#49

#4903

#4903

#4906

#4906

#4908

#4909

#4909

#4916

#4916

#4919

#4919

#492

#492

#4925

#4925

#4932

#4932

#4933

#4934

#4934

#4935

#4935

#494

#494

#4942

#4942

#4944

#4944

#495

#495

#4951

#4953

#4953

#4954

#4954

#4956

#4956

#4973

#4974

#4976

#4976

#4977

#4977

#498

#498

#4981

#4981

#4983

#4986

#4986

#499

#499

#4997

#4997

#50

#50

#500

#500

#5000

#5005

#5005

#501

#501

#5010

#5010

#5012

#5012

#5015

#5015

#5020

#5020

#5024

#5024

#5031

#5031

#5033

#5033

#5034

#5034

#5035

#5036

#5036

#5038

#5038

#504

#504

#505

#505

#506

#506

#5066

#5066

#5068

#5068

#5071

#5071

#5075

#5075

#5079

#5079

#5082

#5082

#5083

#5083

#5085

#5085

#5088

#5089

#5089

#5094

#5094

#5095

#5095

#5096

#5096

#5098

#5098

#5102

#5102

#5104

#5106

#5106

#5111

#5111

#5114

#5123

#5123

#5130

#5130

#5135

#5135

#5137

#5137

#514

#514

#5141

#5141

#5142

#5142

#515

#515

#5158

#5158

#516

#516

#5173

#5173

#5178

#5178

#5181

#5181

#5185

#5185

#5187

#5189

#5189

#519

#519

#5192

#5192

#5194

#5194

#5196

#5196

#5198

#5198

#52

#52

#520

#520

#5201

#5201

#5208

#5208

#521

#521

#5212

#5212

#5217

#5217

#5219

#5229

#5229

#5230

#5231

#5231

#5232

#5232

#5233

#5233

#5236

#5238

#5238

#5239

#5239

#530

#530

#532

#532

#536

#536

#543

#543

#544

#544

#55

#55

#589

#589

#60

#60

#619

#62

#62

#68

#68

#71

#71

#72

#72

#76

#76

#77

#77

#809

#809

#810

#810

#826

#826

#843

#843

#859

#859

#998

#998

1.2.07

1.2.08

1.2.09

1.2.10

1.2.11

1.2.12

1.3.00

1.3.01

1.3.02

1.3.03

1.3.04

1.3.05

1.3.06

1.3.07

1.3.08

1.3.09

1.3.10

1.3.11

1.3.12

1.3.13

1.3.14

1.4.00

1.4.00-beta1

1.4.00-beta2

1.4.00-beta3

1.4.00-beta4

1.4.00-pre

1.4.01

1.4.02

1.4.03

1.4.04

1.4.05

1.4.06

1.4.06-beta1

1.4.06-beta2

1.4.06-beta3

1.4.06-beta4

1.4.06-beta5

1.4.06-rerelease

1.4.07

1.4.07-beta1

1.4.08

1.5.00

2.0.0

2.1.207

Mono Color

• ddb92af400 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable nossr50 2019-05-11 20:54:29 -07:00
• ed1831da78 Fixed the wrong locale string being used for Mining DD nossr50 2019-05-11 12:45:00 -07:00
• 774ee65677 Fixing Alchemy Part 1 nossr50 2019-05-10 17:23:02 -07:00
• 61ae372694 Collection manager init now handles mapping values from collections nossr50 2019-05-10 12:30:59 -07:00
• 945359b408 Add failsafes to repairables nossr50 2019-05-10 12:17:31 -07:00
• 06bf814fcf Add failsafes to Salvageables nossr50 2019-05-10 12:16:26 -07:00
• cc1eae150a Fixed salvage deserializer swapping signature parameters nossr50 2019-05-10 11:30:50 -07:00
• 7ad0a61c53 Fix casting, remove unused mod configs nossr50 2019-05-10 11:20:16 -07:00
• 48a3621ac6 Avoid race conditions nossr50 2019-05-10 09:49:43 -07:00
• 4ab688b302 Add custom serializer registration for CustomXPPerk nossr50 2019-05-08 12:14:09 -07:00
• 8cfeaf34f3 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable nossr50 2019-05-08 12:10:31 -07:00
• ad550759e6 Fixed an incredibly rare and difficult to perform dupe bug nossr50 2019-05-08 10:24:34 -07:00
• ca7cf5cc58 Unlimited custom XP perks part 2 nossr50 2019-05-08 09:50:19 -07:00
• 40598a0e96 Unlimited custom xp perks Part 1 nossr50 2019-05-08 06:44:19 -07:00
• 984518d9f5 Merge pull request #3925 from SpiderRobotMan/patch-1 Robert A. C 2019-05-07 06:40:19 -07:00
• e0055eeead Fix small grammar mistake in README Daniel Bethel 2019-05-07 09:37:08 -04:00
• 0331c98c9b Add and wire up skill specific xp formula multipliers nossr50 2019-05-07 00:18:50 -07:00
• c968b9f94a Add and wire up Early Game Boost settings nossr50 2019-05-07 00:09:31 -07:00
• 8033bc577c Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable nossr50 2019-05-06 19:46:58 -07:00
• fe07261846 Very large update to the chinese language 2.1.56 nossr50 2019-05-06 03:52:22 -07:00
• 0cbb9b22a5 Merge pull request #3922 from 89009332/patch-7 Robert A. C 2019-05-06 00:29:28 -07:00
• 31ccf2ca02 Update locale_zh_CN.properties 89009332 2019-05-06 15:25:41 +08:00
• 08269cab5b Add back in the UUID upgrade classes just in case anyone from 2014 shows up nossr50 2019-05-06 00:19:42 -07:00
• 71a2ea2a2e Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable nossr50 2019-05-05 23:50:40 -07:00
• 23b7e11dd1 Fixed bugs that could occur while updating old DBs to have UUIDs nossr50 2019-05-05 16:41:42 -07:00
• ecac8d00ee Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable nossr50 2019-05-04 05:31:44 -07:00
• 588b6f3692 Fixed the furnace XP bug nossr50 2019-05-04 04:08:56 -07:00
• 620f2fc4f8 Revert some state changes nossr50 2019-05-04 01:09:25 -07:00
• 3e61dc6c5f Some cleanup to BonusDrops & reducing expensive state calls nossr50 2019-05-04 00:48:35 -07:00
• a919c45b09 Fixing Java naming conventions for constants in mcMMO.java also added some Javadocs nossr50 2019-05-03 23:39:49 -07:00
• 8a312da0f5 Merge 2.1.53 nossr50 2019-05-03 23:31:08 -07:00
• cdf6e607de 2.1.53 - Fixed critical XP bug nossr50 2019-05-03 15:04:40 -07:00
• 29835a3316 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable nossr50 2019-05-03 03:46:28 -07:00
• f61917e8fe 2.1.52 nossr50 2019-05-03 01:08:29 -07:00
• 661564df36 Merge pull request #3914 from snake0053/master Robert A. C 2019-05-01 14:39:56 -07:00
• 0a7c852d89 Update locale_ja_JP.properties SNAKE0053 2019-05-01 16:57:58 +09:00
• c1379f7ac6 2.1.51 - mikroskeem patch nossr50 2019-04-30 17:26:14 -07:00
• 22ef134c84 Update changelog nossr50 2019-04-30 17:20:23 -07:00
• 9157a08a3b Stashing changes.. oh wait nossr50 2019-04-30 17:02:08 -07:00
• 3997a44fce Merge 2.1.51 nossr50 2019-04-30 17:01:45 -07:00
• 7f95956a01 Merge pull request #3911 from mikroskeem/feature/locale-reload-command Robert A. C 2019-04-30 11:33:08 -07:00
• 40ea101bf6 Add a command to reload locale Mark Vainomaa 2019-04-30 21:19:55 +03:00
• 0c8b001d05 Merge pull request #3910 from mikroskeem/feature/locales-in-plugin-data-folder Robert A. C 2019-04-30 10:33:28 -07:00
• 5dc9c3f732 Note user that locale is loaded from locales directory Mark Vainomaa 2019-04-30 20:14:42 +03:00
• ec574a6b63 Cache raw messages from resource bundles Mark Vainomaa 2019-04-30 17:58:33 +03:00
• 1ca48051ad Dedicated directory for locales Mark Vainomaa 2019-04-30 09:31:33 +03:00
• 4d8e4d0e70 Wire up Mining/Excavation/Herbalism/Woodcutting XP values nossr50 2019-04-30 02:08:11 -07:00
• 2efa64ae17 wire up taming XP nossr50 2019-04-30 01:46:59 -07:00
• e5441f2a96 Taming XP values are now converted to an enum mpa and managed by ExperienceMapManager nossr50 2019-04-30 01:39:06 -07:00
• 06016f4ada Wire up special combat XP multipliers nossr50 2019-04-30 00:57:50 -07:00
• 6932abc9d8 Create fully qualified name : integer maps from user configs, wiring up some global xp settings nossr50 2019-04-30 00:42:09 -07:00
• 0f2e1ea740 Fall back to locale loaded from JAR when filesystem one doesn't have requested key Mark Vainomaa 2019-04-29 20:58:54 +03:00
• c2d4aeaf85 Try to load locale from plugin data folder first Mark Vainomaa 2019-04-29 01:25:00 +03:00
• faed690602 Add mcMMO reload command "/mcmmoreload" nossr50 2019-04-29 22:55:39 -07:00
• 7b3f69aee6 Add config reload nossr50 2019-04-29 22:37:46 -07:00
• 6e173c0d4e Add per-skill global multiplier default values nossr50 2019-04-29 22:09:38 -07:00
• d0259d73c5 Gloabl XP multiplier is now tracked by the ExperienceMapManager Added method to grab original value to ExperienceMapManager Moved skill xp values/mults into their own section nossr50 2019-04-29 21:59:01 -07:00
• 7f64fe11b8 Put special combat xp multipliers in their own section nossr50 2019-04-29 21:34:29 -07:00
• a496b1fd71 Dev mode nossr50 2019-04-29 18:54:00 -07:00
• ff8baecb54 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable nossr50 2019-04-28 06:56:22 -07:00
• ac8042f5d8 update gitignore nossr50 2019-04-28 06:52:16 -07:00
• 437bac1324 Revert "Add missing XP tables to 2.2" nossr50 2019-04-28 06:15:08 -07:00
• 7c4481f099 removing unused classes nossr50 2019-04-28 06:08:15 -07:00
• d1085aa8f8 Add missing XP tables to 2.2 nossr50 2019-04-28 06:05:39 -07:00
• 986162803b Merge 2.1.50 nossr50 2019-04-28 05:46:49 -07:00
• f7eb06e80b 2.1.50 nossr50 2019-04-27 06:39:06 -07:00
• f4214e2031 changelog update nossr50 2019-04-27 00:00:52 -07:00
• fd8712ee61 Merge pull request #3905 from Zed-I/patch-6 Robert A. C 2019-04-26 23:50:43 -07:00
• f904ac7019 Fixing 1.13.2 bamboo material errors BuildTools 2019-04-26 23:26:00 -07:00
• 3c08af363f Merge pull request #3904 from OverCrave/master Robert A. C 2019-04-26 14:17:54 -07:00
• 8295355a5d Merge pull request #3906 from Zed-I/patch-7 Robert A. C 2019-04-26 14:17:36 -07:00
• aee81f87f5 Added bamboo to the non-2 high plant blocks Zed-I 2019-04-26 18:16:42 +02:00
• 43d08ec21d Added some missing blocks to Herbalism/Mining Zed-I 2019-04-26 18:08:12 +02:00
• 15e3ad8876 add missing translations OverCrave 2019-04-26 17:58:23 +02:00
• a583f557d7 remove unused translations OverCrave 2019-04-26 17:49:35 +02:00
• 0949931a61 2.1.49 nossr50 2019-04-25 18:56:49 -07:00
• 8efee39f7e Add sweet berrys to Herbalism XP tables (update configs) nossr50 2019-04-25 18:54:41 -07:00
• 307b807b38 Merge pull request #3788 from LogGits/patch-5 Robert A. C 2019-04-25 18:50:27 -07:00
• be8a2a4b07 Fixes #3902 - NPE in Inventory Listener nossr50 2019-04-25 18:49:18 -07:00
• 30df57fa35 Fix async tool lower nossr50 2019-04-25 18:46:49 -07:00
• 467025888c Fixed #3858 - Falling blocks in water not getting tracked nossr50 2019-04-25 18:28:24 -07:00
• 02a69cbb05 Update code style nossr50 2019-04-24 22:52:53 -07:00
• dc758a6dfc Wire up XP formula settings nossr50 2019-04-24 22:44:24 -07:00
• 989537366a Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable nossr50 2019-04-24 22:14:02 -07:00
• 21ecf959ea updating pom nossr50 2019-04-24 22:12:49 -07:00
• 9fcedcad76 Add linear/exponential formula config options to defaults nossr50 2019-04-24 22:11:11 -07:00
• 9d9b5464c3 fixing some serializer errors nossr50 2019-04-24 21:38:32 -07:00
• 5fc416a457 Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable nossr50 2019-04-24 21:12:07 -07:00
• d1401d0cba change targetted API nossr50 2019-04-24 21:11:27 -07:00
• 63e905db6c use a custom collection of serializers instead of the default list nossr50 2019-04-24 21:01:33 -07:00
• e8ea502f77 Add delegates to player level conf and wire up xp formula setting nossr50 2019-04-24 19:46:06 -07:00
• ba8b73ad4d add some missing delegates to xp config nossr50 2019-04-24 19:36:46 -07:00
• df2a52984e add combat default xp values nossr50 2019-04-24 19:30:15 -07:00
• b8ad722e9e Taming default XP values + updated acrobatics XP values nossr50 2019-04-24 18:58:29 -07:00
• 7928ababf6 add smelting default xp values nossr50 2019-04-24 18:51:52 -07:00
• 0a63e6674a merge prs nossr50 2019-04-24 18:24:29 -07:00
• b5930fc35d Merge pull request #3897 from Zed-I/patch-4 Robert A. C 2019-04-24 18:23:29 -07:00
• 9a74ab77f4 Merge pull request #3900 from Leomixer17/patch-1 Robert A. C 2019-04-24 18:22:45 -07:00
• 7f233b8e77 Tweaking some merge mistakes / bugs nossr50 2019-04-24 17:19:04 -07:00
• 17c193f984 Merge branch 'configurable' of https://github.com/mcMMO-dev/mcmmo into configurable nossr50 2019-04-24 17:17:26 -07:00