Commit Graph

Select branches

Hide Pull Requests

20250401

220202-Hotfix

GT6-compat

MWT-exp

TSPA

backup

goodedition

m763

master

node-graph

pr1083

pr1252

pr1265

pr603

pr605

pr763

pr993

the-unfuckening

#100

#1004

#1006

#1009

#1013

#1014

#1015

#1017

#1024

#103

#1031

#1033

#1035

#104

#1041

#1043

#1045

#1046

#1049

#105

#1050

#1057

#1058

#1062

#1063

#1065

#1066

#1067

#1068

#1070

#1071

#1077

#1079

#1081

#1083

#1084

#1085

#1088

#1092

#1093

#1096

#1097

#110

#1102

#1105

#1107

#111

#1114

#1117

#1119

#1123

#1124

#1125

#1135

#1138

#114

#1145

#115

#1151

#1159

#1163

#1164

#1165

#1166

#1170

#1174

#1175

#1177

#1179

#118

#1181

#1182

#1183

#1184

#1185

#1188

#119

#1191

#1192

#1193

#1195

#1199

#120

#1207

#1208

#1215

#122

#1221

#1237

#1240

#1242

#1243

#1247

#1252

#1253

#1254

#1255

#126

#1261

#1265

#1266

#1267

#1268

#1269

#1277

#128

#1280

#1281

#1285

#1288

#1289

#1290

#1293

#1295

#1299

#130

#1300

#1302

#1306

#1308

#131

#1310

#1313

#1314

#1318

#1319

#132

#1320

#1323

#1324

#1325

#1326

#1328

#1329

#1333

#1334

#1335

#134

#1340

#1342

#1344

#1345

#1346

#1347

#1348

#1349

#135

#1350

#1353

#1356

#1357

#1358

#1361

#1364

#1365

#1369

#137

#1373

#1377

#1378

#1379

#1381

#1382

#1385

#1387

#139

#1391

#1392

#1395

#1399

#140

#1407

#1409

#1412

#1415

#1416

#1417

#142

#1425

#1426

#1429

#1432

#1433

#1436

#144

#1445

#145

#1452

#1455

#1459

#146

#1461

#1463

#1465

#1468

#147

#1470

#1472

#1475

#1478

#1483

#1484

#1485

#1487

#149

#1491

#1492

#1497

#1505

#1506

#1508

#1512

#1515

#1517

#1521

#1522

#1525

#1529

#1530

#1531

#1533

#1535

#1539

#1540

#1541

#1542

#1544

#155

#1550

#1557

#1558

#1562

#1568

#1569

#1571

#1576

#1578

#1584

#1593

#1596

#1599

#160

#1603

#1608

#1609

#1610

#1615

#1616

#162

#1623

#1624

#1625

#1629

#1642

#1645

#1652

#1655

#1658

#1669

#1672

#1684

#1685

#1693

#1694

#1698

#1700

#1710

#1712

#1715

#1716

#1719

#1720

#1722

#1723

#1724

#1725

#1727

#1729

#1733

#1734

#1736

#1739

#1744

#1747

#1748

#1749

#1751

#1752

#1753

#1755

#176

#1763

#1767

#1770

#1775

#1805

#1806

#1812

#1821

#183

#1833

#1837

#1838

#1842

#1843

#1845

#1848

#1851

#1853

#1857

#1859

#186

#1865

#187

#1871

#1873

#188

#1890

#1891

#1894

#1905

#191

#1910

#1914

#1917

#1920

#1924

#1928

#1930

#1934

#1935

#1936

#1937

#1943

#1947

#1948

#1949

#1953

#1954

#1958

#1959

#196

#1960

#1961

#1962

#1965

#1969

#1970

#1973

#198

#1981

#1982

#1985

#1993

#1998

#2000

#2001

#2002

#2003

#2005

#2006

#2010

#2011

#2012

#2013

#2014

#2016

#2018

#2021

#2022

#203

#2031

#2032

#2033

#2034

#2035

#2036

#2037

#2038

#2040

#2048

#2052

#2057

#2061

#2062

#2069

#2073

#2080

#2084

#2088

#2095

#2098

#2099

#2106

#2113

#2120

#2125

#2126

#2127

#2128

#213

#2137

#2139

#2140

#2141

#2142

#2143

#2144

#2148

#2150

#2152

#2153

#2154

#2158

#2159

#2162

#2165

#2167

