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

#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

• a4e7db5788
  Merge pull request #313 from Snownee/fix-contraptions Snownee 2020-05-14 23:26:23 +0800
• 21bf4e8f01
  Merge pull request #314 from Snownee/fix-deployer Snownee 2020-05-14 23:25:47 +0800
• 463bf0b641 Fix super glue behavior. Fix super glue can stay between two unmovable blocks Snownee 2020-05-14 23:00:43 +0800
• 8d4e6895bc Fix bell duplicating Snownee 2020-05-14 21:42:52 +0800
• ca4877430e Fix deployers getting stuck in water or bedrock as contraption Snownee 2020-05-14 18:22:21 +0800
• 702a79684b Fix server launch tterrag 2020-05-14 01:04:52 -0400
• c3cdf346f7 Update Registrate, use onRegister function instead of CreateBlockBuilder tterrag 2020-05-14 00:53:12 -0400
• deb03d10de Ported window blocks simibubi 2020-05-14 01:23:15 +0200
• 7536e22eed Connected Textures and Registrate simibubi 2020-05-13 21:56:46 +0200
• bf57058e4e A new home for palette blocks simibubi 2020-05-13 01:11:07 +0200
• 2696fc2a51 BlockState gen progress simibubi 2020-05-12 14:06:50 +0200
• 7832e79b13 Update Registrate, remove now-unnecessary support code for block entries tterrag 2020-05-11 23:18:49 -0400
• 3eee3d2c87 Block entry wrappers simibubi 2020-05-11 22:34:02 +0200
• 20ab49e46e Better game element rendering in GUIs simibubi 2020-05-11 17:48:00 +0200
• e69af69b0a Ported new changes to 1.15 simibubi 2020-05-11 00:48:58 +0200
• 901c530f62 Merge branch 'master' into mc1.15/dev simibubi 2020-05-11 00:23:28 +0200
• 1fe647b16e Place & Crash mc1.14/v0.2.3 mc1.14/release simibubi 2020-05-09 19:17:51 +0200
• 32cce4e9b9 Bug-fixes simibubi 2020-05-09 18:32:47 +0200
• 0a869190b2 Deployer dupes simibubi 2020-05-09 14:27:09 +0200
• 0bd3a8d880 More portable blocks simibubi 2020-05-09 12:14:26 +0200
• 89ff83c529 Fixed latch ignoring right side input Areuz 2020-05-09 02:49:49 +0200
• 4cbf424f4d The Bugs win simibubi 2020-05-09 00:09:10 +0200
• 505b251132 Fix build error Snownee 2020-05-09 01:05:56 +0800
• 6d67c6e30b Fix basin renderer causing crash Snownee 2020-05-09 01:05:41 +0800
• 774f1b5f56 Fix broken rendering state Snownee 2020-05-09 01:05:01 +0800
• 4b1c187d64 Config watching simibubi 2020-05-08 12:55:52 +0200
• 995357c32e
  Merge pull request #304 from Snownee/mc1.15-fix-rendering simibubi 2020-05-08 11:56:43 +0200
