Commit graph

Select branches

Hide pull requests

l10n_crowdin_translations

mc1.14/dev

mc1.14/high-logistics

mc1.14/release

mc1.15/dev

mc1.15/release

mc1.16/chromatic-projector

mc1.16/dev

mc1.16/flw-next

mc1.16/lastertag

mc1.16/mixed

mc1.16/toolbox

mc1.17/dev

mc1.18/0.5.1

mc1.18/catnip

mc1.18/computercraft

mc1.18/dev

mc1.18/global-railways

mc1.18/railways-api

mc1.18/solver

mc1.19.3/dev

mc1.19/0.5.1

mc1.19/catnip

mc1.19/dev

mc1.19/funnel-actor-fix

mc1.19/stabilized-contraption-fix

mc1.20.1/0.5.1

mc1.20.1/catnip

mc1.20.1/dev

mc1.20.1/flywheel-upgrade

mc1.20.1/train_map_integration

#1002

#101

#1027

#1039

#1040

#1041

#1045

#1062

#1072

#1075

#1083

#1084

#1115

#1117

#1118

#1120

#1129

#1130

#1133

#1138

#1147

#1149

#1151

#1186

#1216

#122

#1248

#1311

#1322

#1340

#1348

#1355

#1367

#137

#1428

#1429

#1456

#1460

#1472

#1477

#1479

#1482

#149

#1520

#1525

#1544

#1546

#1556

#1561

#1565

#1566

#1568

#1577

#1582

#1586

#1597

#1599

#16

#1606

#1613

#1615

#1620

#1626

#1632

#1645

#1650

#1651

#1657

#1659

#1662

#1676

#1679

#1680

#1684

#1695

#1701

#1719

#1726

#1738

#1742

#1752

#1768

#1781

#18

#1818

#1829

#1836

#1870

#1873

#1876

#1883

#1889

#1894

#1895

#1896

#1897

#1900

#1901

#1908

#1912

#1917

#1920

#1938

#1942

#1943

#1944

#1945

#195

#1952

#1957

#1958

#1960

#1960

#1966

#1969

#1974

#1981

#1988

#1993

#1996

#2004

#2006

#2017

#2022

#2026

#2035

#2037

#2042

#205

#2071

#2072

#2080

#2087

#2089

#2100

#2119

#2121

#2123

#2128

#2141

#2146

#2178

#2190

#2203

#2209

#2220

#2228

#2230

#2245

#2252

#2275

#2280

#2283

#2284

#2288

#2303

#2307

#2313

#2318

#233

#2339

#2340

#2358

#2359

#2365

#2367

#2369

#2375

#2384

#2420

#2423

#2450

#2462

#2485

#2486

#2487

#2488

#2499

#2501

#2503

#2523

#2525

#2529

#2536

#2540

#2587

#2593

#2597

#2598

#2599

#2608

#261

#2615

#2651

#2662

#2670

#268

#2685

#2717

#2745

#2755

#2770

#2780

#2787

#2788

#279

#2805

#2808

#2818

#2828

#2829

#2830

#2837

#2846

#2847

#2874

#2879

#2894

#2907

#292

#2930

#2938

#2958

#2961

#2973

#2976

#298

#2989

#299

#2992

#2999

#3006

#3012

#3031

#3034

#3038

#3039

#304

#3042

#3049

#3053

#3056

#306

#3069

#3087

#3105

#3111

#3115

#3116

#3119

#3122

#3126

#313

#3136

#3138

#3138

#314

#3152

#3170

#3181

#3187

#3196

#3203

#321

#3221

#323

#3232

#3238

#3238

#3242

#3243

#3244

#3275

#3281

#3290

#3297

#3298

#330

#331

#3313

#3319

#3329

#335

#3368

#3369

#3433

#3437

#3477

#3504

#3516

#354

#3543

#3543

#3555

#3556

#3557

#3558

#3558

#3561

#3570

#3572

#3573

#3574

#3578

#3579

#3580

#359

#3620

#3621

#3625

#3627

#3648

#3655

#3656

#3661

#3694

#3694

#3702