#2168

#2169

#2178

#2180

#2182

#2182

#2183

#2185

#2188

#2189

#2192

#2194

#2196

#2198

#2199

#2201

#2202

#2204

#2207

#2210

#2212

#2215

#2221

#2223

#2226

#2228

#2231

#2232

#2234

#2235

#2239

#2241

#2243

#2244

#2245

#2246

#2247

#2250

#2251

#2255

#2259

#2261

#2267

#2268

#2269

#227

#2270

#2279

#228

#2281

#2282

#2284

#2285

#2286

#2290

#2291

#2292

#2294

#2295

#2296

#2302

#2311

#2326

#2329

#233

#2337

#2338

#2341

#2343

#2348

#235

#2357

#2360

#2361

#2363

#2365

#2368

#237

#2371

#2374

#2381

#2384

#2386

#2387

#2389

#239

#2391

#2397

#2399

#2400

#2401

#2402

#2403

#2404

#2405

#2406

#2407

#2409

#241

#2413

#2417

#2422

#2424

#2426

#2436

#2437

#2438

#2440

#2441

#2442

#2443

#2446

#2448

#2449

#245

#2456

#2466

#2466

#247

#2473

#2475

#2478

#2483

#2489

#2490

#2491

#2492

#250

#2504

#2505

#2507

#2509

#2513

#2521

#2525

#2527

#2528

#2530

#2532

#2536

#2537

#2538

#2546

#2549

#2551

#2551

#2553

#2559

#2560

#2563

#2580

#2581

#2587

#2588

#259

#2605

#2606

#2607

#2608

#2613

#2614

#2617

#2618

#262

#2624

#2625

#2630

#2636

#2639

#2641

#2643

#2645

#2648

#2649

#265

#2656

#2661

#267

#2674

#2674

#268

#2682

#2689

#2690

#2692

#2696

#2697

#2701

#2702

#2705

#2706

#2712

#2713

#2719

#2722

#2724

#2728

#2728

#275

#276

#279

#282

#296

#297

#298

#299

#300

#301

#303

#306

#309

#311

#312

#313

#315

#319

#322

#325

#326

#339

#342

#343

#345

#355

#359

#36

#363

#364

#365

#367

#368

#369

#37

#371

#372

#376

#38

#380

#383

#385

#387

#39

#393

#394

#396

#4

#406

#412

#415

#419

#42

#420

#424

#426

#427

#429

#438

#441

#442

#45

#455

#467

#48

#49

#493

#494

#5

#501

#509

#524

#53

#530

#531

#538

#546

#547

#55

#554

#559

#56

#564

#565

#568

#57

#576

#577

#58

#580

#584

#589

#592

#596

#597

#599

#60

#602

#603

#605

#609

#615

#616

#617

#619

#62

#621

#623

#626

#630

#634

#636

#64

#641

#643

#644

#65

#66

#67

#670

#672

#673

#676

#679

#68

#680

#695

#696

#699

#700

#713

#718

#732

#745

#747

#752

#753

#756

#760

#761

#763

#765

#766

#768

#774

#775

#787

#790

#795

#797

#80

#808

#811

#813

#821

#823

#828

#83

#84

#843

#85

#852

#856

#857

#858

#86

#865

#868

#87

#871

#874

#883

#885

#89

#890

#891

#897

#9

#90

#905

#907

#909

#911

#912

#913

#914

#915

#917

#920

#921

#930

#932

#94

#942

#95

#951

#953

#96

#962

#971

#982

#99

#990

#991

#993

#994

1.0.17_X5383

1.0.27

1.0.27-X4935

1.0.27X-blep

1.0.27X-blep-again

1.0.27X-mlem

1.0.27X-oof

1.0.27X-pistachio-sherbet

1.0.27X-sputnik

1.0.27X05

1.0.27X06

1.0.27X07

1.0.27X07_public

1.0.27X08

1.0.27X2835

1.0.27X2855

1.0.27X2863

1.0.27X2870

1.0.27X2875

1.0.27X2888

1.0.27X2891

1.0.27X2893

1.0.27X2904

1.0.27X2922

1.0.27X2936

1.0.27X2951

1.0.27X2968

1.0.27X2981

1.0.27X3000

1.0.27X3000B

1.0.27X3030

1.0.27X3030B

1.0.27X3043

1.0.27X3048

1.0.27X3062

1.0.27X3106

1.0.27X3111

