Commit Graph

Select branches

Hide Pull Requests

1.10.x

1.11.x

1.12.x

1.13.x

1.14.x

1.15.x

1.16.x

1.17.x

1.18.x

1.19.2

1.19.x

1.20.1

1.20.4

1.20.x

1.21.1

1.21.10

1.21.11

1.21.3

1.21.4

1.21.5

1.21.8

1.6

1.7.10

1.8

1.8.8

1.8.9

1.9

1.9.0

1.9.4

26.1

26.1.1

26.1.2

26.2

26.3

failtests

mc172

noci-1.10.2-mezz

noci-1.11.x

noci-1.12.x

noci-1.12.x-regrewrite

noci-1.14.4

noci-omnibus/tags

noci-omnibus/typos

v164-pregradle

#1

#1/merge

#10

#10/merge

#100

#100/merge

#1000

#1000/merge

#10004

#10006

#10009

#1001

#1001/merge

#10011

#10013

#10014

#10016

#10017

#10018

#10019

#10020

#10021

#10022

#10023

#10024

#10025

#10026

#10028

#10029

#10033

#10034

#10035

#10036

#10037

#10038

#1004

#1004/merge

#10041

#10043

#10044

#10045

#10047

#10048

#1005

#10050

#10051

#10052

#10053

#10055

#10056

#1006

#1006/merge

#10061

#10063

#10065

#10069

#1007

#1007/merge

#10071

#10073

#10074

#10076

#10077

#1008

#1008/merge

#10081

#10082

#10083

#10084

#10085

#10086

#10087

#10088

#10089

#1009

#1009/merge

#10090

#10091

#10092

#10093

#10094

#10095

#10096

#10097

#10098

#10099

#101

#101/merge

#10100

#10101

#10102

#10103

#10104

#10105

#10106

#10108

#10109

#1011

#1011/merge

#10110

#10111

#10115

#10118

#1012

#10122

#10123

#10124

#10125

#10126

#10127

#10128

#10129

#1013

#1013/merge

#10130

#10131

#10132

#10133

#10135

#10136

#10137

#10140

#10141

#10142

#10143

#10145

#10146

#10149

#10151

#10152

#10156

#10159

#1016

#1016/merge

#10160

#10161

#10162

#10163

#10167

#10168

#1017

#1017/merge

#10170

#10171

#10172

#10175

#10177

#10186

#10187

#10188

#1019

#1019/merge

#10190

#10193

#10194

#10195

#10196

#10197

#10198

#10199

#102

#102/merge

#1020

#1020/merge

#10206

#10208

#10209

#1021

#1021/merge

#10210

#10211

#10212

#10213

#10214

#10215

#10216

#10217

#10218

#10219

#10220

#10221

#10222

#10223

#10224

#10225

#10226

#10227

#10228

#10229

#1023

#1023/merge

#10230

#10231

#10232

#10233

#10234

#10235

#10236

#10237

#10238

#10239

#1024

#10240

#10241

#10242

#10243

#10244

#10245

#10246

#10247

#10248

#10249

#10250

#10251

#10252

#10253

#10254

#10255

#10256

#10257

#10258

#10259

#1026

#1026/merge

#10260

#10261

#10262

#10263

#10264

#10265

#10266

#10267

#10268

#10269

#1027

#1027/merge

#10270

#10271

#10273

#10274

#10275

#10276

#10277

#10278

#10279

#1028

#10281

#10282

#10284

#10285

#10286

#10287

#10288

#10289

#1029

#10290

#10291

#10292

#10295

#10298

#10300

#10301

#10302

#10303

#10304

#10305

#10306

#10307

#10308

#10309

#10310

#10311

#10312

#10313

#10314

#10315

#10316

#10317

#10318

#10319

#1032

#1032/merge

#10320

#10321

#10322

#10323

#10324

#10325

#10326

#10327

#10328

#10329

#1033

#1033/merge

#10330

#10331

#10332

#10333

#10334

#10335

#10338

#10339

#1034

#10340

#10341

#10342

#10343

#10347

#10348

#10349

#1035

#1035/merge

#10350

#10352

#10353

#10354

#10355

#10356

#10357

#10358

#10359

#10360

#10361

#10362

#10363

#10364

#10365

#10366

#10367

#10368

#10369

#10370

#10371

#10372

#10373

#10374

#10375

#10376

#10379

#1038

#10380

#10381

#10382

#10383

#10384

#10385

#10386

#10387

#10388

#1039

#1039/merge

#10390

#10391

#10392

#10393

#10394

#10395

#10396

#10397

#10398

#10399

#104

#104/merge

#1040

#1040/merge

#10400

#10402

#10404

#10405

#10406

#10407

#1041

#1041/merge

#10411

#10411/merge

#10412

#10413

#10414

#10415

#10416

#10417

#10418

#1042

#1042/merge

#10420

#10421

#10422

#10423

#10424

#10425

#10426

#10427

#10428

#10429

#1043

#1043/merge

#10430

#10431

#10432

#10433

#10434

#10435

#10436

#10437

#10438

#10439

#1044

#10440

#10441

#10441/merge

#10442

#10442/merge

#10443

#10443/merge

#10444

#10444/merge

#10445

#10445/merge

#10446

#10446/merge

#10447

#10448

#10449

#1045

#1045/merge

#10451

#10452

#10454

#10455

#10456

#10459

#1046

#1046/merge

#10460

#10461

#10462

#10463

#10464

#10465

#10466

#10467

#10468

#10469

#1047

#1047/merge

#10470

#10471

#10472

#10473

#10474

#10475

#10476

#10477

#10478

#10479

#10480

#10481

#10482

#10483

#10484

#10485

#10486

#10487

#10488

#10489

#1049

#1049/merge

#10490

#10495

#10497

#105

#105/merge

#1050

#10502

#10505

#10506

#10507

#1051

#10511

#10513

#10515

#1052

#1052/merge

#10520

#10521

#10522

#10527

#10527/merge

#10528

#1053

#1053/merge

#10533

#10535

#10538

#10539

#10540

#10542

#10544

#1055

#1055/merge

#10551

#10554

#10556

#10559

#10562

#10564

#10565

#10566

#1057

#1057/merge

#10570

#10571

#10572

#10573

#10576

#10577

#10578

#10579

#10580

#10582

#10583

#10584

#1059

#1059/merge

#10591

#10593

#10594

#10595

#10596

#10597

#106

#106/merge

#1060

#10600

#10603

#10604

#10604/merge

#10605

#10605/merge

#10606

#10606/merge

#10607

#10607/merge

#10608

#10608/merge

#1061

#1061/merge

#10610

#10611

#10612

#10613

#10614

#10614/merge

#10615

#10616

#10616/merge

#10617

#10617/merge

#10618

#10618/merge

#10619

#10619/merge

#1062

#10620

#10620/merge

#10621

#10622

#10623

#10624

#10625

#10625/merge

#10626

#10627

#10627/merge

#10628

#10628/merge

#1063

#1063/merge

#10630

#10630/merge

#10631

#10631/merge

#10632

#10632/merge

#10633

#10633/merge

#10638

#10638/merge

#10639

#10639/merge

#1064

#10640

#10641

#10644

#10646

#10647

#10648

#10649

#1065

#10651

#10653

#10658

#10659

#10661

#10662

#10663

#10664

#10665

#10665/merge

#10669

#10670

#10671

#10672

#10673

#10674

#10676

#10678

#10680

#10681

#10682

#10683

#10685

#10685/merge

#10688

#10692

#10698

#10699

#107

#107/merge

#1070

#1070/merge

#10700

#10701

#10702

#10703

#10704

#10705

#10706

#10709

#10711

#10713

#10716

#10718

#10719

#10721

#10725

#10726

#10728

#10732

#10733

#10735

#10737

#10742

#10744

#10745

#10746

#10747

#10748

#10749

#10750

#10751

#10752

#10753

#10760

#10761

#10762

#10762/merge

#10764

#10764/merge

#10765

#10765/merge

#10766

#10766/merge

#10767

#10768

#10768/merge

#10769

#10769/merge

#10771

#10772

#10772/merge

#10773

#10774

#10775

#10778

#10779

#10780

#10782

#10785

#10786

#10787

#10788

#10789

#10790

#10791

#10792

#10793

#108

#108/merge

#10800

#10800/merge

#10801

#10801/merge

#10802

#10805

#10805/merge

#10806

#10806/merge

#10808

#1081

#10810

#10811

#10812

#10818

#10819

#10820

#10821

#10824

#10825

#10826

#1083

#1083/merge

#10831

#10832

#10833

#10835

#10835/merge

#10837

#10838

#10839

#10840

#10841

#10842

#10843

#10844

#10845

#10846

#10847

#10848

#10849

#1085

#1085/merge

#10850

#10851

#10852

#10853

#10854

#10856

#10857

#10858

#10859

#1086

#10860

#10863

#10864

#10865

#10866

#10867

#10868

#10869

#10870

#10873

#10874

#10875

#10877

#10878

#10879

#10880

#10881

#10884

#10887

#1089

#10891

#10893

#10894

#10895

#10896

#10899

#10904

#10907

#10908

#10909

#1091

#10910

#10910/merge

#10911

#10912

#10913

#10914

#10915

#10916

#10916/merge

#10917

#10917/merge

#10918

#10918/merge

#10919

#10919/merge

#1092

#1092/merge

#10920

#10920/merge

#10921

#10921/merge

#10922

#10922/merge

#10923

#10924

#10925

#10925/merge

#1093

#1093/merge

#1094

#1094/merge

#1095

#1097

#1097/merge

#1099

#1099/merge

#11

#11/merge

#110

#110/merge

#1101

#1103

#1104

#1104/merge

#1105

#1105/merge

#1107

#1107/merge

#1108

#1108/merge

#1109

#1110

#1110/merge

#1112

#1113

#1113/merge

#1114

#1115

#1115/merge

#1118

#1118/merge

#112

#112/merge

#1120

#1120/merge

#1121

#1121/merge

#1122

#1122/merge

#1124

#1125

#1126

#1127

#1127/merge

#1128

#113

#113/merge

#1131

#1131/merge

#1133

#1133/merge

#1134

#1135

#1135/merge

#1136

#1136/merge

#1137

#1137/merge

#1138

#1138/merge

#1139

#1139/merge

#114

#114/merge

#1141

#1141/merge

#1142

#1142/merge

#1145

#1145/merge

#1146

#1147

#1153

#1153/merge

#1155

#1156

#1156/merge

#1159

#116

#116/merge

#1161

#1161/merge

#1162

#1163

#1164

#1166

#1166/merge

#1168

#1168/merge

#117

#117/merge

#1178

#1178/merge

#118

#118/merge

#1180

#1181

#1181/merge

#1182

#1182/merge

#1183

#1184

#1187

#1191

#1192

#1193

#1193/merge

#1194

#1195

#1197

#1198

#1198/merge

#1199

#12

#12/merge

#120

#120/merge

#1200

#1201

#1201/merge

#1205

#1205/merge

#121

#121/merge

#1210

#1212

#1212/merge

#1213

#1215

#1215/merge

#1217

#1219

#122

#122/merge

#1220

#1220/merge

#1221

#1221/merge

#1223

#1223/merge

#1224

#1224/merge

#1225

#1226

#1229

#1229/merge

#123

#123/merge

#1231

#1231/merge

#1232

#1233

#1233/merge

#1235

#1238

#1238/merge

#124

#124/merge

#1240

#1240/merge

#1241

#1241/merge

#1245

#1245/merge

#1248

#1248/merge

#1254

#1255

#1255/merge

#1256

#1256/merge

#1257

#1257/merge

#126

#126/merge

#1262

#1262/merge

#1263

#1265

#1265/merge

#1266

#1266/merge

#1267

#1267/merge

#127

#127/merge

#1271

#1271/merge

#1272

#1273

#1273/merge

#1274

#1274/merge

#1276

#1276/merge

#1277

#128

#128/merge

#1281

#1281/merge

#1282

#1282/merge

#1284

#1284/merge

#1286

#1288

#1289

#1289/merge

#129

#129/merge

#1290

#1290/merge

#1291

#1291/merge

#1292

#1293

#1293/merge

#1295

#1295/merge

#1296

#1297

#1298

#1298/merge

#13

#13/merge

#130

#130/merge

#1300

#1302

#1303

#1303/merge

#1304

#1304/merge

#1305

#1305/merge

#1306

#1306/merge

#131

#131/merge

#1311

#1311/merge

#1314

#1314/merge

#1316

#132

#132/merge

#1320

#1323

#1323/merge

#1324

#1324/merge

#1329

#1330

#1331

#1334

#1334/merge

#1335

#1335/merge

#1336

#1336/merge

#1338

#134

#134/merge

#1346

#1346/merge

#1347

#1347/merge

#1348

#1348/merge

#1349

#1349/merge

#135

#135/merge

#1350

#1350/merge

#1351

#1351/merge

#1352

#1355

#1355/merge

#1356

#1356/merge

#1359

#1359/merge

#136

#136/merge

#1360

#1360/merge

#1361

#1361/merge

#1364

#1366

#1366/merge

#1367