#3702

#3727

#3739

#3743

#3758

#3763

#377

#3775

#3776

#3777

#3781

#3783

#3791

#3793

#3794

#3811

#3814

#3817

#3822

#3828

#3829

#3841

#3845

#3848

#3860

#3864

#3866

#3870

#3880

#3882

#3887

#3906

#3937

#395

#3958

#3980

#3987

#3988

#399

#3990

#3995

#3998

#4005

#4017

#4018

#4027

#4033

#4035

#4036

#4051

#4065

#4103

#4106

#4108

#4110

#4117

#4118

#4148

#4161

#4188

#4213

#4216

#4238

#424

#4241

#4253

#43

#430

#4307

#431

#4312

#4334

#4336

#4337

#4340

#436

#4361

#4381

#4390

#4395

#4419

#4435

#4436

#444

#4443

#4458

#4478

#448

#4489

#4496

#4511

#4512

#4519

#4531

#4534

#4539

#456

#4577

#4579

#459

#4591

#4597

#460

#4603

#4604

#4630

#4650

#4671

#4678

#4692

#4693

#471

#4718

#4721

#4748

#4750

#4757

#477

#4770

#4774

#4775

#4777

#4789

#48

#4822

#4827

#483

#484

#4859

#4861

#487

#4875

#4898

#49

#490

#491

#4926

#494

#496

#4971

#4974

#4975

#4980

#499

#4998

#5003

#5022

#5028

#503

#5035

#5057

#5058

#5059

#506

#507

#5080

#509

#5091

#5095

#5099

#510

#5107

#511

#5124

#513

#5147

#5148

#5155

#516

#5163

#5192

#520

#522

#523

#5247

#5248

#525

#5254

#5266

#5268

#5270

#528

#529

#5296

#5298

#530

#531

#5314

#532

#5327

#533

#534

#5352

#5353

#536

#5362

#5414

#5512

#5519

#5523

#5531

#5538

#5550

#5552

#5558

#5606

#5632

#5646

#5654

#5656

#5666

#5669

#567

#5681

#5707

#5749

#5750

#5772

#5777

#5778

#580

#5821

#5826

#5829

#5830

#5836

#5844

#5859

#5866

#5870

#5871

#5900

#5916

#593

#5940

#5941

#5953

#5961

#5965

#5969

#597

#5971

#5973

#5999

#6019

#6036

#6037

#6048

#606

#6062

#6065

#6072

#6077

#6088

#6089

#6091

#6092

#6110

#6119

#6139

#6145

#6158

#6171

#6172

#6175

#6187

#6194

#6221

#6224

#6227

#6229

#623

#6231

#6234

#626

#6262

#6263

#6267

#6268

#6269

#6271

#6272

#6273

#6274

#6281

#6283

#6285

#6286

#6288

#6297

#6304

#6317

#6325

#6343

#6348

#6352

#6356

#6378

#6385

#6386

#6389

#639

#6390

#6403

#6406

#6413

#6415

#642

#6424

#6425

#6427

#6442

#6443

#6445

#6446

#6457

#6458

#6459

#6460

#6461

#6464

#6467

#6468

#6469

#647

#6474

#6477

#648

#6482

#6488

#649

#6492

#6494

#6506

#6507

#6520

#6542

#655

#6579

#6592

#6595

#6602

#6607

#6659

#6662

#6664

#6673

#6674

#6677

#6686

#6696

#6697

#6704

#6708

#6713

#6732

#6739

#6740

#6759

#6769

#677

#6770

#6779

#6783

#6789

#6792

#6793

#6796

#6801

#6803

#6809

#6812

#6813

#6820

#6822

#6830

#6830

#6836

#6842

#6849

#6849

#6850

#6873

#6879

#6884

#6885

#6885

#6889

#6891

#6898

#6911

#6914

#6917

#6924

#6928

#6929

#6934

#6943

#6952

#6953

#6967

#6967

#6969

#6969

#6971

#6978

#7001

#7013

#7013

#7025

#7030

#7031

#7037

#7038

#7039

#7040

#7041

#7043