1.0.27X3165

1.0.27X3182

1.0.27X3200

1.0.27X3231

1.0.27X3365

1.0.27X3442

1.0.27X3461

1.0.27X3479

1.0.27X3493

1.0.27X3514

1.0.27X3515

1.0.27X3519

1.0.27X3522

1.0.27X3528

1.0.27X3528H1

1.0.27X3564

1.0.27X3565

1.0.27X3586

1.0.27X3591

1.0.27X3598

1.0.27X3605

1.0.27X3612

1.0.27X3614

1.0.27X3626

1.0.27X3633

1.0.27X3636

1.0.27X3640

1.0.27X3654

1.0.27X3668

1.0.27X3696

1.0.27X3697

1.0.27X3710

1.0.27X3719

1.0.27X3731

1.0.27X3735

1.0.27X3745

1.0.27X3766

1.0.27X3773

1.0.27X3781

1.0.27X3801

1.0.27X3802

1.0.27X3808

1.0.27X3815

1.0.27X3822

1.0.27X3826

1.0.27X3864

1.0.27X3868

1.0.27X3871

1.0.27X3878

1.0.27X3892

1.0.27X3894

1.0.27X3899

1.0.27X3913

1.0.27X3913H1

1.0.27X3920

1.0.27X3934

1.0.27X3936

1.0.27X3942

1.0.27X3942H1

1.0.27X3948

1.0.27X3952

1.0.27X3962

1.0.27X3963

1.0.27X3976

1.0.27X3990

1.0.27X3991

1.0.27X3997

1.0.27X4000

1.0.27X4011

1.0.27X4018

1.0.27X4025

1.0.27X4026

1.0.27X404

1.0.27X4040

1.0.27X4053

1.0.27X4054

1.0.27X4060

1.0.27X4074

1.0.27X4088

1.0.27X4095

1.0.27X4109

1.0.27X4116

1.0.27X4130

1.0.27X4130H1

1.0.27X4144

1.0.27X4152

1.0.27X4158

1.0.27X4172

1.0.27X4174

1.0.27X4178

1.0.27X4179

1.0.27X4186

1.0.27X4191

1.0.27X4193

1.0.27X4200

1.0.27X4214

1.0.27X4215

1.0.27X4228

1.0.27X4228H1

1.0.27X4242

1.0.27X4242H1

1.0.27X4263

1.0.27X4263H1

1.0.27X4277

1.0.27X4291

1.0.27X4312

1.0.27X4327

1.0.27X4333

1.0.27X4334

1.0.27X4336

1.0.27X4347

1.0.27X4375

1.0.27X4389

1.0.27X4395

1.0.27X4403

1.0.27X4410

1.0.27X4411

1.0.27X4417

1.0.27X4431

1.0.27X4438

1.0.27X4441

1.0.27X4445

1.0.27X4473

1.0.27X4474

1.0.27X4476

1.0.27X4480

1.0.27X4501

1.0.27X4515

1.0.27X4522

1.0.27X4525

1.0.27X4543

1.0.27X4543H1

1.0.27X4550

1.0.27X4551

1.0.27X4561

1.0.27X4562

1.0.27X4578

1.0.27X4585

1.0.27X4592

1.0.27X4606

1.0.27X4607

1.0.27X4613

1.0.27X4621

1.0.27X4627

1.0.27X4641

1.0.27X4648

1.0.27X4655

1.0.27X4662

1.0.27X4663

1.0.27X4670

1.0.27X4671

1.0.27X4683

1.0.27X4690

1.0.27X4704

1.0.27X4705

1.0.27X4707

1.0.27X4711

1.0.27X4724

1.0.27X4739

1.0.27X4740

1.0.27X4746

1.0.27X4760

1.0.27X4774

1.0.27X4775

1.0.27X4795

1.0.27X4809

1.0.27X4809H1

1.0.27X4816

1.0.27X4824

1.0.27X4837

1.0.27X4844

1.0.27X4845

1.0.27X4851

1.0.27X4858

1.0.27X4859

1.0.27X4879

1.0.27X4880

1.0.27X4895

1.0.27X4914

1.0.27X4915

1.0.27X4921

1.0.27X9999

1.0.27Xfuckoff

1.0.27_X4935

1.0.27_X4936

1.0.27_X4939

1.0.27_X4942

1.0.27_X4956

1.0.27_X4963

1.0.27_X4977