#1368

#137

#137/merge

#1372

#1372/merge

#1373

#1373/merge

#1376

#1377

#1377/merge

#138

#1383

#1383/merge

#1386

#1386/merge

#1387

#1387/merge

#1389

#1389/merge

#139

#139/merge

#1390

#1391

#1391/merge

#1392

#1392/merge

#1393

#1393/merge

#1394

#1394/merge

#1395

#1396

#1396/merge

#1398

#1399

#1399/merge

#14

#14/merge

#1401

#1401/merge

#1402

#1403

#1403/merge

#1404

#1404/merge

#1405

#1405/merge

#1406

#1406/merge

#1407

#1407/merge

#1408

#141

#141/merge

#1411

#1411/merge

#1412

#1413

#1413/merge

#1416

#1418

#142

#142/merge

#1421

#1421/merge

#1423

#1423/merge

#1424

#1424/merge

#1425

#1425/merge

#1426

#1426/merge

#1427

#1427/merge

#143

#143/merge

#1430

#1430/merge

#1434

#1434/merge

#144

#144/merge

#1440

#1440/merge

#1444

#1444/merge

#1445

#1445/merge

#1449

#1449/merge

#145

#145/merge

#1450

#1452

#1452/merge

#1453

#1453/merge

#1454

#1454/merge

#1457

#1459

#1459/merge

#146

#146/merge

#1461

#1465

#1465/merge

#1469

#1469/merge

#147

#147/merge

#1470

#1470/merge

#1471

#1471/merge

#1472

#1472/merge

#1473

#1473/merge

#1476

#1476/merge

#148

#148/merge

#1486

#1486/merge

#1487

#1487/merge

#1488

#1488/merge

#1489

#1489/merge

#1490

#1490/merge

#1491

#1492

#1493

#1493/merge

#1494

#1495

#1495/merge

#1497

#1497/merge

#1498

#1498/merge

#1499

#1499/merge

#15

#15/merge

#150

#150/merge

#1503

#1506

#151

#151/merge

#1518

#152

#152/merge

#1520

#1520/merge

#1521

#153

#153/merge

#154

#154/merge

#1541

#1541/merge

#1547

#1549

#1549/merge

#155

#155/merge

#1553

#1553/merge

#1554

#1554/merge

#1557

#1557/merge

#156

#156/merge

#1561

#1561/merge

#1564

#1564/merge

#1565

#1565/merge

#157

#157/merge

#1573

#1573/merge

#1579

#1579/merge

#158

#158/merge

#1580

#1580/merge

#1581

#1584

#1584/merge

#1586

#1589

#1589/merge

#159

#159/merge

#1591

#1591/merge

#1592

#1594

#1594/merge

#1596

#1596/merge

#1597

#1597/merge

#1598

#16

#16/merge

#160

#160/merge

#1600

#1600/merge

#1601

#1601/merge

#1602

#1604

#1604/merge

#1607

#1608

#1608/merge

#1609

#1610

#1610/merge

#1611

#1611/merge

#1613

#1613/merge

#1614

#1614/merge

#1615

#1617

#1619

#1619/merge

#162

#162/merge

#1622

#1622/merge

#1627

#1629

#1629/merge

#1632

#1632/merge

#1634

#1634/merge

#1635

#1638

#1638/merge

#164

#164/merge

#1641

#1641/merge

#1645

#1646

#1647

#1649

#1649/merge

#165

#165/merge

#1650

#1650/merge

#1652

#1652/merge

#1654

#1654/merge

#1655

#1655/merge

#1656

#1656/merge

#1657

#1657/merge

#1659

#1659/merge

#166

#166/merge

#1662

#1662/merge

#1663

#1664

#1665

#1665/merge

#1666

#1668

#1668/merge

#1669

#1669/merge

#167

#167/merge

#1670

#1670/merge

#1671

#1671/merge

#168

#168/merge

#1682

#1682/merge

#1685

#1685/merge

#1689

#169

#169/merge

#1693

#1693/merge

#1697

#1697/merge

#1699

#1699/merge

#17

#17/merge

#1700

#1706

#1706/merge

#1708

#171

#171/merge

#1711

#1713

#1713/merge

#1714

#1714/merge

#1716

#1717

#1717/merge

#1718

#1720

#1721

#1722

#1722/merge

#1723

#1726

#1726/merge

#1728

#1728/merge

#1729

#173

#173/merge

#1730

#1731

#1733

#1736

#1736/merge

#1738

#1738/merge

#1739

#174

#174/merge

#1745

#1746

#1746/merge

#1749

#175

#175/merge

#1751

#1751/merge

#1752

#1754

#1755

#1758

#1758/merge

#1759

#1759/merge

#176

#176/merge

#1762

#1762/merge

#1763

#1763/merge

#1766

#1766/merge

#1767

#1767/merge

#177

#177/merge

#1770

#1771

#1775

#178

#178/merge

#1780

#1780/merge

#1781

#1783

#1783/merge

#1784

#1786

#1786/merge

#1787

#1787/merge

#1789

#179

#179/merge

#1791

#1793

#1793/merge

#1795

#1796

#18

#18/merge

#180

#180/merge

#1800

#1800/merge

#1804

#1805

#181

#181/merge

#1814

#1817

#1817/merge

#1819

#1819/merge

#182

#182/merge

#1821

#1822

#1822/merge

#1826

#1826/merge

#183

#183/merge

#1830

#1830/merge

#1831

#1832

#1843

#1847

#1847/merge

#185

#185/merge

#1853

#1857

#1857/merge

#1858

#186

#186/merge

#1863

#1866

#1866/merge

#1867

#1868

#187

#187/merge

#1873

#1873/merge

#1876

#1877

#1877/merge

#1878

#1881

#1882

#1885

#1886

#189

#189/merge

#1892

#1895

#1895/merge

#1897

#1897/merge

#1898

#1898/merge

#19

#19/merge

#190

#190/merge

#1903

#1903/merge

#1907

#191

#191/merge

#1911

#1912

#1916

#1916/merge

#1918

#1918/merge

#1919

#1919/merge

#192

#192/merge

#1920

#1920/merge

#1922

#1926

#1926/merge

#1928

#1928/merge

#1929

#1929/merge

#193

#193/merge

#1931

#1932

#1933

#1933/merge

#1934

#1934/merge

#1935

#1937

#1937/merge

#1938

#1938/merge

#194

#194/merge

#1941

#1942

#1942/merge

#1944

#1944/merge

#1945

#1947

#1947/merge

#1951

#1951/merge

#1952

#1953

#1956

#1958

#1958/merge

#1959

#1959/merge

#196

#196/merge

#1966

#1968

#1969

#1971

#1971/merge

#1972

#1974

#1977

#1977/merge

#1978

#198

#198/merge

#1980

#1980/merge

#1982

#1982/merge

#1983

#199

#199/merge

#1991

#1999

#1999/merge

#2

#2/merge

#20

#20/merge

#200

#200/merge

#2002

#2004

#2009

#2009/merge

#201

#201/merge

#2012

#2014

#2014/merge

#2017

#202

#202/merge

#2020

#2020/merge

#2022

#2023

#2025

#2029

#2029/merge

#203

#203/merge

#2033

#2033/merge

#2035

#2038

#2038/merge

#204

#204/merge

#2041

#2041/merge

#2042

#2042/merge

#2044

#2046

#2047

#2048

#205

#205/merge

#2050

#2050/merge

#2054

#2054/merge

#2056

#2058

#2058/merge

#206

#206/merge

#2064

#2064/merge

#2068

#2068/merge

#2069

#207

#207/merge

#2072

#2076

#2076/merge

#2078

#2078/merge

#2081

#2083

#2083/merge

#2086

#2087

#2087/merge

#2089

#2089/merge

#209

#209/merge

#2090

#2090/merge

#2091

#2094

#2094/merge

#21

#21/merge

#210

#210/merge

#2103

#2108

#2108/merge

#211

#211/merge

#2113

#2113/merge

#2116

#2116/merge

#2117

#2118

#212

#2120

#2123

#2123/merge

#2125

#2125/merge

#2126

#2127

#2127/merge

#2129

#213

#213/merge

#2133

#2133/merge

#2134

#2134/merge

#2135

#2135/merge

#2139

#2139/merge

#2141

#2141/merge

#2143

#2143/merge

#2146

#2151

#2154

#2155

#2155/merge

#2157

#2157/merge

#216

#216/merge

#2160

#2160/merge

#2161

#2164

#2164/merge

#2167

#2168

#217

#217/merge

#2174

#2177

#2179

#218

#218/merge

#2186

#2186/merge

#2189

#2189/merge

#219

#219/merge

#2191

#2192

#2193

#2193/merge

#2194

#2194/merge

#2195

#2195/merge

#2196

#2199

#2199/merge

#22

#22/merge

#220

#220/merge

#2200

#2200/merge

#2201

#2201/merge

#2205

#2207

#2207/merge

#2208

#2208/merge

#2209

#2210

#2210/merge

#2212

#2216

#2216/merge

#2218

#2218/merge

#2219

#2219/merge

#222

#222/merge

#2224

#2224/merge

#2225

#2228

#2229

#2229/merge

#223

#223/merge

#2230

#2230/merge

#2231

#2232

#2232/merge

#2233

#2234

#2234/merge

#2238

#2238/merge

#2239

#224

#224/merge

#2240

#2240/merge

#2241

#2241/merge

#2242

#2242/merge

#2245

#2245/merge

#2247

#2247/merge

#2248

#2250

#2253

#2264

#2264/merge

#2265

#2265/merge

#2266

#2266/merge

#2268

#2270

#2271

#2271/merge

#2272

#2276

#2276/merge

#2279

#2279/merge

#228

#228/merge

#2280

#2280/merge

#2281

#2281/merge

#2282

#2283

#2283/merge

#2286

#2286/merge

#229

#229/merge

#2293

#2295

#2295/merge

#230

#2306

#2306/merge

#2308

#2308/merge

#231

#231/merge

#2311

#2311/merge

#2313

#2313/merge

#2318

#232

#232/merge

#2320

#2322

#2325

#2325/merge

#2329

#2329/merge

#233

#233/merge

#2331

#2332

#2333

#2335

#2335/merge

#2336

#2337

#2337/merge

#234

#2340

#2340/merge

#2342

#2342/merge

#2343

#2347

#2347/merge

#235

#235/merge

#2354

#2355

#2357

#2358

#2359

#2359/merge

#236

#236/merge

#2360

#2360/merge

#2364

#2364/merge

#2366

#2366/merge

#2367

#237

#237/merge

#2370

#2371

#2375

#2377

#2377/merge

#2378

#238

#238/merge

#2380

#2381

#2381/merge

#2382

#2385

#2386

#2386/merge

#2387

#2387/merge

#2389

#2389/merge

#2390

#2391

#2392

#2393

#2393/merge

#2394

#2395

#2396

#2399

#24

#24/merge

#2401

#2407

#2407/merge

#241

#241/merge

#2414

#2417

#2417/merge

#2418

#2418/merge

#242

#242/merge

#2422

#2422/merge

#2423

#2424

#2429

#243

#243/merge

#2432

#2434

#2436

#2436/merge

#2437

#244

#244/merge

#2442

#2442/merge

#2443

#2446

#2446/merge

#2457

#2457/merge

#2458

#2458/merge

#2459

#2459/merge

#246

#246/merge

#2464

#2464/merge

#2465

#2465/merge

#2466

#2467

#2468

#2469

#247

#247/merge

#2470

#2474

#2475

#2475/merge

#2476

#2478

#2480

#2480/merge

#2481

#2485

#2488

#2490

#2492

#2492/merge

#2495

#2496

#2497

#25

#25/merge

#250

#250/merge

#2500

#2505

#2505/merge

#251

#251/merge

#2513

#2513/merge

#2514

#2515

#2515/merge

#2516

#2516/merge

#2517

#2517/merge

#2518

#2518/merge

#2519

#2519/merge

#252

#2520

#2521

#2522

#2522/merge

#2524

#2524/merge

#253

#253/merge

#2531

#2534

#2534/merge

#2539

#254

#254/merge

#2543

#2543/merge

#2544

#2545

#2545/merge

#2546

#2546/merge

#255

#255/merge

#2551

#2551/merge

#2552

#2552/merge

#2557

#2557/merge

#2559

#2562

#2562/merge

#2563

#2563/merge

#2578

#2578/merge

#2579

#2579/merge

#258

#258/merge

#2584

#2585

#2586

#2587

#2588

#2588/merge

#2589

#259

#259/merge

#2590

#2592

#2593

#2594

#2597

#2597/merge

#2599

#2599/merge

#26

#26/merge

#260

#260/merge

#2602

#2602/merge

#2604

#2605

#2606

#2610

#2612

#2614

#2615

#2615/merge

#2616

#2618

#2620

#2620/merge

#2621

#2622

#2625

#2625/merge

#2626

#2626/merge

#2627

#2627/merge

#2634

#2635

#2635/merge

#2636

#2636/merge

#264

#264/merge

#2641

#2642

#2642/merge

#2643

#2645

#2649

#265

#265/merge

#2650