• 5f406d0b74 Fix: belt connector shows twice in creative tab Snownee 2020-05-08 11:53:46 +0800
• 1b040658e4 Remove invalid recipe. It seems BoP has removed this item Snownee 2020-05-08 11:43:55 +0800
• 97aba40cb4 Fix all blockstates Snownee 2020-05-08 11:42:54 +0800
• 5ac6ded468 Fix belt keeping dropping item in debug world Snownee 2020-05-08 10:42:01 +0800
• 65853c9da0 Creative Crate Revival simibubi 2020-05-07 19:52:36 +0200
• 9c5987310e Fix crash while opening JEI splashing category (Closes #297) Snownee 2020-05-07 22:23:47 +0800
• e95e62f7ae Fix crash while rendering crafter Snownee 2020-05-07 22:22:57 +0800
• 5fb65d68f7 Fix JEI tab background is not transparent Snownee 2020-05-07 22:22:25 +0800
• 9b8c985b2b Fix blockstates json Snownee 2020-05-07 22:19:06 +0800
• 6c3c0600d3 Rebooting Advancements simibubi 2020-05-06 20:24:04 +0200
• ef541493c5 Asset tweak simibubi 2020-05-05 20:36:42 +0200
• 0f67b9afe2 Merge branch 'master' into mc1.14/dev simibubi 2020-05-05 20:26:53 +0200
• d8c00dccb4 Merge branch 'master' into mc1.14/dev simibubi 2020-05-05 20:24:22 +0200
• 90afffd644
  Merge pull request #299 from LordGrimmauld/master simibubi 2020-05-05 20:23:58 +0200
• c4513020df Schematics and Entities simibubi 2020-05-05 20:21:22 +0200
• a3b47c1b25
  Update README.md again simibubi 2020-05-05 10:39:42 +0200
• b9053f7902 the "count":<n> is now supported in recipe inputs, changed mixer recipes to use this new feature LordGrimmauld 2020-05-05 10:37:34 +0200
• 188139e5d1
  Update README.md simibubi 2020-05-05 10:14:25 +0200
• cb2a128fae fix open SplashingCategory jei crash. jihuayu 2020-05-05 12:48:57 +0800
• 0c2a33861e Registrate Progress simibubi 2020-05-04 19:57:16 +0200
• e27927de15 Sections simibubi 2020-05-02 18:07:46 +0200
• 4ce1f24404
  Merge pull request #292 from LordGrimmauld/master simibubi 2020-05-02 14:23:51 +0200
• 369c2d7d9d added apparently missing stonecutter recipe for create:polished_dark_scoria LordGrimmauld 2020-05-02 10:13:15 +0200
• 901cb00426 merged mc1.15/dev into mc1.15-registrate simibubi 2020-05-02 00:34:36 +0200
• aea5918636 Port new code to 1.15 (help) simibubi 2020-05-02 00:19:29 +0200
• 83ceb7d215 Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15/dev simibubi 2020-05-02 00:16:04 +0200
• 8bfc4445b0 Minecart Issues simibubi 2020-05-01 15:21:00 +0200
• 75638b7c8d Pocket Carts simibubi 2020-04-30 16:45:35 +0200
• 885791f878 Cart Rotation Lock simibubi 2020-04-29 23:32:17 +0200
• 45897e4c18 Mechanical Ploughs simibubi 2020-04-29 19:12:42 +0200
• 83cfc097ae Merge branch 'mc1.14-v0.2.2b' into mc1.14-v0.2.3 simibubi 2020-04-27 14:50:12 +0200
• 76f81910c4 SGS hotfix simibubi 2020-04-27 14:44:57 +0200
• d2c1122786 Create in korean simibubi 2020-04-27 14:09:47 +0200
• a97418e784 Better Schematics simibubi 2020-04-27 14:04:06 +0200
• 0a11c62661 Stub out more invalid datagen, fix creative crate model reference tterrag 2020-04-26 12:11:44 -0400
• c330d163ec Update Registrate, add proof of concept new block registration pattern tterrag 2020-04-26 00:58:38 -0400
• 65da05af86 Fixes #151: Exclude schematic from creative and JEI fuzzyweapon 2020-04-25 11:34:23 -0700
• c62d356f9b Superglue simibubi 2020-04-20 23:27:34 +0200
• 2cccbca11b Add registrate as dependency, experimental refactor of AllBlocks tterrag 2020-04-13 02:58:57 -0400
• db8e52be2e Bugs & Refactors simibubi 2020-04-16 20:46:15 +0200
• 7374866293
  Merge pull request #233 from CrispyChips6660/patch-1 simibubi 2020-04-14 14:10:02 +0200
• 38c9415f87
  Update zh_cn.json cripsy_chips1234 2020-04-13 14:52:18 +0800
• ed19a65b9f Port new code to 1.15 tterrag 2020-04-12 16:27:08 -0400
• a1605af46a Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2 tterrag 2020-04-12 15:25:52 -0400
• 91ba47ba33 Merge branch 'master' into mc1.14-v0.2.2b mc1.14/v0.2.2b simibubi 2020-04-11 01:42:23 +0200
• 4070d334bd
  Merge pull request #205 from MORIMORI0317/patch-1 simibubi 2020-04-11 00:57:34 +0200
• 4d16961636 Bug Fixes simibubi 2020-04-11 00:55:51 +0200
• 3c0b55ac1d A cure to darkness simibubi 2020-04-10 21:43:28 +0200
• 72ddc1251a Pushing the Pusher simibubi 2020-04-09 21:29:51 +0200
• e2742f6fb2 Not enough Zinc simibubi 2020-04-08 20:33:49 +0200
• d1ff9f4e30 Broken UVs simibubi 2020-04-08 20:31:06 +0200
• 810191aa89 Cast with Caution simibubi 2020-04-05 18:02:46 +0200
• a9848c48c4
  Create ja_jp.lang MORIMORI0317 2020-04-05 19:53:29 +0900
• a7c1ae3ec5 Fix crash in JEI rendering -- still far from functional tterrag 2020-04-04 22:08:57 -0400
• 1e0711fa95 1.15 port checkpoint: kinetic rendering mostly complete tterrag 2020-04-04 21:54:24 -0400
• 9ab8f843fa
  pl_pl.json luc78as 2020-04-04 15:12:25 +0200
• f806fcb975
  pl_pl.json luc78as 2020-04-03 19:30:12 +0200
• f1057bf558 changed how the wrench rotates blocks zelophed 2020-03-30 18:48:07 +0200
• f16e534a89 The rest of the compile errors, a few rendering fixes tterrag 2020-03-30 01:45:29 -0400
• c849bb188e Port remaining uses of RenderHelper and getCombinedLight tterrag 2020-03-29 15:18:14 -0400
• e1e3220b68 Add server versions of wrapped worlds tterrag 2020-03-29 14:39:51 -0400
• 9f2dcc5635 Port most remaining instances of manual lightmap modification tterrag 2020-03-29 14:21:22 -0400
• 3c07aa51de Finish porting most TERs tterrag 2020-03-29 12:20:33 -0400
• 11ae3bc820 Port all instances of Block.onBlockActivated tterrag 2020-03-29 12:05:07 -0400
• 53f0524200 Some mass renames: onBlockActivated, Entity.posXYZ, etc. tterrag 2020-03-29 11:46:00 -0400
• 3e82cf6a90 Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2 tterrag 2020-03-29 00:08:49 -0400
• e52fa26fda Yet more porting work tterrag 2020-03-29 00:07:49 -0400
• 3371267e79 Merge branch 'mc1.14-v0.2.2' simibubi 2020-03-29 04:44:35 +0200
• a4513086a1 Hotfixed Redstone Links mc1.14/v0.2.2a simibubi 2020-03-29 04:44:13 +0200
• 748f8af229 Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2 tterrag 2020-03-28 22:28:49 -0400
• 844dc42501 More porting work tterrag 2020-03-28 22:10:23 -0400
• 9a77081f3a Recipe tweaks mc1.14/v0.2.2 simibubi 2020-03-29 00:48:18 +0100
• c6867532a3 Broken Bearings & World Gen simibubi 2020-03-28 23:34:26 +0100