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

#7345

#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

• 5fe27cf1ab Fix #142 PepperCode1 2022-02-23 22:21:39 -0800
• 276e3b39be Remove unnecessary mixins and code PepperCode1 2022-02-23 19:37:08 -0800
• ec0cf3ca58 The ternary fix PepperCode1 2022-02-23 15:26:13 -0800
• 0152b3c173 update fr_fr Ponder Content Hollish 2022-02-23 23:12:06 +0100
• f41386feb2 Re-fix extra entity spawn data networking PepperCode1 2022-02-23 00:13:50 -0800
• cf308cdc7f Steamy simibubi 2022-02-22 19:41:30 +0100
• dd2998f982 update zh_cn.json: horizontal_framed_glass 璀境石 2022-02-22 21:58:31 +0800
• b87f52cb0a update zh_cn.json: haunt* searies 璀境石 2022-01-27 20:00:27 +0800
• df8774c2c6 update zh_cn.json from generated 璀境石 2022-01-27 19:53:06 +0800
• 6788389cb2 probably fix issues with entity packets TropheusJ 2022-02-21 20:11:24 -0500
• b78cb47454
  Update ko_kr.json qkrehf2 2022-02-22 09:56:22 +0900
• 411ca743cd
  Update ko_kr.json qkrehf2 2022-02-22 09:48:49 +0900
• 032a3a3494
  Update ko_kr.json qkrehf2 2022-02-22 09:47:48 +0900
• 77024d3a45
  Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev qkrehf2 2022-02-22 09:46:07 +0900
• 9a7874167d else TropheusJ 2022-02-21 19:35:53 -0500
• 91f937ff35 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.18/fabric/dev PepperCode1 2022-02-21 16:19:01 -0800
• 546989afbc rework ExtraSpawnDataEntity to be more compatible TropheusJ 2022-02-21 18:30:03 -0500
• fcb5267ae0 Merge branch 'mc1.18/dev' into mc1.18/global-railways PepperCode1 2022-02-21 10:51:42 -0800
• 0cf0d3930e Shuffling the shade PepperCode1 2022-02-19 21:42:40 -0800
• 8401f68450 fix #155 TropheusJ 2022-02-19 18:58:57 -0500
• 85ebe10364 move ACTIVATE_TOOL back to left control TropheusJ 2022-02-19 16:13:06 -0500
• ee5536a619 fix #154 TropheusJ 2022-02-19 13:26:47 -0500
• 2a14ddf42e probably fix #146, close #144 TropheusJ 2022-02-17 16:53:20 -0500
• 59a5f3074f Mixin and AW cleanup PepperCode1 2022-02-15 18:42:07 -0800
• 34bc21658a "|" means go simibubi 2022-02-16 03:14:31 +0100
• 984cde4d43 Move diffuse declaration to vertex compiler Jozufozu 2022-02-14 20:45:14 -0800
• e847ffd3ed de-hardcode CreateDisplay display id AlphaMode 2022-02-15 19:49:47 -0600
• d2ef77a242 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev AlphaMode 2022-02-15 18:44:56 -0600
• bd1f36f278 tweak PressingCategory a bit to fit better in REI upstream from froge AlphaMode 2022-02-15 18:44:31 -0600
• 51197d2034
  Fix mechanical mixer not working for all non shaped recipes. Fixes #1424 Jared 2022-02-15 05:17:31 +0200
• 379c243133
  Fixed non ShapedRecipe / ShapelessRecipe recipes not being shown in JEI. Jared 2022-02-15 05:01:31 +0200