#2655

#2655/merge

#2656

#2658

#2658/merge

#2659

#266

#2660

#2660/merge

#2662

#2662/merge

#2664

#2667

#267

#267/merge

#2674

#2674/merge

#2678

#2679

#268

#268/merge

#2687

#2687/merge

#269

#269/merge

#2691

#2691/merge

#2692

#2693

#2695

#2697

#27

#27/merge

#270

#270/merge

#2701

#2702

#2703

#2703/merge

#2704

#2707

#2708

#2709

#271

#271/merge

#2710

#2710/merge

#2711

#2711/merge

#2714

#2718

#2719

#2721

#2723

#2728

#2728/merge

#2729

#273

#273/merge

#2730

#2731

#2731/merge

#2733

#2733/merge

#2736

#2737

#2737/merge

#274

#274/merge

#2742

#2744

#2744/merge

#2745

#2746

#275

#2750

#2750/merge

#2751

#2751/merge

#2753

#2753/merge

#2758

#2758/merge

#276

#276/merge

#2760

#2761

#2761/merge

#2762

#2763

#2763/merge

#2765

#2765/merge

#2769

#277

#277/merge

#2770

#2770/merge

#2775

#2775/merge

#2779

#2779/merge

#278

#278/merge

#2785

#279

#279/merge

#2791

#2791/merge

#2792

#2793

#2793/merge

#2794

#2794/merge

#2795

#2797

#2798

#28

#28/merge

#280

#280/merge

#2802

#2802/merge

#2803

#2804

#2804/merge

#2805

#2806

#2807

#2808

#2809

#281

#281/merge

#2811

#2812

#2812/merge

#2814

#2815

#2817

#2819

#282

#282/merge

#2823

#2823/merge

#2826

#2826/merge

#2828

#2829

#283

#283/merge

#2830

#2830/merge

#2833

#2834

#2838

#2839

#284

#284/merge

#2840

#2840/merge

#2842

#2843

#2844

#2844/merge

#2849

#2849/merge

#285

#285/merge

#2852

#2852/merge

#2853

#2853/merge

#286

#286/merge

#2863

#2863/merge

#2865

#2868

#2868/merge

#287

#287/merge

#2872

#2874

#2874/merge

#2875

#2878

#2878/merge

#2879

#2880

#2880/merge

#2883

#2883/merge

#2884

#2885

#2885/merge

#2886

#2887

#2887/merge

#2889

#2889/merge

#2891

#2891/merge

#2892

#2892/merge

#2893

#2895

#2897

#2897/merge

#2898

#2898/merge

#29

#29/merge

#290

#290/merge

#2904

#2906

#2906/merge

#2908

#2908/merge

#2909

#2909/merge

#291

#291/merge

#2910

#2910/merge

#2911

#2913

#2913/merge

#2914

#2914/merge

#2915

#2915/merge

#2917

#2917/merge

#2919

#292

#292/merge

#2920

#2921

#2923

#2923/merge

#2925

#2925/merge

#2926

#2926/merge

#2927

#2927/merge

#2928

#2928/merge

#2929

#2930

#2930/merge

#2931

#2931/merge

#2933

#2933/merge

#2935

#2935/merge

#2936

#2938

#2938/merge

#294

#294/merge

#2942

#2943

#2945

#2946

#2947

#2948

#2950

#2950/merge

#2952

#2954

#2955

#2955/merge

#2959

#296

#296/merge

#2960

#2960/merge

#2963

#2963/merge

#2965

#2965/merge

#2966

#2967

#2967/merge

#2968

#297

#297/merge

#2970

#2970/merge

#2976

#2978

#2979

#2979/merge

#298

#298/merge

#2980

#2980/merge

#2982

#2983

#2983/merge

#2984

#2988

#2988/merge

#2989

#299

#299/merge

#2990

#2992

#2994

#2996

#2997

#3

#3/merge

#30

#30/merge

#3001

#3001/merge

#3002

#3002/merge

#3003

#3003/merge

#3004

#3005

#3006

#3006/merge

#301

#301/merge

#3013

#3016

#3016/merge

#3017

#3018

#302

#302/merge

#3023

#3030

#3031

#3031/merge

#3032

#3034

#3035

#3036

#3036/merge

#3037

#3038

#3039

#304

#304/merge

#3041

#3041/merge

#3042

#3044

#3044/merge

#3046

#3046/merge

#3048

#305

#305/merge

#3052

#3055

#3055/merge

#3058

#3058/merge

#306

#306/merge

#3060

#3060/merge

#3061

#3061/merge

#3062

#3062/merge

#3063

#3063/merge

#3067

#3067/merge

#3069

#3070

#3070/merge

#3071

#3072

#3073

#3073/merge

#3074

#3076

#3076/merge

#3079

#3079/merge

#308

#308/merge

#3082

#3082/merge

#3085

#3086

#3087

#3089

#309

#309/merge

#3090

#3092

#3092/merge

#3093

#3093/merge

#3099

#3099/merge

#31

#31/merge

#310

#310/merge

#3104

#3105

#3108

#3108/merge

#3109

#3109/merge

#311

#311/merge

#3110

#3112

#3115

#3116

#3117

#3117/merge

#3118

#312

#312/merge

#3120

#3121

#3121/merge

#3122

#3125

#3129

#313

#313/merge

#3130

#3130/merge

#3132

#3135

#3135/merge

#3136

#3136/merge

#314

#314/merge

#3140

#3140/merge

#3141

#3141/merge

#3147

#3147/merge

#3149

#3149/merge

#315

#315/merge

#3151

#3151/merge

#3154

#3154/merge

#3155

#3156

#3156/merge

#3158

#3158/merge

#3159

#3159/merge

#316

#316/merge

#3161

#3161/merge

#3163

#3168

#3168/merge

#3169

#3169/merge

#3171

#3171/merge

#3178

#3178/merge

#318

#318/merge

#3180

#3181

#3185

#3185/merge

#3187

#3188

#3188/merge

#3189

#3189/merge

#3190

#3190/merge

#3191

#3192

#3193

#3195

#3195/merge

#3197

#3197/merge

#3198

#3198/merge

#32

#32/merge

#320

#320/merge

#3204

#3204/merge

#3205

#3207

#3207/merge

#3211

#3214

#3214/merge

#3216

#3218

#322

#322/merge

#3220

#3227

#323

#323/merge

#3232

#3232/merge

#3233

#3233/merge

#3234

#324

#324/merge

#3240

#3241

#3241/merge

#3245

#3245/merge

#3248

#3248/merge

#3251

#3255

#3256

#3256/merge

#3257

#3257/merge

#3259

#326

#326/merge

#3265

#3265/merge

#3266

#3267

#3269

#3270

#3271

#3273

#3274

#3274/merge

#3275

#3276

#3276/merge

#3280

#3280/merge

#3283

#3283/merge

#3285

#3285/merge

#3286

#3286/merge

#3288

#3289

#3289/merge

#3292

#3292/merge

#3294

#3295

#33

#33/merge

#3300

#3303

#3303/merge

#3304

#3304/merge

#3305

#3306

#3306/merge

#3307

#3308

#331

#331/merge

#3313

#3313/merge

#3318

#3318/merge

#332

#332/merge

#3320

#3321

#3321/merge

#3324

#3324/merge

#3327

#3327/merge

#3328

#3329

#333

#333/merge

#3332

#3332/merge

#3334

#3335

#3336

#3336/merge

#3338

#3339

#3339/merge

#3340

#3340/merge

#3342

#3343

#3346

#3346/merge

#3347

#3349

#3349/merge

#335

#335/merge

#3350

#3350/merge

#3353

#3353/merge

#3354

#3354/merge

#3355

#3355/merge

#3356

#3359

#3360

#3360/merge

#3361

#3362

#337

#337/merge

#3373

#3373/merge

#3374

#3375

#3375/merge

#3377

#3377/merge

#3379

#3380

#3381

#3381/merge

#3382

#3388

#339

#339/merge

#3392

#3394

#3394/merge

#3395

#3397

#34

#34/merge

#340

#340/merge

#3400

#3401

#3402

#3405

#3407

#3407/merge

#341

#341/merge

#3410

#3410/merge

#3411

#3412

#3412/merge

#3413

#3414

#3416

#3416/merge

#3417

#3425

#3425/merge

#3426

#3429

#343

#343/merge

#3433

#3434

#3435

#3435/merge

#3436

#3437

#3438

#3439

#3440

#3441

#3442

#3444

#3445

#3446

#3446/merge

#3447

#3449

#3450

#3450/merge

#3451

#3451/merge

#3458

#3462

#3462/merge

#3463

#3464

#3466

#3468

#3468/merge

#3469

#3471

#3471/merge

#3472

#3472/merge

#3473

#3473/merge

#3474

#3475

#3476

#3478

#3478/merge

#348

#348/merge

#3480

#3480/merge

#3481

#3481/merge

#3482

#3484

#3484/merge

#3485

#3485/merge

#3486

#3491

#3491/merge

#3494

#3496

#3496/merge

#35

#35/merge

#3500

#3502

#3502/merge

#3503

#3504

#3504/merge

#3506

#3506/merge

#3509

#351

#351/merge

#3513

#3514

#3514/merge

#3515

#3516

#3516/merge

#3517

#3518

#3518/merge

#3519

#352

#352/merge

#3522

#3525

#3526

#3526/merge

#3528

#3529

#3529/merge

#3532

#3534

#3534/merge

#3537

#354

#354/merge

#3543

#3543/merge

#3544

#3545

#3545/merge

#3546

#3547

#3549

#3549/merge

#3550

#3551

#3552

#3553

#3554

#3554/merge

#3555

#3557

#3557/merge

#3559

#3559/merge

#356

#356/merge

#3562

#3563

#3564

#3565

#3569

#3569/merge

#3571

#3573

#3574

#3577

#3578

#3578/merge

#3579

#358

#358/merge

#3580

#3581

#3583

#3583/merge

#3584

#3585

#3585/merge

#3586

#3587

#3590

#3592

#3597

#3598

#3599

#3599/merge

#36

#36/merge

#3601

#3601/merge

#3609

#361

#361/merge

#3610

#3611

#3612

#3612/merge

#3614

#3615

#3617

#3620

#3621

#3622

#3623

#3623/merge

#3625

#3626

#3626/merge

#3627

#3628

#363

#363/merge

#3630

#3632

#3636

#3637

#3638

#3639

#3639/merge

#364

#364/merge

#3640

#3641

#3642

#3642/merge

#3643

#3644

#3645

#3646

#3646/merge

#3648

#3651

#3652

#3652/merge

#3655

#3656

#366

#366/merge

#3660

#3660/merge

#3661

#3661/merge

#3663

#3664

#3664/merge

#3666

#3667

#3668

#3668/merge

#3672

#3673

#3675

#3675/merge

#3678

#3679

#368

#368/merge

#3680

#3680/merge

#3681

#3684

#3684/merge

#3685

#3686

#3686/merge

#3688

#3689

#369

#369/merge

#3691

#3695

#3697

#37

#37/merge

#370

#370/merge

#3700

#3701

#3702

#3704

#3705

#3709

#371

#371/merge

#3711

#3712

#3715

#3716

#3717

#372

#372/merge

#3725

#3725/merge

#3726

#3728

#373

#373/merge

#3730

#3731

#3735

#3736

#3737

#3739

#3739/merge

#374

#374/merge

#3741

#3741/merge

#3742

#3743

#3744

#3747

#3748

#3748/merge

#375

#375/merge

#3752

#3753

#3753/merge

#3755

#3755/merge

#3756

#3758

#3758/merge

#3759

#3759/merge

#376

#376/merge

#3760

#3760/merge

#3761

#3761/merge

#3762

#3762/merge

#3763

#3767

#3769

#3769/merge

#377

#377/merge

#3771

#3772

#3773

#3773/merge

#3774

#3775

#3776

#3777

#3777/merge

#3778

#3779

#3781

#3781/merge

#3783

#3783/merge

#3785

#3785/merge

#3789

#3790

#3790/merge

#3792

#3792/merge

#3798

#38

#38/merge

#3801

#3801/merge

#3805

#3806

#3807

#3809

#3809/merge

#381

#381/merge

#3813

#3816

#3816/merge

#3817

#3819

#3819/merge

#382

#382/merge

#3822

#3823

#3824

#383

#383/merge

#3830

#3833

#3833/merge

#3836

#3838

#3839

#384

#384/merge

#3845

#3845/merge

#3847

#3849

#3849/merge

#385

#385/merge

#3851

#3851/merge

#3852

#3852/merge

#3853

#3853/merge

#3857

#3857/merge

#3858

#3859

#386

#386/merge

#3860

#3861

#3862

#3862/merge

#3866

#3866/merge

#387

#387/merge

#3870

#3870/merge

#3871

#3871/merge

#3872

#3872/merge

#3873

#3875

#3876

#3876/merge

#3878

#3879

#3879/merge

#388

#388/merge

#3884

#3886

#3887

#3888

#3889

#3889/merge

#389

#389/merge

#3891

#3891/merge

#3893

#3894

#3894/merge

#3895

#3895/merge

#3896