#7043

#7046

#7046

#7053

#7054

#7055

#7055

#7056

#7057

#7058

#7059

#7076

#7076

#7078

#7083

#7084

#7084

#7086

#7098

#71

#7101

#7110

#7112

#7119

#7119

#7124

#7124

#7125

#7125

#7126

#7127

#7149

#715

#7150

#7158

#7161

#7168

#7168

#7186

#72

#7215

#7216

#7220

#7220

#7221

#7221

#7229

#7231

#7231

#724

#7244

#7259

#7263

#7265

#7274

#7276

#7276

#7277

#7284

#7288

#7312

#7320

#7320

#7321

#7321

#7339

#7339

#74

#743

#749

#75

#757

#758

#780

#781

#819

#821

#827

#846

#849

#873

#879

#896

#90

#900

#906

#917

#93

#932

#95

#962

#965

#967

#97

#985

mc1.14/v0.0.1

mc1.14/v0.0.2

mc1.14/v0.0.3

mc1.14/v0.0.4

mc1.14/v0.0.5

mc1.14/v0.1

mc1.14/v0.1.1

mc1.14/v0.1.1a

mc1.14/v0.2

mc1.14/v0.2.1

mc1.14/v0.2.2

mc1.14/v0.2.2a

mc1.14/v0.2.2b

mc1.14/v0.2.3

Mono Color

• c739fdbb09 Resolved merge conflicts - Does not Build Bob Dole 2020-10-30 03:06:15 -0400
• 1942d1dd63 Silence! simibubi 2020-10-30 02:17:58 +0100
• 5abfc15e9e Destroyer of Lakes simibubi 2020-10-30 02:16:08 +0100
• c63d0980ed Update assets for Cinderflour and Blaze Cake Lucas Barcellos 2020-10-28 22:21:03 -0300
• 521ce8a766 port recent changes grimmauld 2020-10-23 19:01:25 +0200
• ef3504d3c4
  Revert "[Ko_kr Translation] Catching up with dev version" qkrehf2 2020-10-23 15:57:55 +0900
• b2cd378b52 Back in the early game simibubi 2020-10-22 01:48:24 +0200
• b14664d45f Windmill is Bearing is Clockwork simibubi 2020-10-22 00:50:17 +0200
• 89bad1c192 Add Attribute Filter Lang back in grimmauld 2020-10-21 19:18:29 +0200
• 7f643b9fe3 Merge branch 'mc1.15/dev' into mc1.16/dev grimmauld 2020-10-21 01:03:58 +0200
• 420501af89 Fix Server crash on chromatic compound conversion grimmauld 2020-10-21 01:03:27 +0200
• c47e83f87b Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-20 21:25:17 +0200
• 0b3f0fd198 More Tweaks simibubi 2020-10-20 21:21:33 +0200
• 12e5b95157 Yet more TextComponent nonsense simibubi 2020-10-20 21:03:43 +0200
• 41148a5e39 Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-20 21:02:50 +0200
• 275d8cf7b6 Fixed datapack reload listeners simibubi 2020-10-20 19:37:30 +0200
• e1c3853264
  Merge pull request #491 from wchen1990/mc1.16/dev simibubi 2020-10-20 17:40:04 +0200
• a8031b7569 Missed Tags simibubi 2020-10-20 17:34:39 +0200
• fdd1e22c3e RAM-powered Minecarts simibubi 2020-10-20 14:56:07 +0200
• df252b3e30 Catching up simibubi 2020-10-20 13:42:16 +0200
• 7ca8325b5f
  Merge pull request #484 from gamrguy/extra-attributes simibubi 2020-10-20 12:58:35 +0200
• 47f5225129
  Merge pull request #490 from wchen1990/mc1.15/dev simibubi 2020-10-20 12:53:30 +0200
• 7dcd1deb09
  Merge pull request #477 from qkrehf2/translation1 simibubi 2020-10-20 12:49:06 +0200
• eea9811053
  Merge pull request #460 from gamrguy/improved-saws simibubi 2020-10-20 12:47:37 +0200