• 6d6d9e9c2f Update ko_kr.json PixVoxel 2022-02-15 10:58:28 +0900
• e630b37a29 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev TropheusJ 2022-02-14 16:39:00 -0500
• fc44efdca7 possible solution for #141 TropheusJ 2022-02-14 16:38:46 -0500
• 75fac11285 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.18/fabric/dev AlphaMode 2022-02-13 17:36:35 -0600
• ed4a371fa0 Shootable glow berries PepperCode1 2022-02-13 14:41:09 -0800
• 160e823282 JEI and glowing fixes PepperCode1 2022-02-13 14:04:52 -0800
• 3ba4155b1f
  Merge branch 'Creators-of-Create:mc1.16/dev' into mc1.16/dev Hollish 2022-02-13 13:19:04 +0100
• 16efd6cc10 close #63 wip flywheel config support AlphaMode 2022-02-13 01:48:04 -0600
• 834bd0b201 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.18/fabric/dev PepperCode1 2022-02-12 22:09:44 -0800
• 03426fba7d Clean up events AlphaMode 2022-02-12 23:34:55 -0600
• 3aa0644426 Diffuse fixes II PepperCode1 2022-02-12 21:15:41 -0800
• b16391f199
  Update ja_jp.json CKenJa 2022-02-13 11:57:32 +0900
• 32867ee245 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev AlphaMode 2022-02-12 18:36:43 -0600
• c63253380d Update Forge tags to 2.0 and switch tags to common tags to forge's convention AlphaMode 2022-02-12 18:36:36 -0600
• 219cf455c3 Revert "Revert "Add condition support for mechanical crafting recipes"" FortressNebula 2022-02-12 12:31:19 +0000
• 0220b32faf Revert "Add condition support for mechanical crafting recipes" FortressNebula 2022-02-12 12:28:26 +0000
• c23cbbb4be Add condition support for mechanical crafting recipes FortressNebula 2022-02-12 12:27:30 +0000
• 178864b30c kill 1.14 - 1.17 labels TropheusJ 2022-02-11 23:56:17 -0500
• 22af1604b4
  Merge pull request #2770 from AeiouEnigma/patch-1 PepperCode1 2022-02-11 09:42:20 -0800
• aa82d2d617 fix #137 TropheusJ 2022-02-10 21:12:16 -0500
• 033e7e1a0d Proper Propa simibubi 2022-02-11 00:20:58 +0100
• 0d5695236e
  Update bug_report.yml Aeiou 2022-02-09 16:53:06 -0500