#3898

#3898/merge

#3899

#3899/merge

#39

#39/merge

#3900

#3901

#3905

#3906

#3907

#3908

#3909

#3914

#3914/merge

#3916

#3916/merge

#3917

#3919

#392

#392/merge

#3920

#3920/merge

#3921

#3921/merge

#3922

#3923

#3923/merge

#3925

#3926

#3927

#3927/merge

#3928

#3928/merge

#3929

#393

#393/merge

#3930

#3931

#3931/merge

#3934

#3938

#3940

#3941

#3941/merge

#3942

#3945

#3945/merge

#395

#395/merge

#3951

#3951/merge

#3952

#3952/merge

#3953

#3954

#3954/merge

#3955

#3955/merge

#3958

#3958/merge

#3959

#396

#396/merge

#3965

#3965/merge

#3967

#3970

#3970/merge

#398

#398/merge

#3983

#3983/merge

#3987

#3987/merge

#3988

#3988/merge

#3990

#3990/merge

#3994

#3995

#3998

#4

#4/merge

#40

#40/merge

#400

#400/merge

#4000

#4000/merge

#4003

#4006

#4006/merge

#4007

#4007/merge

#4011

#4015

#4017

#4019

#402

#402/merge

#4021

#4025

#4026

#4026/merge

#4027

#4028

#4029

#4029/merge

#403

#403/merge

#4030

#4030/merge

#4032

#4035

#4037

#4040

#4043

#4044

#4044/merge

#4045

#4045/merge

#4046

#405

#405/merge

#4051

#4052

#4054

#4056

#4056/merge

#4059

#406

#406/merge

#4060

#4068

#407

#407/merge

#4070

#4071

#4071/merge

#4073

#4073/merge

#4074

#4074/merge

#4075

#4076

#4076/merge

#4077

#4078

#408

#408/merge

#4080

#4081

#4081/merge

#4082

#4083

#4084

#4085

#4085/merge

#4089

#409

#409/merge

#4090

#4091

#4092

#4092/merge

#4097

#4097/merge

#4098

#41

#41/merge

#410

#410/merge

#4103

#4103/merge

#4105

#4105/merge

#4106

#4107

#4107/merge

#4108

#4108/merge

#411

#411/merge

#4112

#4112/merge

#4113

#4114

#4116

#4117

#4118

#4118/merge

#412

#412/merge

#4120

#4122

#4122/merge

#4123

#4126

#4127

#4128

#4128/merge

#413

#413/merge

#4130

#4133

#4134

#4137

#4138

#4139

#4139/merge

#414

#414/merge

#4143

#4144

#4146

#415

#415/merge

#4154

#4154/merge

#4155

#4156

#4158

#4159

#4159/merge

#4160

#4162

#4164

#4164/merge

#4167

#4169

#4169/merge

#417

#417/merge

#4170

#4170/merge

#4172

#4173

#4173/merge

#4174

#4174/merge

#4176

#4176/merge

#4179

#418

#418/merge

#4180

#4180/merge

#4182

#4182/merge

#4183

#4184

#4186

#4187

#4188

#419

#419/merge

#4193

#4194

#4196

#4196/merge

#4198

#4198/merge

#42

#42/merge

#420

#420/merge

#4200

#4202

#4203

#4204

#4204/merge

#4205

#4205/merge

#4206

#4206/merge

#4207

#4207/merge

#4208

#421

#421/merge

#4210

#4212

#422

#422/merge

#4220

#4221

#4221/merge

#4223

#4224

#4225

#4227

#4227/merge

#4228

#4229

#4229/merge

#423

#423/merge

#4232

#4233

#4233/merge

#4234

#4234/merge

#4236

#4236/merge

#4237

#424

#424/merge

#4244

#4244/merge

#4245

#4247

#4248

#4249

#4249/merge

#4250

#4250/merge

#4251

#4252

#4253

#4253/merge

#4256

#4257

#4257/merge

#4259

#426

#426/merge

#4260

#4260/merge

#4261

#4261/merge

#4262

#4262/merge

#4263

#4263/merge

#4264

#4264/merge

#4265

#4266

#4266/merge

#4267

#4268

#427

#427/merge

#4271

#4271/merge

#4273

#4277

#4279

#4281

#4283

#4284

#4286

#429

#429/merge

#4295

#4298

#43

#43/merge

#4301

#4302

#4303

#4304

#4305

#431

#4310

#4312

#4313

#4315

#4315/merge

#4316

#432

#432/merge

#4320

#4322

#4323

#4329

#433

#433/merge

#4330

#4331

#4332

#4334

#4335

#4336

#4337

#4337/merge

#4339

#434

#434/merge

#4340

#4343

#4344

#4344/merge

#4349

#435

#435/merge

#4350

#4350/merge

#4351

#4351/merge

#4354

#4354/merge

#4356

#4358

#4360

#4362

#4363

#4365

#4367

#4367/merge

#437

#437/merge

#4370

#4377

#438

#438/merge

#4380

#4381

#4383

#4385

#4385/merge

#4387

#4388

#4389

#439

#439/merge

#4393

#4396

#4399

#440

#440/merge

#4400

#4400/merge

#4402

#4403

#4404

#4404/merge

#4405

#4405/merge

#4408

#441

#441/merge

#4411

#4414

#4418

#4419

#4419/merge

#442

#442/merge

#4420

#4420/merge

#4427

#4427/merge

#4429

#443

#443/merge

#4430

#4430/merge

#4431

#4431/merge

#4432

#4432/merge

#4433

#4435

#4438

#444

#444/merge

#4441

#4441/merge

#4443

#4448

#4449

#4449/merge

#4451

#4452

#4453

#4454

#4456

#4457

#4457/merge

#4459

#4459/merge

#4460

#4462

#4465

#4465/merge

#4466

#4467

#4468

#4469

#447

#447/merge

#4471

#4472

#4474

#4474/merge

#4476

#4476/merge

#4477

#4478

#4478/merge

#4479

#4479/merge

#4480

#4481

#4481/merge

#4482

#4482/merge

#4487

#4488

#4488/merge

#4489

#4489/merge

#449

#449/merge

#4490

#4493

#4494

#4494/merge

#4495

#4496

#4496/merge

#45

#45/merge

#450

#450/merge

#4501

#4503

#4507

#4508

#451

#451/merge

#4510

#4511

#4512

#4513

#4517

#4519

#4519/merge

#4520

#4521

#4524

#4525

#4525/merge

#4526

#4526/merge

#4528

#453

#453/merge

#4532

#4534

#4536

#4538

#4539

#454

#454/merge

#4540

#4541

#4541/merge

#4544

#4545

#4546

#4546/merge

#4547

#4549

#455

#455/merge

#4552

#4555

#4555/merge

#456

#456/merge

#4560

#4560/merge

#4563

#4565

#4568

#4568/merge

#4569

#4569/merge

#4570

#4571

#4572

#4573

#4574

#4575

#4575/merge

#4576

#4576/merge

#4578

#4579

#4582

#4582/merge

#4583

#4584

#4585

#4587

#4588

#4588/merge

#459

#459/merge

#4590

#4591

#4592

#4592/merge

#4593

#4594

#4595

#4596

#4597

#4597/merge

#4598

#4598/merge

#4599

#46

#46/merge

#460

#460/merge

#4600

#4602

#4604

#4606

#4608

#4608/merge

#4609

#461

#461/merge

#4610

#4610/merge

#4614

#4615

#4616

#4619

#4621

#4621/merge

#4622

#4622/merge

#4623

#4627

#4627/merge

#4628

#4628/merge

#4629

#463

#463/merge

#4630

#4631

#4633

#4633/merge

#4634

#4635

#4638

#4638/merge

#4639

#4639/merge

#4641

#4641/merge

#4642

#4644

#4645

#4648

#4648/merge

#465

#465/merge

#4651

#4651/merge

#4652

#4654

#4655

#4655/merge

#4656

#4656/merge

#4658

#466

#466/merge

#4660

#4660/merge

#4661

#4662

#4664

#4665

#4665/merge

#4666

#4667

#467

#467/merge

#4672

#4673

#4675

#4678

#468

#468/merge

#4680

#4681

#4682

#4685

#4686

#4689

#469

#4690

#4691

#4692

#4693

#4694

#4696

#4697

#4697/merge

#4698

#4699

#4700

#4701

#4701/merge

#4702

#4702/merge

#4703

#4704

#4705

#4706

#4707

#4707/merge

#471

#4710

#4711

#4713

#4714

#4717

#4717/merge

#4720

#4721

#4725

#4726

#4726/merge

#4727

#4728

#4729

#473

#473/merge

#4731

#4731/merge

#4732

#4734

#4735

#4736

#4736/merge

#4738

#4739

#4739/merge

#4741

#4742

#4744

#4744/merge

#4745

#4748

#4749

#475

#475/merge

#4753

#4758

#4758/merge

#4759

#4759/merge

#476

#4761

#4762

#4763

#4765

#4766

#4767

#4774

#4777

#4781

#4782

#4782/merge

#4783

#4784

#4786

#4788

#4788/merge

#479

#479/merge

#4791

#4796

#4798

#48

#48/merge

#480

#480/merge

#4801

#4802

#4803

#4803/merge

#4805

#4806

#4807

#4809

#481

#481/merge

#4810

#4811

#4813

#4816

#4816/merge

#4817

#4821

#4823

#4825

#4826

#483

#483/merge

#4830

#4833

#4833/merge

#4834

#4835

#4835/merge

#4839

#4839/merge

#484

#484/merge

#4841

#4846

#4846/merge

#4848

#4848/merge

#485

#485/merge

#4853

#4854

#4856

#4857

#4857/merge

#4859

#4859/merge

#486

#486/merge

#4861

#4866

#4868

#4869

#487

#487/merge

#4872

#4874

#4874/merge

#4878

#488

#488/merge

#4880

#4881

#4882

#4884

#4884/merge

#4890

#4891

#4895

#4898

#4899

#49

#49/merge

#490

#490/merge

#4902

#4906

#4906/merge

#4909

#491

#491/merge

#4911

#4911/merge

#4914

#4917

#492

#492/merge

#4922

#4924

#4924/merge

#4925

#4926

#4926/merge

#4927

#4927/merge

#4928

#4930

#4932

#4933

#4936

#4936/merge

#4938

#4942

#4947

#4949

#4952

#4956

#4956/merge

#4957

#4958

#496

#496/merge

#4962

#4964

#497

#497/merge

#4970

#4972

#4973

#4974

#4975

#4976

#4976/merge

#4978

#4979

#498

#498/merge

#4982

#4986

#4988

#4988/merge

#4989

#499

#499/merge

#4990

#4991

#4995

#4997

#4999

#5

#5/merge

#50

#50/merge

#500

#500/merge

#5000

#5000/merge

#5005

#5006

#5007

#5008

#5008/merge

#5009

#501

#501/merge

#5010

#5011

#5013

#5015

#5016

#5017

#5019

#5023

#5023/merge

#5024

#5025

#5026

#5027

#5029

#5031

#5032

#5032/merge

#5033

#5034

#5036

#5037

#5037/merge

#5038

#504

#504/merge

#5040

#5040/merge

#5041

#5042

#5047

#505

#505/merge

#5051

#5057

#5058

#5058/merge

#506

#506/merge

#5063

#5064

#5065

#5065/merge

#5066

#5067

#5068

#5068/merge

#5069

#5069/merge

#507

#5070

#5072

#5072/merge

#5074

#5075

#5076

#5078

#5079

#5079/merge

#508

#5080

#5081

#5082

#5084

#5085

#5085/merge

#5086

#5087

#5089

#509

#509/merge

#5094

#5094/merge

#5097

#5097/merge

#5098

#5098/merge

#51

#51/merge

#510

#510/merge

#5100

#5102

#5103

#5103/merge

#5105

#5106

#5107

#5108

#5108/merge

#511

#511/merge

#5111

#5115

#5119

#5120

#5121

#5125

#5126

#5127

#5128

#5129

#513

#513/merge

#5132

#5133

#5133/merge

#5134

#5137

#5138

#5139

#514

#514/merge

#5141

#5142

#5144

#5144/merge

#5145

#5145/merge

#5146

#5146/merge

#5148

#5148/merge

#515

#515/merge

#5150

#5150/merge

#5151

#5152

#5154

#5155

#5156

#5157

#5157/merge

#5158

#5159

#5160

#5161

#5161/merge

#5163

#5164

#5164/merge

#5166

#5166/merge

#5167

#5167/merge

#5168

#5169

#5169/merge

#5170

#5171

#5173

#5173/merge

#5177

#5179

#518

#518/merge

#5180

#5182

#5185

#5189

#519

#519/merge

#5190

#5191

#5192

#5195

#5196

#52

#520

#520/merge

#5200

#5201

#5202

#5203

#5206

#5209

#521

#521/merge

#5210

#5211

#5212

#5213

#5214

#5217

#5219

#522

#522/merge

#5221

#5222

#5223

#5224

#5225

#5226

#5227

#5228

#5229

#5231

#5233

#5234

#5235

#5237

#524

#524/merge

#5241

#5242

#5243