• 2cc5754b1b
  Merge pull request #424 from KhottyManatee55/patch-1 simibubi 2020-10-20 12:45:21 +0200
• ac8879a008
  Merge pull request #448 from YukkuriC/fix-link-update simibubi 2020-10-20 12:43:39 +0200
• 7690834343 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev Bob Dole 2020-10-19 23:39:23 -0400
• b30d3369cd Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev Bob Dole 2020-10-19 23:22:24 -0400
• e54cdf1c96 Lang file Tweaks Kryppers 2020-10-20 00:10:19 +0100
• 9729c137f1 Fix Bell contraptions and Schematic usage Bob Dole 2020-10-19 18:40:59 -0400
• 42f97477cf Up-tip the tools. Kryppers 2020-10-19 23:16:33 +0100
• 68840362af Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2020-10-19 22:07:07 +0200
• b7bed44a61 Basic Brewing simibubi 2020-10-19 22:07:05 +0200
• cfda2c624d
  Merge pull request #487 from wchen1990/mc1.16/dev simibubi 2020-10-18 14:53:13 +0200
• 21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev - Resolved merge conflicts Bob Dole 2020-10-18 00:22:25 -0400
• a81a4110d4 Tools: the Tippening. Kryppers 2020-10-18 00:10:10 +0100
• 2cba50c9ab Tool-Tip of the Iceberg Kryppers 2020-10-17 20:57:14 +0100
• dd95096bfa Smart Fluid Pipes simibubi 2020-10-17 18:20:05 +0200
• bbe7ef820d Merge branch 'mc1.15/dev' into mc1.16/dev Zelophed 2020-10-17 17:33:54 +0200
• 7ef31b9053 Spooky Filters Zelophed 2020-10-17 17:32:37 +0200
• 083a9c1140 Refactor FluidContentsAttribute Colman Davenport 2020-10-17 11:24:15 -0400
• 42ef3796a2 Refactor EnchantAttribute Colman Davenport 2020-10-17 11:23:38 -0400
• 6d51a6c730 Astral Sorcery Attributes Colman Davenport 2020-10-17 01:25:29 -0400
• 822ca6dad6 Lang Colman Davenport 2020-10-17 01:17:25 -0400
• 562abdea31 Written Book Attributes Colman Davenport 2020-10-17 01:16:32 -0400
• c1bb1e64c9 Custom Name Attributes Colman Davenport 2020-10-17 00:58:49 -0400
• 6ff57ca65c Fluid Container Attributes Colman Davenport 2020-10-17 00:26:16 -0400
• a7e2d842af Specific Enchantment Attribute Colman Davenport 2020-10-17 00:04:23 -0400
• 49ed619a79 ForgeCraft Playtesting, Part III-b Zelophed 2020-10-17 04:29:00 +0200
• f499122ae5 Merge branch 'mc1.15/dev' into mc1.16/dev Zelophed 2020-10-17 04:21:50 +0200
• d585fc0e21 ForgeCraft Playtesting, Part III-a Zelophed 2020-10-17 04:15:51 +0200
• b5930df58a merge changes from 1.15 Zelophed 2020-10-16 19:19:55 +0200
• b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev Zelophed 2020-10-16 19:11:29 +0200
• a2e4cfb66d fixup! Split mixing and mechanical crafting categories Zelophed 2020-10-16 18:58:35 +0200
• 022bcdd620 Split mixing and mechanical crafting categories Zelophed 2020-10-16 18:57:21 +0200
• 34bfa2f479 Remove TiC run reference grimmauld 2020-10-16 17:00:43 +0200
• c44d80ac82 TiC casting table(basin compat grimmauld 2020-10-16 15:32:58 +0200
• a440ab6772 Make tree fertilizer work on slime saplings grimmauld 2020-10-16 12:18:14 +0200
• 893294b9e4 make the saw work grimmauld 2020-10-16 11:37:28 +0200
• c9e2f8b05e Deforester works on slime saplings grimmauld 2020-10-16 11:14:47 +0200
• db2b8dd197 ForgeCraft Playtesting, Part II simibubi 2020-10-14 21:15:19 +0200
• 69cbfff8ed Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-14 21:06:46 +0200
• dcd0598e16 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2020-10-14 20:52:40 +0200
• 62434fd564 That's hot simibubi 2020-10-14 20:52:38 +0200
• 277e4ea9d1 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev grimmauld 2020-10-14 16:37:27 +0200
• 6200329e43 Fix botania petal milling grimmauld 2020-10-14 16:36:53 +0200
• 31baac3c8c Not Enough Bugs - fixed last blaze burner of a stack disappearing when clicking a blaze entity - remove dead code from the valve handle class grimmauld 2020-10-14 16:13:09 +0200
• 40c4059b75 Tooltips? more like Cool-tips! Kryppers 2020-10-13 23:59:02 +0100
• f2acea7f77 Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-13 20:57:30 +0200
• d973e9bcdd JEI fixes simibubi 2020-10-13 20:39:44 +0200
• 9b5707cba6 ForgeCraft Playtesting, Part I simibubi 2020-10-13 19:56:12 +0200
• 677363f1b8 Update rendering Colman Davenport 2020-10-13 00:10:23 -0400
• b89710237d Saws check actual verticality in contraptions Colman Davenport 2020-09-12 18:44:53 -0400
• 5342beacaf Conditional moving saw operation Colman Davenport 2020-09-12 15:47:27 -0400
• a28b6bbdc3 Overhaul mechanical saw rendering Colman Davenport 2020-09-11 23:50:34 -0400
• 442d89e09e Port Changes to 1.16, Fix server launch simibubi 2020-10-12 22:16:06 +0200
• cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-12 22:15:32 +0200
• 5966040d12 Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-12 21:59:30 +0200
• afa94c3e77 Blazier updates simibubi 2020-10-12 21:55:09 +0200
• be8924a154 Port changes to 1.16 simibubi 2020-10-12 16:25:57 +0200
• df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-12 16:25:46 +0200
• 56f5ca45e3
  Merge pull request #456 from gamrguy/kelp-harvester simibubi 2020-10-12 16:09:40 +0200
• dbf4e50bb4
  Merge pull request #483 from woow101/mc1.15/dev simibubi 2020-10-12 16:05:17 +0200
• 9852d84fb8 More logistical errands simibubi 2020-10-12 16:03:26 +0200
• cbd59871cc
  Update advancements.json woow101 2020-10-12 03:12:19 -0500
• 895131ad72
  Update advancements.json woow101 2020-10-12 02:28:28 -0500
• 0f2ecfd45e merge nixie tubes to 1.16 grimmauld 2020-10-11 19:14:37 +0200
• 1b84bbf16f Custom Nixies simibubi 2020-10-11 17:50:48 +0200
• 83918a6aaf Fix build issues by not relying on modmaven, update JEI dependency to use dedicated 1.16.3 files grimmauld 2020-10-11 15:43:04 +0200
• 131669c9ff Temporarily fix fluid tag serialization grimmauld 2020-10-11 12:38:50 +0200
• 3e3b0dad6e port changes to 1.16 grimmauld 2020-10-10 22:40:59 +0200
• 1a4814e724 merge mc1.15/dev into mc1.16/dev grimmauld 2020-10-10 21:46:40 +0200
• 22ed233969 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2020-10-10 21:15:48 +0200
• f3deb8ba85 Tilted Trains simibubi 2020-10-10 21:12:28 +0200
• 88b8e7744f Merge branch 'mc1.15/dev' into mc1.16/dev grimmauld 2020-10-10 19:45:52 +0200
• 474d21de9a clean up some unused imports grimmauld 2020-10-10 18:23:56 +0200
• 850297f777 Switch valve handles back to crank shapes as those fit better to the new model grimmauld 2020-10-10 18:16:28 +0200
• cb135df649 Configurable hunger games grimmauld 2020-10-10 18:13:40 +0200
• 9bff016ba4 Depot comparing grimmauld 2020-10-10 17:54:17 +0200
• 299663295c fixes now for 1.16.3 grimmauld 2020-10-10 10:26:54 +0200