• 2ca099ce6b Rise of the Jank II simibubi 2022-02-09 21:13:33 +0100
• 99e94f7c6e Update Flywheel + diffuse fixes PepperCode1 2022-02-08 20:58:13 -0800
• b26376dba9 cursed++; fix #134 TropheusJ 2022-02-08 22:11:32 -0500
• 2b750c943a Down the steel-reinforced rabbit hole simibubi 2022-02-09 02:05:48 +0100
• 26d6a7b3e4 Stacks of Cache simibubi 2022-02-08 18:18:16 +0100
• 051e7ffc1f Mipped Sleepers simibubi 2022-02-08 04:34:22 +0100
• cbb733ed84 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev TropheusJ 2022-02-07 22:07:54 -0500
• 5e49106c28 fix #133 TropheusJ 2022-02-07 22:07:42 -0500
• 385967f761 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev AlphaMode 2022-02-07 20:54:32 -0600
• ef6de02dda cache CreateDisplay input and outputs make shedman happy AlphaMode 2022-02-07 20:54:19 -0600
• 380104a850 Girdert of here! simibubi 2022-02-08 01:49:35 +0100
• f7f63952d9 Fix and optimize model hacks II PepperCode1 2022-02-07 15:33:12 -0800
• 5bdfff85c1 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev AlphaMode 2022-02-07 14:46:46 -0600
• 66529e3c7e hide virtual fluids from rei AlphaMode 2022-02-07 14:46:39 -0600
• 52f88ab0e6 Switch from WorldRenderEvents.END to AFTER_TRANSLUCENT PepperCode1 2022-02-06 22:47:21 -0800
• 0cd56e67f2 Giga Shiny simibubi 2022-02-07 04:52:50 +0100
• 42073bab66 Use helper when registering renderer layers PepperCode1 2022-02-06 18:51:37 -0800
• 26f6d97c0c fix missing icons, kill all data errors TropheusJ 2022-02-06 21:18:46 -0500
• 5e463b724f fix TagDependentIngredientItem items showing up when they are not suppose to AlphaMode 2022-02-06 19:56:01 -0600
• ff5fa55ecf Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev AlphaMode 2022-02-06 19:44:17 -0600
• 18a56f86bf fix some tags and conditions AlphaMode 2022-02-06 19:44:11 -0600
• e3636a65e1 Fix and optimize model hacks PepperCode1 2022-02-06 16:59:57 -0800
• f64c355816 Back & Forth simibubi 2022-02-07 01:54:20 +0100
• 124a55da81 fix dev constantly crashing TropheusJ 2022-02-06 18:22:20 -0500
• 9984db4a61 bunch of fixes - bump flywheel (fix #130) - tag filtering logic - blueprint recipe transfer - dragging from REI (closes #129) TropheusJ 2022-02-06 17:56:10 -0500
• fccc796c5f merge cleanup TropheusJ 2022-02-06 15:36:34 -0500
• 56a9c5eb15 Merge remote-tracking branch 'create/mc1.18/dev' into mc1.18/fabric/dev TropheusJ 2022-02-06 15:32:46 -0500
• 3c71e8041b Remove unnecessary code PepperCode1 2022-02-06 12:22:43 -0800
• 173b2b58a6
  Update fr_fr.json Odin Beuchat 2022-02-06 16:56:38 +0100
• 962975a09d Beziterating Jozufozu 2022-02-05 20:05:05 -0800
• 898d0c6bbe Use actions run number as build number PepperCode1 2022-02-05 21:02:43 -0800
• 3339bab4b4 close #105 TropheusJ 2022-02-05 23:39:30 -0500
• 87bdd8d586 Merge branch 'mc1.18/dev' into mc1.18/global-railways Jozufozu 2022-02-05 20:05:29 -0800
• 18a84006ca Instanced Bonus simibubi 2022-02-06 04:27:05 +0100
• a6e86520f5 Rise of the Jank simibubi 2022-02-06 04:17:18 +0100
• b80d7fd580 Merge remote-tracking branch 'origin/mc1.18/fabric/dev' into mc1.18/fabric/dev TropheusJ 2022-02-05 19:46:20 -0500
• 4467429926 impl differences 🦀 TropheusJ 2022-02-05 19:45:57 -0500
• 0dc31c4617 Uncomment ContraptionInstanceManager::updateInstance Aeiou 2022-02-05 16:39:57 -0500
• cd07e6a5cd Merge remote-tracking branch 'create/mc1.18/dev' into mc1.18/fabric/dev Aeiou 2022-02-05 16:24:02 -0500
• 9c42988135 Portable clipping interface Jozufozu 2022-02-05 12:43:28 -0800
• 66b6304fd3 Smoothly lit tracks PepperCode1 2022-02-04 18:41:30 -0800
• 0a931a77ef Manual Steering simibubi 2022-02-05 02:06:31 +0100
• 478d891a04 Cut and Paste simibubi 2022-02-04 05:15:53 +0100
• f86149b66a Change the way CopperBlockSet generates block models FortressNebula 2022-02-03 20:18:27 +0000
• 00555ff572 Bump Flywheel version dependency PepperCode1 2022-02-02 21:45:47 -0800
• d71b10cf72 Update to Flywheel 0.6.1 PepperCode1 2022-02-02 21:43:23 -0800
• a06162877d merge cleanup, has some issues - RAW_ZINC item entry can't use forgeItemTag currently - CrushingRecipeGen moddedRawOre doesn't have conditions added - a lot of recipes are using forge namespaced tags TropheusJ 2022-02-03 00:11:10 -0500