#5244

#5245

#5246

#5248

#5249

#5250

#5255

#5257

#5258

#5259

#526

#526/merge

#5261

#5262

#5265

#5266

#5267

#5269

#527

#527/merge

#5272

#5275

#5276

#5277

#5278

#5279

#528

#528/merge

#5280

#5283

#5285

#5286

#5287

#5289

#5290

#5293

#5294

#5295

#5297

#5299

#530

#530/merge

#5300

#5301

#5302

#5303

#5304

#5308

#531

#531/merge

#5311

#5312

#5313

#5316

#5317

#5319

#532

#532/merge

#5320

#5323

#5325

#5327

#5328

#5329

#533

#533/merge

#5330

#5332

#5333

#5335

#5337

#5338

#5339

#5340

#5344

#5345

#5346

#5347

#5348

#5350

#5352

#5353

#5354

#5357

#5359

#5361

#5362

#5364

#5367

#5368

#5369

#5372

#5376

#5377

#5379

#538

#538/merge

#5381

#5384

#5385

#5386

#5388

#5389

#539

#539/merge

#5390

#5391

#5393

#5394

#5395

#5396

#5397

#5398

#54

#54/merge

#540

#540/merge

#5400

#5401

#5402

#5404

#5405

#541

#541/merge

#5411

#5414

#542

#542/merge

#5426

#5427

#543

#543/merge

#5432

#5433

#5434

#5435

#5436

#544

#544/merge

#5443

#5451

#5452

#5458

#546

#546/merge

#5462

#5463

#5464

#5468

#547

#547/merge

#5471

#5473

#5474

#548

#548/merge

#5480

#5482

#5483

#5484

#5488

#549

#549/merge

#5490

#5493

#5496

#5497

#55

#55/merge

#550

#550/merge

#5503

#5505

#5509

#551

#551/merge

#5512

#552

#552/merge

#5522

#5525

#5526

#553

#553/merge

#5530

#5531

#5533

#5534

#5535

#5539

#554

#554/merge

#5540

#555

#555/merge

#5550

#5553

#5559

#556

#556/merge

#5561

#5564

#5566

#5567

#5569

#557

#557/merge

#5571

#5572

#5578

#558

#558/merge

#5583

#5588

#5589

#559

#559/merge

#5591

#5595

#56

#56/merge

#560

#560/merge

#5600

#5603

#5606

#5607

#5608

#5609

#561

#561/merge

#5610

#5611

#5618

#562

#562/merge

#5622

#5623

#5629

#563

#563/merge

#5630

#5633

#5634

#5635

#5636

#5637

#564

#564/merge

#5642

#5646

#5647

#5648

#565

#565/merge

#566

#566/merge

#5660

#5668

#5669

#567

#567/merge

#5670

#5674

#5678

#568

#568/merge

#5681

#5684

#5692

#5693

#5697

#5698

#5699

#5700

#5702

#5706

#5707

#5709

#571

#571/merge

#5710

#5711

#5712

#5714

#5715

#5718

#5720

#5724

#5725

#5727

#5728

#5729

#573

#573/merge

#5733

#5734

#5737

#5738

#5740

#5744

#5745

#5749

#5750

#5751

#5752

#5756

#5757

#5758

#576

#576/merge

#5760

#5761

#5762

#5763

#5766

#577

#577/merge

#5771

#5772

#5773

#5775

#5776

#5777

#5778

#5779

#578

#578/merge

#5781

#5782

#5787

#5789

#579

#579/merge

#5791

#5792

#5793

#5795

#5797

#5798

#5799

#58

#58/merge

#580

#580/merge

#5809

#5812

#5813

#5817

#5818

#582

#582/merge

#5820

#5827

#583

#583/merge

#5831

#5833

#5836

#584

#584/merge

#5843

#5846

#5850

#5855

#5857

#586

#586/merge

#5860

#5861

#5863

#5865

#5866

#587

#587/merge

#5870

#5871

#5873

#5874

#5875

#5876

#5884

#5885

#589

#589/merge

#5890

#5891

#5893

#5896

#59

#59/merge

#590

#590/merge

#5905

#5906

#5908

#5909

#591

#591/merge

#5910

#5916

#5918

#592

#592/merge

#5922

#5924

#5925

#5926

#5927

#5932

#5933

#5937

#5948

#5950

#5953

#5955

#5957

#596

#596/merge

#5961

#5962

#5964

#5969

#597

#597/merge

#5976

#598

#598/merge

#5980

#5983

#5985

#5986

#5993

#5997

#5998

#5999

#6

#6/merge

#600

#600/merge

#6007

#6008

#6009

#601

#601/merge

#6010

#6011

#6012

#6013

#6014

#6015

#6016

#6017

#6018

#6019

#6026

#6027

#6028

#6030

#6031

#6032

#6036

#6037

#604

#604/merge

#6042

#6043

#6045

#6046

#6047

#605

#605/merge

#6050

#6055

#6059

#606

#606/merge

#6061

#6063

#607

#607/merge

#6075

#6077

#6078

#6079

#6080

#6081

#6083

#6089

#6090

#6091

#6092

#6094

#6096

#6097

#6098

#61

#61/merge

#610

#610/merge

#6101

#6102

#6103

#6106

#611

#611/merge

#6110

#6114

#6115

#6117

#6118

#6120

#6126

#6128

#6129

#613

#613/merge

#6130

#6135

#6139

#614

#614/merge

#6140

#6141

#6142

#6144

#6149

#615

#615/merge

#6150

#6152

#6154

#6157

#6158

#616

#616/merge

#6160

#6161

#6163

#6164

#6165

#6166

#6168

#6169

#6170

#6171

#6172

#6173

#6175

#6178

#618

#618/merge

#6180

#6183

#6186

#6187

#6191

#6193

#6196

#6197

#62

#62/merge

#6200

#6202

#6206

#6208

#621

#621/merge

#6212

#6213

#6214

#6216

#6217

#6218

#622

#622/merge

#6221

#6222

#6225

#6229

#623

#623/merge

#6230

#6231

#6236

#624

#624/merge

#6241

#6243

#6245

#6246

#6249

#625

#625/merge

#6250

#6254

#6256

#6258

#626

#626/merge

#6263

#6264

#6265

#6266

#6267

#6268

#6269

#627

#627/merge

#6270

#6277

#6281

#6282

#6284

#6290

#6291

#6292

#6293

#6294

#6299

#630

#630/merge

#6303

#6307

#6310

#6311

#6315

#6316

#632

#632/merge

#6320

#6324

#6327

#6328

#633

#633/merge

#6331

#6334

#6335

#6337

#6338

#6339

#634

#634/merge

#6340

#6345

#6346

#6347

#6348

#6349

#6351

#6352

#6353

#6354

#6355

#6356

#6359

#636

#636/merge

#6362

#6363

#6364

#6365

#6366

#6367

#6368

#6369

#6370

#6371

#6375

#6376

#6378

#638

#638/merge

#6383

#6389

#6390

#6395

#6396

#6399

#64

#640

#640/merge

#6400

#6401

#6402

#6403

#6404

#6406

#6407

#6408

#6411

#6412

#6413

#6414

#6416

#6417

#642

#642/merge

#6421

#6427

#6429

#643

#643/merge

#6431

#6433

#6434

#6436

#6437

#6438

#6442

#6443

#6444

#6445

#645

#645/merge

#6450

#6451

#6452

#6453

#6455

#6456

#6460

#6461

#6462

#6463

#6464

#6465

#6466

#6467

#6468

#6473

#6476

#6477

#6479

#6480

#6481

#6484

#6485

#6486

#6490

#6491

#6493

#6495

#6496

#6497

#6499

#6501

#6505

#6508

#6510

#6511

#6513

#6515

#6517

#6518

#6519

#6521

#6523

#6528

#653

#653/merge

#6530

#6532

#6534

#6536

#6537

#6539

#6540

#6542

#6543

#6545

#6549

#6554

#6559

#6561

#6562

#6567

#6570

#6571

#6573

#6574

#6575

#6579

#658

#658/merge

#6580

#6582

#6583

#6585

#6586

#659

#659/merge

#6590

#6597

#6599

#66

#66/merge

#660

#660/merge

#6600

#6601

#6602

#6604

#6605

#6606

#6609

#661

#661/merge

#6610

#6613

#6614

#6615

#6617

#6620

#6621

#6622

#6628

#663

#6630

#6631

#6632

#6633

#6637

#6638

#664

#664/merge

#6640

#6644

#6645

#6649

#665

#665/merge

#6650

#6652

#6653

#6656

#666

#666/merge

#6660

#6662

#6666

#6667

#6668

#6669

#667

#667/merge

#6670

#6673

#6674

#6675

#6676

#6679

#6680

#6681

#6682

#6684

#6686

#6687

#6690

#6693

#6697

#6698

#6699

#67

#67/merge

#670

#670/merge

#6701

#6702

#6705

#6708

#6709

#6714

#6715

#6716

#6717

#6722

#6723

#6724

#6725

#6727

#6729

#673

#673/merge

#6732

#6733

#6735

#6737

#6739

#6740

#6742

#6744

#6745

#6746

#6747

#6748

#6749

#675

#675/merge

#6750

#6751

#6752

#6754

#6757

#6758

#6759

#676

#676/merge

#6760

#6761

#6762

#6764

#6765

#6766

#6767

#677

#677/merge

#6772

#6775

#6777

#6778

#6782

#6784

#6785

#6786

#6787

#6788

#6789

#679

#679/merge

#6790

#6791

#6793

#6795

#6797

#68

#68/merge

#6802

#6803

#6804

#6805

#6808

#6809

#6810

#6811

#6812

#6813

#6815

#6817

#6818

#6819

#682

#682/merge

#6821

#6822

#6824

#6825

#6827

#6829

#6831

#6832

#6834

#6836

#6839

#684

#684/merge

#6840

#6841

#6842

#6843

#6844

#6845

#6847

#6848

#6849

#6851

#6853

#6855

#6858

#686

#686/merge

#6860

#6861

#6862

#6863

#6865

#6866

#6867

#6868

#6872

#6874

#6875

#6876

#6877

#6878

#688

#688/merge

#6881

#6882

#6883

#6884

#6885

#6886

#6887

#6888

#6889

#6890

#6892

#6893

#6895

#6896

#6897

#6899

#69

#69/merge

#690

#690/merge

#6902

#6903

#6905

#6907

#691

#691/merge

#6912

#6913

#6914

#6918

#6919

#692

#692/merge

#6920

#6922

#6926

#6927

#693

#693/merge

#6931

#6932

#6933

#6936

#6937

#6939

#6939/merge

#6943

#6944

#6945

#6948

#695

#695/merge

#6951

#6952

#6953

#6954

#6955

#6956

#6959

#6960

#6961

#6962

#6963

#6964

#6966

#6967

#6969

#697

#697/merge

#6976

#6977

#6978

#6981

#6982

#6983

#6984

#6985

#6986

#6988

#6989

#699

#699/merge

#6990

#6992

#6994

#6997

#6999

#7

#7/merge

#700

#700/merge

#7000

#7001

#7002

#7004

#7005

#7007

#7008

#7009

#7010

#7011

#702

#702/merge

#703

#703/merge

#704

#704/merge

#705

#705/merge

#706

#706/merge

#707

#707/merge

#709

#709/merge

#71

#71/merge

#7123

#7125

#7127

#715

#715/merge

#716

#716/merge

#717

#717/merge

#7172

#7173

#7174

#7175

#7176

#7177

#7179

#718

#7180

#7181

#7183

#7186

#7188

#7189

#719

#719/merge

#7190

#7191

#7192

#7193

#7194

#7195

#7196

#7198

#7199

#72

#72/merge

#7200

#7201

#7202

#7204

#7205

#7207

#7208

#7209

#721

#721/merge

#7210

#7212

#7213

#7214

#7215

#7216

#7217

#7218

#7219

#722

#722/merge

#7220

#7221

#7222

#7223

#7225

#7226

#7228

#723

#723/merge

#7230

#7231

#7232

#7233

#7234

#7235

#7236

#7239

#7240

#7241

#7242

#7243

#7245

#7246

#725

#725/merge

#7250

#7251

#7252

#7255

#7256

#7257

#726

#726/merge

#7260

#7261

#7262

#7263

#7264

#7265

#7266

#7267

#7268

#7271

#7273

#7275

#7276

#7277

#7279

#728

#728/merge

#7280

#7283

#7286

#7287

#7288

#7289

#729

#729/merge

#7291

#7294

#7296

#7298

#7299

#73

#73/merge

#730

#730/merge

#7300

#7301

#7303

#7304

#7308

#731

#731/merge

#7314

#7315

#7316

#7317

#7318

#7319

#7323

#7325

#7327

#7328

#7329

#733

#733/merge

#7330

#7331

#7332

#7333

#7336

#7337

#7338

#7339

#734

#734/merge

#7341

#7343

#7344

#7346

#7347

#7350

#7351

#7352

#7353

#7355

#7356

#7357

#7360

#7361

#7362

#7364

#7369

#7371

#7373

#7374

#7377

#7378

#7379

#738

#738/merge