1.0.27_X4980

1.0.27_X4991

1.0.27_X4998

1.0.27_X5000

1.0.27_X5012

1.0.27_X5020

1.0.27_X5026

1.0.27_X5027

1.0.27_X5036

1.0.27_X5056

1.0.27_X5057

1.0.27_X5061

1.0.27_X5082

1.0.27_X5089

1.0.27_X5090

1.0.27_X5091

1.0.27_X5180

1.0.27_X5188

1.0.27_X5193

1.0.27_X5202

1.0.27_X5209

1.0.27_X5224

1.0.27_X5229

1.0.27_X5230

1.0.27_X5243

1.0.27_X5257

1.0.27_X5278

1.0.27_X5279

1.0.27_X5298

1.0.27_X5299

1.0.27_X5313

1.0.27_X5320

1.0.27_X5334

1.0.27_X5335

1.0.27_X5336

1.0.27_X5356

1.0.27_X5357

1.0.27_X5377

1.0.27_X5378

1.0.27_X5397

1.0.27_X5412

1.0.27_X5412H1

1.0.27_X5418

1.0.27_X5425

1.0.27_X5426

1.0.27_X5439

1.0.27_X5441

1.0.27_X5453

1.0.27_X5454

1.0.27_X5467

1.0.27_X5490

1.0.27_X5491

1.0.27_X5523

1.0.27_X5526

1.0.27_X5544

1.0.27_X5545

1.0.27_X5546

1.0.27_X5567

1.0.27_X5570

1.0.27_X5572

1.0.27_X5593

1.0.27_X5615

MAIDLADS-1

MEMEPACK

MEMEPACK-10

MEMEPACK-2

MEMEPACK-3

MEMEPACK-4

MEMEPACK-5

MEMEPACK-6

MEMEPACK-7

MEMEPACK-8

MEMEPACK-9

WOC-1

Mono Color

• 2b59d8709e PR cleanup Boblet 2022-06-24 08:16:08 +02:00
• bf2224b880
  Merge pull request #641 from Adam29Adam29/master HbmMods 2022-06-24 08:10:45 +02:00
• d6fc826ad8 i did nothing all day Bob 2022-06-24 00:23:26 +02:00
• 1d9c4fec33 amongusamongusamongusamongusamongusamongusamongusamongusamongusamongusam Vaern 2022-06-23 15:15:25 -07:00
• 415ea9470f
  Merge pull request #634 from 7pheonix/glasscannon HbmMods 2022-06-23 08:33:29 +02:00
• 4a3d93d756 Merge branch 'pr603' Boblet 2022-06-23 08:26:37 +02:00
• fde92737eb formatting pr603 Boblet 2022-06-23 08:26:05 +02:00
• c019c4a923
  Merge pull request #603 from Voxelstice/master HbmMods 2022-06-23 08:10:33 +02:00
• aa9cd95681
  Merge branch 'pr603' into master HbmMods 2022-06-23 08:10:17 +02:00
• c62c37efb3
  Merge pull request #630 from Vaern/master HbmMods 2022-06-23 07:58:04 +02:00
• 90de2eabdc arty actually using the proper ammo types Bob 2022-06-22 23:24:55 +02:00
• 5921a64c95
  furnace container file Adam 2022-06-22 21:14:47 +02:00
• d7d7af3f6b
  change of dualCookTime to progress Adam 2022-06-22 21:12:25 +02:00
• 28f8b0be65
  block furnace file Adam 2022-06-22 21:11:05 +02:00
• 954839a2d1
  accidental file Adam 2022-06-22 21:09:27 +02:00
• f4b0ba5bc2
  added item tooltip for furnace Adam 2022-06-22 20:58:58 +02:00
• 8138382c15
  Tile entity Furnace file Adam 2022-06-22 20:57:27 +02:00
• 580657c609
  Block Furnace Textures Adam 2022-06-22 20:55:51 +02:00
• 1c05d309b6
  GUI Texture For Furnace Adam 2022-06-22 20:53:57 +02:00
• c380b7f84f
  Merge branch 'HbmMods:master' into master Adam 2022-06-22 20:45:04 +02:00
• aebcf90026 iron furnace fix, artillery shells Boblet 2022-06-22 16:58:48 +02:00
• c98a011141 manual artillery contoller Bob 2022-06-21 22:56:20 +02:00
• 093da728d2
  i want to combust 2: electric boogaloo Adam 2022-06-21 20:05:03 +02:00
