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

• e3915792b1 Back to Directional simibubi 2021-02-21 22:29:46 +0100
• 9d4e52092e Basic item simulation simibubi 2021-02-21 19:29:23 +0100
• 46daa3f699 composting, but fancy zelophed 2021-02-21 18:12:19 +0100
• c4e1f680c9 Such convenience simibubi 2021-02-21 03:18:04 +0100
• b5f9cbc4b3 improve compatibility layer. JozsefA 2021-02-20 15:22:07 -0800
• 41cb2ad937 Stop explody crusher drops _0Steven 2021-02-20 18:50:40 +0100
• 77d5c00949 merge cleanup grimmauld 2021-02-20 18:00:16 +0100
• f6b9d71169 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev grimmauld 2021-02-20 17:58:25 +0100
• 6542f2f087 Some cleanup grimmauld 2021-02-20 17:58:16 +0100
• 31e3c5b0bd Port recent changes grimmauld 2021-02-20 17:27:51 +0100
• a32cbe15a3 Consistently Crushing Entities _0Steven 2021-02-20 15:08:58 +0100
• e84c6d3abe tweak max origin distance to avoid z-fighting at relatively high coordinates. remove unnecessary state changes. JozsefA 2021-02-19 15:00:28 -0800
• ffc152ecf2
  Update es_es.json (HOTFIX) Franco Paladini 2021-02-19 17:16:28 -0300
• 45fc0ca7ee post-merge fixup simibubi 2021-02-19 20:21:29 +0100
• b61dc0d562 Merge branch 'mc1.15/dev' into mc1.15/ponder-ui simibubi 2021-02-19 18:03:34 +0100
• afe2c4497d Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2021-02-19 16:59:59 +0100
• bfd666bb9c Sequenced Adjustments simibubi 2021-02-19 16:55:45 +0100
• a3f2fbe788 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev grimmauld 2021-02-19 16:39:11 +0100
• 5b65a5d78b better fan stream advancement trigger grimmauld 2021-02-19 16:39:01 +0100
• 619045a505
  Update ru_ru.json Alepod 2021-02-19 16:44:49 +0200
• 5a1984eae4
  Update ru_ru.json Alepod 2021-02-19 16:42:25 +0200
• 2ece21a3ec
  Merge pull request #962 from CookieNick/mc1.15/paused-sequenced-gearshift simibubi 2021-02-19 15:10:14 +0100
• d0357df863 Move stuff of RegistryTrigger over to StringSerializableTrigger to make future expansion possible grimmauld 2021-02-19 15:08:50 +0100
• f363d56cc1
  Merge pull request #1115 from FrannDzs/mc1.15/dev simibubi 2021-02-19 15:05:37 +0100
• e424245d3a
  Merge pull request #1083 from muffinbarde/mc1.15/dev simibubi 2021-02-19 15:03:25 +0100
• 13e8f67d05
  Merge pull request #900 from SuicidalSteve/mc1.15/dev simibubi 2021-02-19 15:01:19 +0100
• 589572df6c kill kinetic block trigger, clean up unused stuff grimmauld 2021-02-19 14:21:02 +0100
• 37434f3933
  Merge pull request #1045 from TheBv/mc1.15/dev simibubi 2021-02-19 14:46:48 +0100
• fd65acd91d
  Merge pull request #1062 from Snownee/mc1.15/dev simibubi 2021-02-19 14:22:37 +0100
• 667c213506 remove unused light absorb trigger grimmauld 2021-02-19 14:13:18 +0100
• 3f9ee09953 Rework Bracket trigger to now be a registry trigger based on base block grimmauld 2021-02-19 14:12:26 +0100
• d9aa912796 generic registry based triggers (replaced kinetic block trigger and infinite fluid trigger) grimmauld 2021-02-19 09:09:29 +0100
• 7c0d0b6439
  Update es_es.json Franco Paladini 2021-02-19 00:53:47 -0300
• 54ca447301
  Update es_es.json Franco Paladini 2021-02-19 00:53:29 -0300
• 355a1dd95d Port new changes simibubi 2021-02-19 00:50:05 +0100
• 4ee9dd8a8a Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2021-02-19 00:49:39 +0100
• e2ccb80870 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev Kryppers 2021-02-18 22:57:32 +0000
• 3c48ece021 It's the Funnel Countdown Kryppers 2021-02-18 22:57:25 +0000
• 84c9569707 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering JozsefA 2021-02-18 14:10:43 -0800
• 3e63afa5f5 fix concurrent modification JozsefA 2021-02-18 14:00:17 -0800
• 7023148e7f generic infinite fluid triggers grimmauld 2021-02-18 23:00:17 +0100
• 8c8a9abd8a Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev grimmauld 2021-02-18 22:32:45 +0100
• d59fea1079 Bloat. simibubi 2021-02-18 19:43:22 +0100
• f27350253d
  Merge pull request #2 from muriplz/pr/1115 Franco Paladini 2021-02-18 15:03:08 -0300
• 9c1ab785d7
  Update es_es.json Franco Paladini 2021-02-18 15:00:07 -0300
• c0b6a55209
  Merge pull request #1075 from CKenJa/mc1.15/dev simibubi 2021-02-18 18:08:19 +0100
• 616bc09267
  Merge pull request #1040 from Chexet48/patch-2 simibubi 2021-02-18 18:07:11 +0100
• cf34b2e96b Fix fast fluid valves simibubi 2021-02-18 18:05:39 +0100
• 3ff3992f97
  Merge pull request #1118 from Jozufozu/mc1.15/experimental-rendering simibubi 2021-02-18 17:59:52 +0100