#7380

#7381

#7383

#7384

#7385

#7386

#7387

#739

#739/merge

#7390

#7392

#7393

#7394

#7395

#7398

#74

#74/merge

#7400

#7401

#7403

#7404

#7408

#7410

#7412

#7414

#7415

#7417

#7418

#742

#742/merge

#7420

#7422

#7426

#7427

#7428

#743

#743/merge

#7432

#7434

#7435

#7436

#7439

#7440

#7441

#7442

#7444

#7445

#7446

#7447

#7448

#745

#745/merge

#7450

#7453

#7454

#7455

#7456

#7457

#7459

#746

#746/merge

#7461

#7462

#7463

#7464

#7465

#7467

#7471

#7472

#7475

#7478

#7479

#748

#748/merge

#7482

#7483

#7484

#7485

#7488

#749

#749/merge

#7490

#7491

#7492

#7495

#7496

#7498

#75

#75/merge

#750

#750/merge

#7501

#7502

#7503

#7505

#7509

#7511

#7512

#7513

#7514

#7515

#7517

#7520

#7521

#7522

#7524

#7525

#7527

#7528

#7529

#7532

#7534

#7535

#7536

#7537

#7538

#754

#754/merge

#7543

#7544

#7545

#7548

#7549

#7552

#7554

#7555

#7560

#7561

#7562

#7563

#7565

#7566

#7569

#757

#757/merge

#7571

#7573

#7576

#7579

#758

#758/merge

#7582

#7585

#7587

#7589

#7590

#7591

#7592

#7593

#7594

#7595

#7597

#7599

#760

#760/merge

#7602

#7603

#7605

#7606

#7607

#7608

#761

#761/merge

#7611

#7612

#7613

#7614

#7617

#7618

#762

#762/merge

#7621

#7623

#7624

#7625

#7626

#7628

#7629

#763

#763/merge

#7630

#7635

#7636

#7638

#7639

#764

#764/merge

#7641

#7642

#7643

#7645

#7646

#7648

#7649

#7650

#7651

#7653

#7654

#7655

#7657

#7659

#766

#766/merge

#7660

#7661

#7663

#7664

#7665

#7667

#7668

#767

#767/merge

#7671

#7676

#7677

#7678

#768

#768/merge

#7680

#7682

#7684

#7686

#7690

#7693

#7694

#7695

#7697

#7698

#7699

#77

#77/merge

#770

#770/merge

#7700

#7702

#7705

#7707

#771

#771/merge

#7710

#7711

#7712

#7715

#7717

#7718

#7719

#772

#772/merge

#7722

#7723

#7725

#7728

#773

#773/merge

#7733

#7739

#774

#774/merge

#7740

#7741

#7743

#7744

#7745

#7746

#7747

#7748

#775

#775/merge

#7750

#7751

#7752

#7753

#7754

#7756

#7758

#776

#776/merge

#7761

#7762

#7763

#7764

#7767

#7769

#7770

#7771

#7772

#7773

#7774

#7777

#7780

#7782

#7783

#7786

#7787

#7789

#7790

#7791

#7792

#7799

#78

#78/merge

#780

#780/merge

#7802

#7803

#7804

#7806

#7807

#7808

#7809

#781

#781/merge

#7810

#7811

#7813

#7814

#7815

#7816

#7817

#7818

#782

#782/merge

#7821

#7822

#7824

#7825

#7826

#7827

#7828

#783

#783/merge

#7830

#7832

#7834

#7835

#7836

#7837

#7838

#7839

#784

#784/merge

#7840

#7841

#7842

#7843

#7844

#7845

#7846

#7849

#7850

#7851

#7852

#7854

#7857

#7860

#7861

#7862

#7864

#7865

#7868

#7869

#787

#787/merge

#7870

#7871

#7872

#7873

#7874

#7875

#7876

#7877

#7878

#7879

#788

#788/merge

#7880

#7882

#7884

#7886

#7887

#7890

#7891

#7894

#7895

#7897

#7898

#79

#79/merge

#790

#790/merge

#7906

#7907

#7908

#7911

#7912

#7913

#7914

#7916

#7917

#7918

#7919

#792

#792/merge

#7921

#7923

#7924

#7925

#7927

#7929

#793

#793/merge

#7930

#7931

#7932

#7936

#7937

#7939

#794

#794/merge

#7941

#7942

#7943

#7944

#7945

#7946

#7947

#7949

#795

#795/merge

#7950

#7951

#7952

#7953

#7954

#7955

#7958

#7959

#796

#796/merge

#7960

#7961

#7964

#7966

#7967

#797

#797/merge

#7970

#7971

#7972

#7973

#7974

#7975

#7976

#7977

#7978

#7979

#798

#798/merge

#7980

#7981

#7983

#7985

#7987

#799

#799/merge

#7992

#7994

#7997

#8

#8/merge

#80

#80/merge

#800

#800/merge

#8000

#8001

#8003

#8004

#801

#801/merge

#8012

#8013

#8014

#8018

#802

#802/merge

#8020

#8021

#8022

#8023

#8024

#8025

#8026

#8027

#8028

#8029

#803

#803/merge

#8033

#8038

#8039

#8040

#8041

#8042

#8043

#8044

#8046

#8047

#8048

#805

#805/merge

#8050

#8052

#8055

#8057

#8058

#8059

#806

#806/merge

#8060

#8061

#8062

#8064

#8065

#8068

#807

#807/merge

#8070

#8072

#8073

#8074

#8075

#8076

#8078

#8079

#808

#808/merge

#8081

#8084

#8085

#8087

#8089

#8092

#8096

#8097

#8098

#81

#81/merge

#810

#810/merge

#8101

#8103

#8104

#8105

#8106

#8107

#8108

#8109

#811

#811/merge

#8110

#8111

#8112

#8113

#8114

#8115

#8116

#8117

#8118

#8119

#8120

#8121

#8126

#8127

#8128

#8129

#8130

#8132

#8133

#8134

#8135

#8136

#8137

#8138

#8139

#8140

#8142

#8144

#8145

#8147

#8148

#8149

#815

#815/merge

#8150

#8151

#8153

#8154

#8155

#8157

#8158

#8159

#8160

#8161

#8162

#8163

#8164

#8164/merge

#8167

#8168

#8169

#8170

#8171

#8172

#8173

#8174

#8176

#8177

#8178

#8179

#818

#818/merge

#8181

#8183

#8184

#8185

#8187

#8189

#819

#819/merge

#8190

#8191

#8193

#8194

#8196

#820

#820/merge

#8200

#8202

#8203

#8205

#8206

#8207

#8209

#821

#821/merge

#8210

#8211

#8213

#8214

#8215

#8217

#8218

#8219

#822

#822/merge

#8220

#8223

#8224

#8225

#8227

#8229

#823

#823/merge

#8231

#8233

#8234

#8235

#8236

#8237

#8238

#8239

#824

#824/merge

#8242

#8243

#8244

#8245

#8246

#8248

#8249

#825

#825/merge

#8250

#8251

#8253

#8254

#8256

#8257

#8259

#8260

#8261

#8263

#8264

#8267

#8268

#8269

#8270

#8271

#8272

#8273

#8275

#8276

#8277

#8278

#8279

#8282

#8283

#8285

#8286

#8288

#8289

#829

#829/merge

#8290

#8291

#8292

#8293

#8295

#8296

#8299

#83

#83/merge

#8300

#8303

#8304

#8309

#8310

#8311

#8313

#8314

#8315

#8316

#8317

#8318

#8322

#8323

#8325

#8328

#8329

#8330

#8331

#8333

#8334

#8335

#8336

#8337

#8338

#834

#834/merge

#8340

#8341

#8345

#8346

#8348

#8349

#835

#835/merge

#8350

#8351

#8352

#8357

#8358

#8360

#8361

#8363

#8364

#8366

#8368

#837

#837/merge

#8371

#8372

#8373

#8374

#8375

#8376

#8378

#838

#838/merge

#8380

#8381

#8382

#8383

#8384

#8385

#8386

#8387

#8388

#8389

#839

#839/merge

#8391

#8393

#8394

#8395

#8397

#8398

#840

#840/merge

#8401

#8402

#8405

#8406

#8408

#841

#8410

#8412

#8412/merge

#8415

#8417

#8419

#8420

#8421

#8422

#8423

#8424

#8425

#8428

#843

#843/merge

#8431

#8433

#8434

#8437

#844

#844/merge

#8440

#8441

#8442

#8443

#8445

#8447

#845

#845/merge

#8452

#8454

#846

#846/merge

#8460

#8463

#8464

#8466

#8468

#8469

#8470

#8471

#8472

#8473

#8475

#8476

#8477

#8478

#8479

#8480

#8481

#8482

#8483

#8484

#8486

#8488

#8489

#8490

#8492

#8493

#8494

#8495

#8496

#8497

#8499

#85

#85/merge

#8500

#8501

#8502

#8503

#8508

#851

#851/merge

#8511

#8512

#8514

#8515

#8516

#8517

#852

#8522

#8524

#8525

#8527

#8528

#8529

#8530

#8532

#8533

#8534

#8536

#8538

#8539

#854

#854/merge

#8543

#8546

#8547

#8548

#8549

#855

#8550

#8555

#8557

#8561

#8562

#8564

#8565

#8566

#8567

#8568

#857

#857/merge

#8570

#8571

#8572

#8575

#8576

#8578

#858

#858/merge

#8582

#8583

#8584

#8585

#8588

#859

#8590

#8594

#8595

#8596

#8597

#8598

#8599

#8600

#8601

#8603

#8604

#8605

#8606

#8607

#8609

#8612

#8613

#8614

#8615

#8616

#8617

#8622

#8624

#8625

#8627

#8629

#8630

#8631

#8633

#8635

#8636

#8638

#8640

#8644

#8645

#8648

#8650

#8652

#8654

#8655

#8656

#8657

#8659

#866

#866/merge

#8660

#8663

#8664

#8665

#8666

#8667

#8668

#8669

#867

#8670

#8671

#8674

#8675

#8677

#8678

#8679

#868

#8681

#8682

#8684

#8685

#8686

#8687

#8688

#8691

#8692

#8693

#8694

#8695

#8696

#8697

#8699

#870

#870/merge

#8700

#8702

#8703

#8704

#8705

#8706

#8707

#8709

#871

#871/merge

#8710

#8711

#8712

#8715

#8716

#8717

#8718

#8719

#872

#872/merge

#8721

#8722

#8723

#8724

#8725

#8726

#8727

#8728

#873

#873/merge

#8733

#8734

#8735

#8737

#8738

#8740

#8741

#8742

#8744

#8744/merge

#8745

#8746

#8747

#8749

#875

#875/merge

#8750

#8753

#8754

#8755

#8756

#8757

#8759

#8761

#8764

#8765

#8766

#8767

#877

#877/merge

#8774

#8775

#8776

#8777

#8778

#878

#878/merge

#8780

#8781

#8783

#8784

#8786

#8787

#8788

#879

#879/merge

#8790

#8791

#8792

#8793

#8794

#8797

#8798

#8799

#88

#88/merge

#8801

#8802

#8803

#8805

#8807

#881

#881/merge

#8812

#8814

#8815

#8817

#8818

#8819

#882

#8820

#8821

#8822

#8823

#8824

#8825

#8827

#8828

#8829

#883

#8830

#8831

#8832

#8834

#8835

#8836

#8837

#8838

#8839

#8840

#8842

#8844

#8845

#8846

#8847

#8848

#8849

#885

#885/merge

#8851

#8852

#8854

#8855

#8856

#8857

#8859

#886

#8860

#8863

#8864

#8865

#8867

#8868

#887

#887/merge

#8870

#8872

#8874

#8875

#8876

#8877

#8879

#8880

#8881

#8882

#8884

#8885

#8887

#8888

#889

#889/merge

#8890

#8891

#8892

#8898

#89

#89/merge

#890

#8900

#8902

#8903

#8905

#8909

#8912

#8914

#8917

#8918

#8919

#8921

#8925

#8927

#8928

#893

#8931

#8932

#8933

#8934

#8936

#8938

#8940

#8941

#8941/merge

#8943

#8944

#8945

#8946

#8947

#8948

#8951

#8952

#8954

#8955

#8956

#8957

#8958

#8959

#896

#896/merge

#8961

#8963

#8965

#8967

#8968

#8970

#8971

#8971/merge

#8972

#8973

#8974

#8975

#8977

#8978

#8979

#8980

#8981

#8982

#8983

#8984

#8986

#8987

#8988

#8989

#8990

#8990/merge

#8991

#8993

#8995

#8996

#8997

#8997/merge

#8998

#8999

#900

#900/merge

#9000

#9004

#9005

#9007

#9008

#9009

#9010

#9012

#9013

#9014

#9015

#9016

#9017

#9018

#9019

#9021

#9023

#9023/merge

#9024

#9026

#9027

#9028

#9029

#9030

#9031

#9031/merge

#9033

#9036

#9038

#9039

#9041

#9044

#9044/merge

#9046

#9047

#9047/merge

#9048

#9050

#9051

#9053

#9054

#9056

#9057

#906