• 905e2646ab
  GUI electric furnace Adam 2022-06-21 19:01:35 +02:00
• 916f295944
  pain and even agony Adam 2022-06-21 18:45:23 +02:00
• c8c9d4af7e
  i want to combust Adam 2022-06-21 18:02:52 +02:00
• 2952e175b5 fixes and fusion power ports Boblet 2022-06-21 16:56:51 +02:00
• aa7e20f3e2 localization & input fixes, fuel radiation modifier changed Vaern 2022-06-20 13:45:45 -07:00
• 0a017e9672 torex tweaks Bob 2022-06-20 22:34:47 +02:00
• 879741a17c
  progress bar issues Adam 2022-06-20 22:33:04 +02:00
• e1b75a315e IO fixes, some arty work Boblet 2022-06-20 17:00:37 +02:00
• ffce09b080 Added l18n to ZIRNOX tooltips Vaern 2022-06-19 22:34:52 -07:00
• 0c34901864 ZIRNOX stuff + lil bit of Igen Vaern 2022-06-19 22:23:18 -07:00
• 86a531cebe more arty stuff, conveyor fixes, crane retexture Bob 2022-06-19 19:44:30 +02:00
• b7ffa0f1d8 some garbage i almost forgot Pheonix 2022-06-19 18:23:38 +01:00
• fcfa5cee55 plentiful amounts of dosh Pheonix 2022-06-19 18:11:16 +01:00
• 43049bb730 Fixed the GC recipe for uranium fuel only having 2 UF nuggets, not 6 Vaern 2022-06-17 12:20:31 -07:00
• af35180620 changed the recipes a lil Vaern 2022-06-17 11:25:51 -07:00
• 0ba7153334 Recipe changes, messing around with nuke items, remappings and ignored Vaern 2022-06-16 19:45:04 -07:00
• e9f144bac9 a tiny bit of arty stuff Boblet 2022-06-17 15:23:12 +02:00
• 0b511f604f
  Merge pull request #621 from Vaern/GC-Rework-Pt2 HbmMods 2022-06-17 13:41:31 +02:00
• eb565f1b2f
  Merge branch 'master' into GC-Rework-Pt2 HbmMods 2022-06-17 13:41:24 +02:00
• caa6b31b93 finished iron furnace, artillery turret Bob 2022-06-16 22:59:28 +02:00
• 34d72b4f80 iron furnace, some universal code for solid fuels Boblet 2022-06-15 16:54:45 +02:00
• c307d26752 iron furnace Bob 2022-06-14 22:56:06 +02:00
• f003b2db08 some stuff™️ Boblet 2022-06-14 16:59:33 +02:00
• 0e3be93bcb fixed canister color + version bump 1.0.27X4263H1 Bob 2022-06-13 17:42:19 +02:00
• c50d01fedc fixes Boblet 2022-06-13 16:30:59 +02:00
• ad6fe11d83
  Merge pull request #626 from Doctor17-git/master HbmMods 2022-06-12 21:16:47 +02:00
• 8d395e1658
  Updated ru_RU.lang Doctor17-git 2022-06-12 21:55:29 +03:00
• fa176c6a5c
  Merge pull request #623 from Voxelstice/turbine-anim 1.0.27X4263 HbmMods 2022-06-12 20:48:58 +02:00
• 8c1275206c and all that jazz Bob 2022-06-12 20:47:20 +02:00
• 8dfe52b895
  and the large turbine Voxelstice 2022-06-12 05:26:14 +10:00
• 4bd1ccddf2
  chungus Voxelstice 2022-06-12 05:24:46 +10:00
• debb9449cb working ejector crane upgrades Boblet 2022-06-10 15:24:46 +02:00
• 9a54fc537e some crafting recipes or sth Bob 2022-06-09 23:20:16 +02:00
• 22746a54e9 spring cleaning, conveyor lift Boblet 2022-06-09 16:55:41 +02:00
• d29d58e14f conveyorception Bob 2022-06-08 23:47:47 +02:00
• 087ce9fccb double sided belts and missing mapping magic Boblet 2022-06-08 16:45:57 +02:00
• cd502ccf19
  Merge pull request #619 from Vaern/RBMK-Stuff HbmMods 2022-06-08 08:06:00 +02:00