• 779b19b377 Multiple Thread improvements. Kryppers 2021-02-18 16:01:05 +0000
• 203ca6f849 Birbs and Click input simibubi 2021-02-18 15:44:18 +0100
• f8d6f73f8a Update es_es.json muriplz 2021-02-18 12:26:59 +0100
• a52865666a Update es_es.json muriplz 2021-02-18 12:19:40 +0100
• 310cbd484c Update es_es.json muriplz 2021-02-18 12:09:09 +0100
• 9b4d53d452 fix one residual merge conflict. creating matrix stacks is expensive, but correct. JozsefA 2021-02-17 14:27:49 -0800
• 24ab4e181f Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering JozsefA 2021-02-17 14:06:13 -0800
• 02db3f5a2c fix some problematic code. creating matrix stacks is expensive, apparently JozsefA 2021-02-17 13:58:24 -0800
• 22c03c4a14
  Update es_es.json Franco Paladini 2021-02-17 16:56:09 -0300
• 9048442fec
  Update es_es.json Franco Paladini 2021-02-17 16:52:50 -0300
• 607ce9edca
  Update es_es.json Franco Paladini 2021-02-17 16:43:06 -0300
• 9d57a25104
  Update es_es.json Franco Paladini 2021-02-17 16:42:37 -0300
• bd49e9bc7f
  Update es_es.json Franco Paladini 2021-02-17 16:39:07 -0300
• 2f9607a196
  Update es_es.json Franco Paladini 2021-02-17 16:29:35 -0300
• a5d6262424 fix mechanical crafter cogs JozsefA 2021-02-17 11:24:40 -0800
• cb6600ab0f
  Update es_es.json muriplz 2021-02-17 19:15:28 +0100
• d187dc0b38
  Update es_es.json Franco Paladini 2021-02-17 14:50:28 -0300
• 159e298e8b paletted contraptions Zelophed 2021-02-17 02:34:55 +0100
• a4c96be51c
  Update es_es.json Franco Paladini 2021-02-17 08:24:41 -0300
• 36553c6ee0
  Update es_es.json Franco Paladini 2021-02-17 01:01:01 -0300
• c4c57c6ba1
  Update es_es.json Franco Paladini 2021-02-16 23:41:47 -0300
• 7aa175dd9c fix gantry cogs skipping every half rotation JozsefA 2021-02-16 15:13:48 -0800
• ed04fd1d52
  Update es_es.json Franco Paladini 2021-02-16 19:54:49 -0300
• d2e30eeab5 finish merge remove old assets JozsefA 2021-02-16 14:47:03 -0800
• bec13b8e7d Assisted Placement, Part IV-b Zelophed 2021-02-16 22:50:11 +0100
• 716f79872c Actually port grimmauld 2021-02-16 20:52:26 +0100
• c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev grimmauld 2021-02-16 20:29:40 +0100
• 08562d2689 preliminary merge grimmauld 2021-02-16 20:21:42 +0100
• fd99acc00a Merge branch 'mc1.15/dev' into mc1.15/ponder-ui simibubi 2021-02-16 19:36:12 +0100
• 18067e8d5c Ponder simibubi 2021-02-16 19:35:26 +0100
• e4fe371d4c
  Add Spanish language (es_es) (unfinished) Franco Paladini 2021-02-16 13:59:05 -0300
• 15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge JozsefA 2021-02-15 21:27:08 -0800
• b9d1a586c1 Assisted Placement, Part IV Zelophed 2021-02-16 00:48:13 +0100
• 1e95fe4c7b avoid floating point accuracy errors at high coordinate values. refactor contraption model translation to be a method in AbstractContraptionEntity. - this simplifies the setup required for the fast rendering. JozsefA 2021-02-14 23:09:17 -0800
• 5e14ca71d9 Add max stack size check to ItemHelper.extract Snownee 2021-02-14 11:51:31 +0800
• 676a05ad07 Fix rose quartz duplication glitch (#1104) Snownee 2021-02-14 11:18:38 +0800
• 88d85feff4
  Update es_es.json Franco Paladini 2021-02-13 22:51:40 -0300
• 11616a0b16 avoid 'glGet's at all costs JozsefA 2021-02-13 16:26:34 -0800
• 951a0c4769 contraption actors take into account self lighting JozsefA 2021-02-13 13:10:14 -0800
• 0ad6db4bf7 cache KTEs' renderBoundingBox JozsefA 2021-02-12 23:06:41 -0800
• 2d2c7e653f Avoid unnecessary piston contraption assembling Snownee 2021-02-13 14:14:28 +0800
• b1905ddfd4 probably fix issue with phosphor crashing contraptions JozsefA 2021-02-12 21:11:35 -0800
• dae651c046 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev Snownee 2021-02-13 13:06:11 +0800
• e88dd89262 whoops null pointer is no more JozsefA 2021-02-12 19:33:13 -0800
• 485a0d2f95 hotswapping is more sane now. JozsefA 2021-02-12 17:30:21 -0800
• a5f3d799d1 kinda separate system capability stuff, should probably clean this up more. fix lighting glitches on world load. JozsefA 2021-02-12 16:36:20 -0800
• 8ab27904db More Instructions simibubi 2021-02-12 17:08:48 +0100
• d824304f12 tile entities on contraptions account for self lighting JozsefA 2021-02-12 00:13:39 -0800
• a8053ce472 these are somewhere else too JozsefA 2021-02-11 23:41:52 -0800
• 31a1fd71ce everything is somewhere else JozsefA 2021-02-11 23:36:05 -0800
• 67408e0dff better vertex attributes. all shaders are now GL 2.0 compatible!!! contraption structure rendering is technically 2.0 compatible now, need some better handling for that. JozsefA 2021-02-11 20:03:24 -0800