#906/merge

#9060

#9061

#9062

#9065

#9066

#9068

#9069

#907

#9070

#9071

#9072

#9074

#9075

#9076

#9077

#9078

#9079

#908

#9080

#9081

#9082

#9083

#9084

#9085

#9087

#9089

#9090

#9091

#9093

#9093/merge

#9097

#91

#91/merge

#910

#910/merge

#9101

#9101/merge

#9102

#9103

#9104

#9105

#9106

#9107

#9108

#911

#911/merge

#9111

#9112

#9113

#9115

#912

#9120

#9125

#9126

#9130

#9133

#9134

#9134/merge

#9135

#9138

#9139

#9140

#9141

#9142

#9143

#9144

#9145

#9147

#9148

#9149

#915

#9150

#9153

#9155

#9156

#9157

#9159

#916

#916/merge

#9160

#9163

#9166

#9167

#9167/merge

#9168

#9170

#9173

#9174

#9175

#9177

#918

#918/merge

#9180

#9181

#9182

#9184

#9185

#9185/merge

#9187

#9188

#9189

#919

#9190

#9196

#9198

#92

#92/merge

#920

#920/merge

#9200

#9202

#9204

#9209

#921

#921/merge

#9210

#9211

#9212

#9213

#9214

#9217

#9218

#9219

#922

#922/merge

#9220

#9221

#9222

#9223

#9225

#9226

#9226/merge

#9227

#9228

#9229

#923

#923/merge

#9230

#9231

#9233

#9234

#9235

#9236

#9237

#9238

#9239

#924

#924/merge

#9240

#9242

#9243

#9244

#9245

#9246

#9247

#925

#925/merge

#9250

#9251

#9253

#9254

#9259

#926

#9260

#9262

#9262/merge

#9266

#9268

#9269

#927

#927/merge

#9270

#9271

#9273

#9274

#9275

#9276

#9277

#9278

#9279

#928

#9280

#9284

#9285

#9289

#929

#929/merge

#9290

#9292

#9293

#9293/merge

#9294

#9296

#9297

#9299

#93

#93/merge

#9301

#9302

#9303

#9304

#9305

#9308

#931

#931/merge

#9310

#9313

#9318

#9319

#932

#932/merge

#9320

#9320/merge

#9328

#933

#933/merge

#9331

#9332

#9337

#9338

#934

#934/merge

#9340

#9341

#9343

#9344

#9346

#9348

#9350

#9351

#9354

#9355

#9358

#9360

#9361

#9363

#9364

#9366

#9366/merge

#9367

#9369

#937

#937/merge

#9371

#9372

#9374

#9375

#9377

#938

#9381

#9383

#9386

#9387

#9388

#9391

#9395

#9398

#94

#94/merge

#940

#940/merge

#9401

#9402

#9403

#9404

#9406

#9407

#9409

#941

#941/merge

#9410

#9411

#9414

#9415

#9419

#942

#942/merge

#9420

#9421

#9424

#9428

#9429

#9430

#9431

#9432

#9433

#9436

#9439

#9440

#9441

#9443

#9445

#9446

#9447

#9449

#945

#945/merge

#9450

#9451

#9453

#9454

#9456

#9457

#9458

#9460

#9461

#9462

#9463

#9466

#9467

#9469

#9473

#9474

#9475

#9479

#948

#948/merge

#9480

#9481

#9482

#9483

#9484

#9485

#9486

#9487

#9489

#9491

#9494

#9496

#9497

#9499

#95

#95/merge

#950

#950/merge

#9500

#9501

#9502

#9504

#9506

#9507

#9507/merge

#951

#951/merge

#9510

#9513

#9515

#9516

#9518

#9519

#9520

#9521

#9522

#9525

#9528

#9530

#9531

#9532

#9533

#9535

#9536

#9537

#9538

#9539

#9542

#9544

#9547

#9550

#9553

#9554

#9555

#9556

#9558

#956

#956/merge

#9562

#9564

#9565

#9566

#9568

#9571

#9572

#9573

#9574

#9575

#9577

#9580

#9581

#9582

#9583

#9585

#9586

#9587

#9588

#9591

#9592

#9593

#9594

#9595

#9596

#9598

#9599

#9602

#9604

#9606

#9607

#9612

#9613

#9615

#9618

#9619

#9622

#9623

#9624

#9625

#9633

#9635

#9636

#9637

#9638

#9641

#9642

#9644

#9646

#9647

#9648

#9649

#965

#965/merge

#9650

#9651

#9652

#9654

#9655

#9656

#9657

#9658

#966

#966/merge

#9660

#9663

#9664

#9669

#967

#967/merge

#9670

#9671

#9672

#9674

#9674/merge

#9675

#9676

#9677

#9678

#9679

#968

#968/merge

#9680

#9681

#9682

#9682/merge

#9684

#9684/merge

#9688

#9689

#9690

#9691

#9691/merge

#9694

#9697

#9698

#9699

#97

#97/merge

#9700

#9701

#9702

#9703

#9704

#9705

#9706

#9707

#9708

#9709

#971

#971/merge

#9710

#9711

#9712

#9713

#9715

#9718

#9720

#9722

#9728

#9729

#9732

#9733

#9734

#9735

#9736

#9744

#9746

#9747

#9749

#9750

#9751

#9752

#9753

#9754

#9755

#9756

#9757

#9758

#9759

#976

#976/merge

#9761

#9762

#9763

#9767

#9768

#9769

#9770

#9771

#9772

#9775

#9776

#9778

#9779

#978

#9780

#9781

#9782

#9783

#9784

#9785

#9786

#9787

#9790

#9798

#9799

#98

#98/merge

#9800

#9801

#9802

#9803

#9804

#9805

#9807

#9808

#9809

#9809/merge

#9810

#9812

#9813

#9814

#982

#982/merge

#9821

#9822

#9823

#9824

#9825

#9826

#9827

#9828

#983

#9833

#9834

#9836

#9837

#9838

#9839

#984

#9840

#9841

#9845

#9848

#9849

#985

#985/merge

#986

#986/merge

#9860

#9861

#9864

#9865

#9866

#9869

#987

#987/merge

#9870

#9875

#9877

#9878

#9879

#9880

#9881

#9883

#9884

#9885

#9886

#9887

#9889

#9890

#9891

#9895

#9897

#9898

#99

#99/merge

#990

#990/merge

#9901

#9902

#9903

#9904

#9905

#9907

#9908

#9909

#9910

#9911

#9912

#9913

#9914

#9915

#9916

#9917

#9918

#9919

#992

#992/merge

#9920

#9921

#9922

#9923

#9924

#9925

#9929

#993

#993/merge

#9931

#9933

#9934

#9935

#9939

#9943

#9944

#9945

#9947

#9949

#995

#9950

#9951

#9952

#9955

#9957

#9958

#9958/merge

#9959

#9962

#997

#997/merge

#9972

#9975

#9976

#9977

#9978

#998

#9980

#9981

#9982

#9987

#9988

#9989

#9990

#9992

#9993

#9993/merge

#9994

#9994/merge

#9995

1.0.0

1.0.1

1.0.3

1.0.4

1.2.1

1.2.2

1.2.3

1.2.3@183

1.2.4

1.2.5

1.2.5@213

1.3.0

1.3.1

1.3.2

23.5

24.0

25.0

26.0

27.0

28.0

28.1

28.2

29.0

30.0

31.0

31.1

31.2

32.0

33.0

34.0

34.1

35.0

35.1

36.0

36.1

36.2

37.0

37.1

38.0

39.0

39.1

40.0

40.1

40.2

40.3

41.0

41.1

42.0

43.0

43.1

43.2

43.3

43.4

43.5

44.0

44.1

45.0

45.1

45.2

45.3

45.4

46.0

47.0

47.1

47.2

47.3

47.4

47.999

48.0

48.1

49.0

49.1

49.2

50.0

50.1

50.2

51.0

52.0

52.1

53.0

53.1

54.0

54.1

55.0

55.1

56.0

57.0

58.0

58.1

59.0

60.0

60.1

61.0

61.1

61.2

62.0

63.0

64.0

64.1

65.0

65.1

66.0

66.1

rm

v11.0.0

v2.9

v3.0

v3.1

v4.0

v4.1

v4.2

v4.3

v4.4

v4.5

v4.6

v4.7

v4.99

v5.0

v5.1

v5.2

v6.0

v6.1

v6.2

v6.3

v6.4

v6.99

v7.10

v7.2

v7.9

v7.99

v8.99

v99.99

Mono Color