• bb94a2db42 Noticed some inconsistencies between xenon and non-xenon poisoned schrab Vaern 2022-06-07 17:41:47 -07:00
• 17712de204 know your gusics Bob 2022-06-07 23:37:45 +02:00
• 24b7720f6d added boron sand for flaming debris Vaern 2022-06-07 13:32:32 -07:00
• 67a9c91950 my head hurts Bob 2022-06-07 21:08:11 +02:00
• 8a080a037f stack matching settings for extractor crane Boblet 2022-06-07 16:05:31 +02:00
• 02761a12cf extractor filter, GUI Bob 2022-06-06 21:16:18 +02:00
• cfe90f281a plenty more changes; RBMK rounding errors fixed Vaern 2022-06-05 20:32:47 -07:00
• fd901c8aef finished inserter + basic extractor functionality Bob 2022-06-05 20:54:15 +02:00
• 671948754b Plenty of changes Vaern 2022-06-04 21:30:30 -07:00
• 045dcaa79a not sure how that was missed Vaern 2022-06-04 16:15:23 -07:00
• f23c080db0 might as well Vaern 2022-06-04 14:40:05 -07:00
• e29616a83e Changed some stuff for the debris Vaern 2022-06-04 14:27:41 -07:00
• 1379522918 Changed UEU heat Vaern 2022-06-04 13:25:08 -07:00
• 2d47e51833 Changed probability Vaern 2022-06-04 12:26:15 -07:00
• 66663ca502 inserter crane Bob 2022-06-04 21:24:17 +02:00
• e2df83d638 Made foam/boron sand work for all sides of RBMK debris Vaern 2022-06-04 11:32:19 -07:00
• 48c8ab84db Modified RBMK fuels, added effects for boron/foam on RBMK and ZIRNOX Vaern 2022-06-03 20:40:25 -07:00
• e89464038b and the lord yoinketh away Boblet 2022-06-03 14:57:46 +02:00
• abbef7b70d
  Merge pull request #617 from Vaern/ThMEU-Balancing HbmMods 2022-06-03 08:08:57 +02:00
• ba6c0a8bb7 Fixed the enrichment percentage and RBMK localization for MOX Vaern 2022-06-02 17:08:44 -07:00
• 1ae7160128 conveyor API stuff Bob 2022-06-02 22:46:22 +02:00
• e4c0336324 unbelievable, absolutely phenomenal Bob 2022-06-01 21:16:09 +02:00
• ed15803a42 smooth sailing on conveyor belts Bob 2022-06-01 20:47:35 +02:00
• baff99e481 particles that are actual particles MEMEPACK-9 Bob 2022-05-31 22:28:12 +02:00
• f0b211dbff mass storages keeping inventory when broken, recipes Boblet 2022-05-31 16:49:18 +02:00
• 8d8116b3d0 i did nothing productive all day Bob 2022-05-30 19:45:51 +02:00
• 4bb86ebc0b ZIRNOX ThMEU Rebalancing Vaern 2022-05-29 11:56:42 -07:00
• 9b4ad0bde3 ThMEU Rebalancing Vaern 2022-05-29 11:52:31 -07:00
• 943e243573 the ferocious crafter Bob 2022-05-29 15:49:14 +02:00
• 0535d3c49f the man Bob 2022-05-29 00:57:08 +02:00
• 26bcbcf7e0 it's an autocrafter Boblet 2022-05-27 14:54:45 +02:00
• c616a64500 mass storage Bob 2022-05-26 23:29:11 +02:00
• c27d9e152e desh crates, cleaned up crate code terribleness Boblet 2022-05-25 16:37:29 +02:00
• 7e7d062324 funnier minecarts Bob 2022-05-23 23:15:12 +02:00
• 625b0c70ab dial for turning off meltdowns Bob 2022-05-23 19:19:31 +02:00
• 93dee8ac82 fixes and fixes 1.0.27X4242H1 Bob 2022-05-23 18:37:41 +02:00
• fe2df764dd
  if this doesnt fix the conflict i dont know what i will do Voxelstice 2022-05-23 13:25:57 +10:00
• 5b463d96d9
  that didnt fix the conflict Voxelstice 2022-05-23 13:14:20 +10:00
• ac93e2c4b0
  fix conflict 1 Voxelstice 2022-05-23 13:12:06 +10:00
• 5dd75258ad
  Merge pull request #609 from Doctor17-git/master HbmMods 2022-05-22 19:19:29 +02:00