• d0b24313d3 Fix MissingMapping REMAP action. Closes #4069 LexManos 2017-06-27 16:56:42 -07:00
• 7281708df6 Repopulate client SearchTreeManager when registries are refreshed. Closes #4094 LexManos 2017-06-27 16:28:08 -07:00
• b90d7a838e Fix Biome unit test LexManos 2017-06-27 16:27:29 -07:00
• a4fb33d945 Add support for loading mod advancements from the mod jar files. LexManos 2017-06-27 15:18:52 -07:00
• cab4f783e9 Fix error when using RegistryBuilder and not specifying a max id number. LexManos 2017-06-27 15:18:03 -07:00
• c565984822 Allow the recipe registry to be modified. LexManos 2017-06-27 15:17:26 -07:00
• 86b231ea77 Fix BiomeDictionary not collecting correctly. LexManos 2017-06-27 14:04:51 -07:00
• 5aac07b5b1 Remove incorrect call to .toString() when instantiating custom config array entries. (#4078) BlayTheNinth 2017-06-27 07:54:49 +02:00
• a480fa0821 Remove outdated patch to BlockDoublePlant Vincent Lee 2017-03-16 20:55:50 -05:00
• c5ffe46f48 Fix substitution tests LexManos 2017-06-26 01:01:23 -07:00
• 9a09ff68aa Remove some deprecated methods and clean up Ben Staddon 2017-06-15 19:26:14 +01:00
• 7892ca922c Remove the call to client.refreshResources during loading (#4032) mezz 2017-06-25 22:13:58 -07:00
• 0f7ec7e7fd Added dependencies and dependency ordering for textures. (#4070) Fry 2017-06-26 07:58:19 +04:00
• 3ae30478db More work on registry override ability. Closes #4079 LexManos 2017-06-25 20:45:48 -07:00
• 460abf1554 Fix ItemStack/Block/BlockSpecial not applying at runtime. LexManos 2017-06-25 20:45:07 -07:00
• 51aa029bb1 Add a FluidUtil method to interact with an arbitrary IFluidHandler (#4080) Ben Staddon 2017-06-26 02:22:52 +01:00
• 690c9bb76a Further Java 8 cleanup (#4077) ichttt 2017-06-25 23:25:57 +02:00
• 878193152a Fix ItemStackTransformer not applying at runtime. LexManos 2017-06-25 13:17:53 -07:00
• 3738a2e42b Fix missed side only on BlockFlower LexManos 2017-06-25 12:24:07 -07:00
• 45147ac512 Fix ModelBlockAnimation expsing a private class. LexManos 2017-06-25 12:23:56 -07:00
• 368d206cc6 Make Block.getSubBlocks not client side only. LexManos 2017-06-25 11:17:31 -07:00
• dc043ac79f Cleanup of model system, taking advantage of java 8; replaced guava Optional and Function with java 8 versions. RainWarrior 2017-06-25 04:08:20 +03:00
• 1c24600bbb Reload client recipe book after loading modded recipes. LexManos 2017-06-24 15:34:09 -07:00
• b542179242 Make Dummy block an Air block. LexManos 2017-06-24 15:06:28 -07:00
• 87054b01fb Fix NPE in MissingMappings event. Closes #4067 LexManos 2017-06-24 14:51:46 -07:00
• efd8b38be9 Make getSubItems non-client only. Use it for Ingredient iteration. LexManos 2017-06-24 14:47:48 -07:00
• 478a84e748 Fix Emerald generation causing chunk loading. LexManos 2017-06-24 14:47:11 -07:00
• 405a16aea1 Fix minecraft:item_nbt ingredient type. LexManos 2017-06-24 14:46:51 -07:00
• 72f037b0fa Add Block.getDrops that uses NonNullList, deprecate the old method. Fix #3567 (#3778) mezz 2017-06-24 02:45:22 -07:00
• a8734e368d Remove arrival/departure message methods from WorldProvider (#2733) mezz 2017-06-24 02:02:56 -07:00
• 27321efb1f Clean up logging mezz 2017-06-24 01:46:05 -07:00
• e747a17ec3 Enable support for modded Fishing Rods. (#4011) KingLemming 2017-06-24 04:26:58 -04:00
• c0188d3228 Use instanceof ItemFishingRod instead of item equality (#4060) KingLemming 2017-06-24 04:26:36 -04:00
• 1b5da5d4fe [1.12] Cleanup of files with old licence headers, Add missing LGPL 2.1 licence headers (#4051) Ben Staddon 2017-06-24 09:25:23 +01:00
• cb02f24cf2 Fix uncaught ClassCastException from invalid recipe file (#4043) Choonster TheMage 2017-06-24 18:24:54 +10:00
• f670ec4f0b Fix onBlockClicked handler firing twice and Item.onArmorTick in the wrong place (#4037) TechnicianLP 2017-06-24 10:01:28 +02:00
• d769d83224 Update MCP to 20170624 mezz 2017-06-24 00:56:21 -07:00
• b0dfaa2b81 Remove Java 8 warnings now that Minecraft requires it Ben Staddon 2017-06-20 23:22:14 +01:00
• 286f6a910b Fire AnimalTameEvent for parrots (#4003) Ben Staddon 2017-06-24 07:11:47 +01:00
• b71ab7e444 Make ForgeRegistry iterator sorted. Closes #4058 (#4059) tterrag 2017-06-24 00:52:27 -04:00
• dd42f84a47 Loosen up registry locks until data freeze. LexManos 2017-06-23 17:52:59 -07:00
• d032a34aaa Fix conflicts LexManos 2017-06-23 11:21:55 -07:00
• f4afb6f56c Implement override tracking and syncing. Overrides MUST be registered within a tracked event so we know what mod it came from. This will allow servers/saves to select which mod 'wins' and becomes to active entry. This should also mean that when connecting to a vanilla server things will revert. LexManos 2017-06-23 00:58:00 -07:00
• 4b45eb8b68 Disable substitution test, substitutions are not managed the way they used to be. We do not care about substitutions, People who replace entries should make them compatible with the existing item. LexManos 2017-06-22 21:38:36 -07:00
• e805b12df8 Fixup some registry tests, dummies are now persisted across syncing. LexManos 2017-06-20 23:45:32 -07:00
• dee84dc1e4 More work, game loads and runs now. Moved Registry events to directly AFTER PreInit instead of before. This allows modders to register handlers for it without @EventBusSubscriber. It also allows you to register custom things needed before the construction of blocks or items such as Fluids. TODO: Move Fluids to a real registry. @ObjectHolder can now be used on private fields. Reworked FMLModIdMappingEvent to include data for all registries. Tile Entities are now registrable. LexManos 2017-06-20 18:39:55 -07:00
• a26d89c876 First pass of registry rewrite. Tests do not run yet. Things of note: Removed the idea of substitutions, just register multiple items with the same name they will override each other like a normal map. Decoupled Forge registries from vanilla classes. They now use bouncer classes. MODDERS SHOULD NEVER USE THESE Introduced more stringent registry locking. As it sits things are only allowed to be registered during the RegistryEvent.Registry phases! This is to force modders to split up their registrations, and pave the way for calling these functions multiple times during a single MC lifecycle. ObjectHolder, Missing Mappings, etc... *should* now work for all registry types, nothing should be special cased to Blocks/Items anymore. Added optional generic dummy factory to registries, to allow registry creators the ability to dummy more then just Blocks. Re-worked the ItemStack transformer and applied it to ItemBlock and ItemBlockSpecial. Allowing us to cleanup reflective hacks in Block callbacks. Registry onAdd callback is now only fired on the ACTIVE registry, fixing any issues of temp registries overriding active objects. LexManos 2017-06-19 15:02:18 -07:00
• c98b6fa8bb Fix conflicts noci-1.12.x-regrewrite LexManos 2017-06-23 11:21:55 -07:00
• 8c28e2ae15 Implement override tracking and syncing. Overrides MUST be registered within a tracked event so we know what mod it came from. This will allow servers/saves to select which mod 'wins' and becomes to active entry. This should also mean that when connecting to a vanilla server things will revert. LexManos 2017-06-23 00:58:00 -07:00
• a03ffbc860 Disable substitution test, substitutions are not managed the way they used to be. We do not care about substitutions, People who replace entries should make them compatible with the existing item. LexManos 2017-06-22 21:38:36 -07:00
• 3437093256 Fixup some registry tests, dummies are now persisted across syncing. LexManos 2017-06-20 23:45:32 -07:00
• 35b75ce9f1 More work, game loads and runs now. Moved Registry events to directly AFTER PreInit instead of before. This allows modders to register handlers for it without @EventBusSubscriber. It also allows you to register custom things needed before the construction of blocks or items such as Fluids. TODO: Move Fluids to a real registry. @ObjectHolder can now be used on private fields. Reworked FMLModIdMappingEvent to include data for all registries. Tile Entities are now registrable. LexManos 2017-06-20 18:39:55 -07:00
• be80bc5e4c First pass of registry rewrite. Tests do not run yet. Things of note: Removed the idea of substitutions, just register multiple items with the same name they will override each other like a normal map. Decoupled Forge registries from vanilla classes. They now use bouncer classes. MODDERS SHOULD NEVER USE THESE Introduced more stringent registry locking. As it sits things are only allowed to be registered during the RegistryEvent.Registry phases! This is to force modders to split up their registrations, and pave the way for calling these functions multiple times during a single MC lifecycle. ObjectHolder, Missing Mappings, etc... *should* now work for all registry types, nothing should be special cased to Blocks/Items anymore. Added optional generic dummy factory to registries, to allow registry creators the ability to dummy more then just Blocks. Re-worked the ItemStack transformer and applied it to ItemBlock and ItemBlockSpecial. Allowing us to cleanup reflective hacks in Block callbacks. Registry onAdd callback is now only fired on the ACTIVE registry, fixing any issues of temp registries overriding active objects. LexManos 2017-06-19 15:02:18 -07:00
• 423f9fc04b Fix Universal bucket handling for Fluids with NBT (Fix #3757) mezz 2017-03-10 21:06:40 -08:00
• 0e9820c51c Clean up Logging (#3953) diesieben07 2017-06-23 07:33:11 +02:00
• 96aceffb6f Clean up Logging (#3953) diesieben07 2017-06-23 07:33:11 +02:00
• 68c6e7862e Fix ShapedOreRecipe matching. #4038 mezz 2017-06-21 22:10:40 -07:00
• f1881453be Fix recipe names in packaged jars. Closes #4039 LexManos 2017-06-21 01:46:52 -07:00
• a30316e6a1 Update NoteBlockEvent with new instruments. Resolves #4018. (#4019) Ben Staddon 2017-06-21 07:50:32 +01:00
• 98f464ad43 Fix Chunk patch (#4036) mezz 2017-06-20 20:40:37 -07:00
• e056c79ec7 IRecipeConditions forge:and and forge:false (#4017) TechnicianLP 2017-06-20 11:19:14 +02:00
• 17a714f7fd Fix patches in Chunk and Explosion (#4036) mezz 2017-06-19 22:40:57 -07:00
• c6d7c7c11f Fix itemstack comparison with null mezz 2017-06-19 00:08:29 -07:00
• a2749e4507 Fix loading recipe jsons from jar files. LexManos 2017-06-19 17:18:53 -07:00
• f7831fbe99 Fix shapeless recipes not being able to use NBT on output, and fixed issue with null groups. Vincent Lee 2017-06-19 18:49:21 -05:00
• 303578b2f2 [1.12] Fixes Exception when getting modlist for a vanilla client (#4028) Lumien 2017-06-20 01:47:34 +02:00
• 80d9beedc9 Remove unused patch to ItemRecord. Closes #2686. (#4035) Ben Staddon 2017-06-20 00:47:01 +01:00
• fcb596ea1e Log info on Travis tests mezz 2017-06-18 22:52:12 -07:00
• b39ade30c3 Disable TestNetworkHandshake to make Travis work again mezz 2017-06-18 22:51:09 -07:00
• 3e6c15168b Add timeout to TestNetworkHandshake setup mezz 2017-06-18 22:50:47 -07:00
• e3777f4559 Add missing Override annotations mezz 2017-06-17 18:24:17 -07:00
• c2845967cc Update MCP mappings to 20170617 mezz 2017-06-17 18:06:04 -07:00
• 3d322ef925 Update mcp mappings to 20170611 mezz 2017-06-10 17:59:01 -07:00
• 864b05074e Clean up ShapedOreRecipe and ShapelessOreRecipe mezz 2017-06-11 14:24:17 -07:00
• f009435fa4 Allow condition factories to be registered from JSON (#4015) Shadowfacts 2017-06-16 23:24:58 -04:00
• 4a4c38b4e0 Patch a small bug in SPacketLoginSuccess that lets us emulate the network handshake. This will be very useful as I rebuild the networking. cpw 2017-06-16 22:00:54 -04:00
• b5260a386d Filter any recipe starting with _, Such names are reserved for metadata. Actually implement conditions for recipes. LexManos 2017-06-15 19:30:05 -07:00
• 65ec1f5d54 Fix NBT ItemStack support in json loader. Closes #4002 LexManos 2017-06-15 16:07:55 -07:00
• e16f70f95e Fix OreIngredient comparing items in reverse. Closes #3999 LexManos 2017-06-15 13:13:44 -07:00
• 50e268bdf5 Make registries persist by default, fixes #3989 (#3998) Marvin Rösch 2017-06-15 22:00:46 +02:00
• 8833386ada Fix exception in ShapedOreRecipe.checkMatch for recipes that don't fill entire crafting grid (#3995) tterrag 2017-06-15 04:12:54 -04:00
• dbc0a4e0fd Fix parseShaped missing Empty slot item. Closes #3990 LexManos 2017-06-14 20:25:22 -07:00
• 5e70ee45be Fix CraftingHelper.parseShapred error. Closes #3979 LexManos 2017-06-14 15:59:59 -07:00
• 22d243e70d Fix NPE in config menu with custom keybinds. Closes #3985 LexManos 2017-06-14 10:23:49 -07:00
• a8659a1613 In-progress Registry system enhancement. Needs cpw to take a look at enabling removing/overriding in the registry stuff. But in theory it loads json recipes for mods now. LexManos 2017-06-14 10:14:56 -07:00
• 54d26cb4cc Update ASM for 5.2, and host it on Forge's maven now. LexManos 2017-06-11 11:35:22 -07:00
• cd3905502e Update VanillaRegistryTests mezz 2017-06-10 19:47:04 -07:00
• 3fee319bc0 Try a different way of doing the callback, it removes the derpitude, but at one point, I thought the way it was was necessary. Is this a race condition? Dunno, but it's a lot simpler and doesn't rely on a netty hack. cpw 2017-06-10 22:19:24 -04:00
• d90637f8b5 Fix the netty bug introduced by netty commit https://github.com/netty/netty/commit/29fdb160f33776c76f0b46aada48a9c9f3babcbf that means we don't get activated until after handlerAdded is complete. In effect, our handler can't handle anything until handlerAdded has completed. cpw 2017-06-10 20:53:17 -04:00
• f1cca475ea Initial patch update to 1.12. Some things to note: Netty is screwy so currently can't join single player. @cpw Crafting has been MAJORY reworked. The current GameRegistry functions are nooped, this is IN THE WORKS. Just need to move the recipe list to a full class registry, and then re implement the in-code recipe registration. Also, it IS advised that modders move to JSON, because ideally we'll see a S->C recipe syncing system in 1.13 which would allow servers to have custom recipes. OreDictionary currently 1/2 works, need to write a better algorithm for replacing ingredients. Please be patient Rendering: A lot of functions got a new float parameter, this is similar to partial ticks, needs more research LexManos 2017-06-06 07:04:10 +10:00
• 92bb77bc6b Fix the netty bug introduced by netty commit https://github.com/netty/netty/commit/29fdb160f33776c76f0b46aada48a9c9f3babcbf that means we don't get activated until after handlerAdded is complete. In effect, our handler can't handle anything until handlerAdded has completed. noci-1.12.x cpw 2017-06-10 20:53:17 -04:00
• d71291eb57 Initial patch update to 1.12. Some things to note: Netty is screwy so currently can't join single player. @cpw Crafting has been MAJORY reworked. The current GameRegistry functions are nooped, this is IN THE WORKS. Just need to move the recipe list to a full class registry, and then re implement the in-code recipe registration. Also, it IS advised that modders move to JSON, because ideally we'll see a S->C recipe syncing system in 1.13 which would allow servers to have custom recipes. OreDictionary currently 1/2 works, need to write a better algorithm for replacing ingredients. Please be patient Rendering: A lot of functions got a new float parameter, this is similar to partial ticks, needs more research Choonster TheMage 2017-06-06 07:04:10 +10:00
• 9274e4fe43 Fix log4j configuration 1.7.10 mezz 2017-06-07 20:43:37 -07:00
• d06e0ad71b Fix log4j configuration 1.8.9 mezz 2017-06-07 20:43:37 -07:00
• 4e1e8f52e0 Fix log4j configuration 1.9.4 mezz 2017-06-07 20:43:37 -07:00
• b06fb810ca Fix log4j configuration mezz 2017-06-07 20:43:37 -07:00
• b43300c388 Fix log4j configuration mezz 2017-06-07 20:43:37 -07:00
• faf6c22b71 Fix IItemHandler wrappers returned by EntityLivingBase (#3942) Choonster TheMage 2017-06-06 07:04:10 +10:00
• 286777b824 Fix getShareTag replacing data on the server (#3776) Closes #3682 mezz 2017-06-04 18:38:16 -07:00
• e67bde9e9e Fix crashed caused by bad mods reflectively breaking the grass drop list. Closes #3943 LexManos 2017-06-02 16:22:16 -07:00