Commit Graph

Select branches

Hide Pull Requests

main

patches

temp

temp12

#1

#1000

#1003

#1005

#1007

#1020

#1021

#1023

#1024

#1026

#1027

#1031

#1032

#1035

#104

#1041

#1042

#1045

#1058

#1071

#1074

#1077

#1078

#1080

#1081

#1082

#1084

#1088

#1089

#1092

#1098

#1099

#1101

#1106

#1111

#1116

#1120

#1122

#1123

#1126

#1127

#1128

#1141

#1142

#1144

#1145

#1148

#115

#1151

#1152

#1153

#1155

#1156

#1157

#1159

#116

#1160

#1164

#1166

#1167

#1168

#1171

#1172

#1174

#1175

#1176

#1177

#1178

#1179

#1180

#1181

#1183

#1185

#1189

#119

#1190

#1193

#1196

#1200

#1201

#1202

#1204

#1205

#1207

#1208

#1209

#1210

#1214

#1215

#1220

#1221

#1223

#1225

#1228

#1229

#123

#1231

#1233

#1234

#1238

#1239

#124

#1242

#1243

#1246

#1247

#1248

#1249

#125

#1251

#1252

#1253

#1254

#1258

#1259

#126

#1262

#1266

#1267

#1268

#1269

#1270

#1271

#1274

#1275

#1276

#1277

#1278

#1280

#1282

#1283

#1284

#1285

#1300

#1306

#1307

#1310

#1311

#1313

#1314

#1319

#132

#1320

#1332

#1333

#1336

#1337

#1338

#1345

#1346

#1349

#1352

#1353

#1359

#1360

#1369

#1370

#1371

#1372

#1378

#1379

#1381

#1385

#1386

#1390

#1391

#1394

#1398

#1399

#1400

#1401

#1402

#1403

#1404

#1410

#1412

#1416

#1417

#1422

#1428

#1434

#1437

#1438

#1439

#1442

#1443

#1448

#1451

#1455

#1458

#1460

#1465

#1467

#1468

#1469

#1470

#1471

#1473

#1477

#1483

#1487

#1489

#149

#1492

#1493

#1494

#1495

#1498

#15

#1501

#1502

#1505

#1507

#1509

#1510

#1511

#1512

#1513

#1516

#1517

#1519

#1526

#1527

#1531

#1533

#1535

#1538

#1544

#1544

#1547

#1548

#1550

#1551

#1552

#1555

#1557

#1563

#1564

#1567

#1568

#1569

#1574

#1575

#1578

#1585

#1589

#1591

#1594

#16

#1608

#1609

#161

#1612

#1614

#1617

#1618

#1633

#1635

#164

#1642

#1643

#1653

#1661

#1663

#1664

#1666

#1667

#1668

#1671

#1677

#1678

#1679

#168

#1680

#1681

#1684

#1686

#1687

#1694

#1695

#1697

#1702

#1703

#1707

#1709

#1710

#1711

#1714

#1716

#1720

#1722

#1727

#1728

#1729

#1730

#1734

#1735

#1741

#1742

#1745

#1746

#1747

#1750

#1753

#1754

#1758

#1759

#176

#1761

#1763

#1764

#1765

#1768

#1769

#1770

#1771

#1772

#1773

#1777

#1778

#1778

#1779

#178

#1782

#1784

#1790

#1793

#1794

#1795

#182

#2

#201

#208

#21

#25

#280

#283

#285

#286

#286

#287

#288

#288

#289

#290

#3

#301

#305

#310

#322

#334

#346

#367

#370

#373

#378

#382

#399

#4

#401

#402

#403

#404

#408

#410

#417

#488

#495

#497

#499

#5

#500

#503

#516

#521

#527

#529

#530

#531

#534

#553

#555

#556

#564

#587

#589

#594

#595

#6

#601

#602

#605

#608

#609

#629

#632

#634

#635

#637

#638

#639

#640

#641

#642

#643

#644

#645

#646

#647

#648

#650

#651

#652

#653

#654

#657

#661

#662

#663

#664

#666

#667

#668

#669

#670

#672

#673

#674

#676

#678

#680

#681

#682

#683

#684

#686

#687

#688

#689

#690

#692

#693

#694

#695

#696

#698

#701

#702

#703

#704

#705

#706

#707

#708

#709

#710

#711

#712

#713

#714

#717

#720

#721

#722

#723

#724

#727

#728

#731

#732

#733

#737

#739

#740

#741

#742

#743

#744

#745

#747

#750

#751

#752

#753

#754

#755

#756

#758

#759

#760

#761

#764

#766

#768

#769

#771

#771

#772

#773

#774

#778

#779

#78

#781

#788

#789

#790

#800

#802

#803

#808

#811

#814

#815

#82

#820

#822

#823

#828

#840

#841

#842

#843

#844

#845

#846

#848

#849

#856

#866

#867

#868

#871

#872

#873

#874

#875

#876

#877

#878

#879

#880

#881

#882

#883

#884

#885

#886

#888

#891

#895

#903

#907

#908

#911

#913

#914

#915

#916

#919

#920

#923

#924

#925

#927

#935

#937

#938

#942

#948

#949

#951

#953

#956

#960

#962

#969

#971

#973

#977

#985

#987

#988

#992

#993

#995

#998

0.0.1

0.0.3

0.0.4

0.0.5

0.0.6

0.0.7

0.0.8

0.0.9

0.1.0

0.1.1

0.1.2

0.10.0

0.10.1

0.10.10

0.10.11

0.10.12

0.10.13

0.10.2

0.10.3

0.10.4

0.10.5

0.10.6

0.10.7

0.10.8

0.10.9

0.2.0

0.2.1

0.3.0

0.4.0

0.4.1

0.4.2

0.4.3

0.5.0

0.5.1

0.6.0

0.6.1

0.6.10

0.6.11

0.6.12

0.6.13

0.6.14

0.6.15

0.6.2

0.6.3

0.6.4

0.6.5

0.6.6

0.6.7

0.6.8

0.6.9

0.7.0

0.7.1

0.7.10

0.7.11

0.7.12

0.7.13

0.7.14

0.7.15

0.7.16

0.7.17

0.7.18

0.7.19

0.7.2

0.7.3

0.7.4

0.7.5

0.7.6

0.7.7

0.7.8

0.7.9

0.8.0

0.8.1

0.9.0

0.9.1

0.9.10

0.9.11

0.9.2

0.9.3

0.9.4

0.9.5

0.9.6

0.9.7

0.9.8

0.9.9

Mono Color

• 414036d86e Remove Saw Cutter until fix for Cleanroom (#873) TomPlop 2025-04-17 18:03:31 -04:00
• e2499e68c6 Server Pack Fix (#868) Nebby 2025-04-17 14:10:38 -04:00
• 98bb2a467e ae2 cores (#747) SverhRazum-Nah 2025-04-16 22:23:22 +03:00
• c573a7f857 Remove buggy Pumpkin Chunks recipe (#766) CaitlynMC 2025-04-16 15:23:11 -04:00
• d9843c8c9d Merging #601 - added recipes for locometal boilers, couplers, buffers Pyritie 2025-04-16 19:23:26 +01:00
• 9aba2b416c Merging #653, fixes book and name tag inconsistencies Pyritie 2025-04-16 18:53:41 +01:00
• 56311bef5b Merges #654, getting leather back from leather things Pyritie 2025-04-16 18:42:16 +01:00
• 3e5dac1920 Merge #761 into dev (sort of) Pyritie 2025-04-16 18:22:02 +01:00
• c172f50db1 Updates from the alpha feedback/tweaks branch (#856) Pyritie 2025-04-16 18:14:14 +01:00
• 77673218fd create sugar from beets in centrifuge (#773) Curtis Merrill 2025-04-15 18:06:52 -04:00
• f4a714ceff reduce recipe requirements for sticky resin in fluid solidifier (#788) Curtis Merrill 2025-04-15 18:06:29 -04:00
• 3e457a1b02 create some raw coal recipes in coke oven and pyro oven (#768) Curtis Merrill 2025-04-15 18:01:38 -04:00
• 4660364a9e Translate Uk (#779) MetenBouldry 2025-04-16 00:55:54 +03:00
• eb8aba85cb fixed rock knapping in field guide (#781) GamerDadDave 2025-04-15 15:55:27 -06:00
• ebe0a2763d add gt furnace recipe for wood ash (#790) Curtis Merrill 2025-04-15 17:54:02 -04:00
• 3c3062ae9d Fix Chocolate Dust Recipe, Add Additional Chocolate Dust/Powder Recipes (#803) julia 2025-04-15 23:51:41 +02:00
• a00785e751 add recipes for passthrough hatches (#815) Curtis Merrill 2025-04-15 17:51:33 -04:00
• 2311308d00 GT light/dark concrete recipe fix (#820) Adora 2025-04-15 23:51:22 +02:00
• ec2e3cd3c4 Alpha Release: 0.9.0 (#849) Pyritie 2025-04-15 19:27:17 +01:00
• 4e4aae4de5 pakku-lock Xikaro 2025-04-15 09:39:46 +05:00
• b2c4d86e6d Update mods Xikaro 2025-04-15 08:41:26 +05:00
• 8c6aa36bc4 whoops, there was two .vs/ Pyritie 2025-04-14 23:00:08 +01:00
• 1d784aa410 made hopper recipe cheaper Pyritie 2025-04-14 22:26:30 +01:00
• bf7a903f17 quest tweaks Pyritie 2025-04-14 22:26:19 +01:00
• 89c55f59a4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-04-14 20:55:41 +01:00
• c83f51d6bc Reapply "update gitignore" Pyritie 2025-04-14 20:40:23 +01:00
• 7f89ead730 Revert "update gitignore" Pyritie 2025-04-14 20:40:14 +01:00
• d4c80a4b61 Consolidating Development: 0.9.x (#846) Nebby 2025-04-14 14:00:08 -04:00
• 528672e95b Update mods Xikaro 2025-04-14 22:15:14 +05:00
• b437a75492 update gitignore Pyritie 2025-04-14 14:51:50 +01:00
• 04a2b06d69 Update mods Xikaro 2025-04-14 05:34:40 +05:00
• d344316e5a Update CONTRIBUTING.md Xikaro 2025-04-14 04:55:57 +05:00
• e3dcc31372 Update CONTRIBUTING.md Xikaro 2025-04-14 04:53:37 +05:00
• 339f9d2041 Update CONTRIBUTING.md Xikaro 2025-04-14 04:12:36 +05:00
• 358cb5d807 Update CONTRIBUTING.md Xikaro 2025-04-14 04:10:00 +05:00
• 955cc02413 CONTRIBUTING Xikaro 2025-04-14 04:01:27 +05:00
• 4f59bfd042 Update PULL_REQUEST_TEMPLATE.md TerraFirmaGreg 2025-04-13 04:12:46 +05:00
• 5fbb914577 Update CHANGELOG.md TerraFirmaGreg 2025-04-13 04:09:25 +05:00
• 73de2c38db Merge pull request #828 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-aeec8888df Xikaro 2025-04-09 15:30:28 +05:00
• 2b98542bcf Bump the dependencies group with 2 updates dependabot[bot] 2025-03-25 00:16:18 +00:00
• aa1a67b1b1 Merge pull request #811 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-076523d357 Xikaro 2025-03-06 00:33:38 +05:00
• fa6c5cbf5f Bump the dependencies group across 1 directory with 3 updates dependabot[bot] 2025-03-03 21:35:30 +00:00
• fd9b6cdd91 Update server_starter.conf Xikaro 2025-02-16 00:08:18 +05:00
• 96ce5acc3c Merge pull request #778 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-3df3328615 Xikaro 2025-02-05 06:56:04 +05:00
• 747b87b332 Bump hugoalh/send-discord-webhook-ghaction in the dependencies group dependabot[bot] 2025-02-03 21:51:42 +00:00
• 3b705e3f18 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern Xikaro 2025-01-25 23:23:53 +05:00
• 376285e6da Update forge-auto-install.txt Xikaro 2025-01-25 23:23:49 +05:00
• 0b17f10c08 Update CHANGELOG.md Dmitry 2025-01-26 01:05:25 +07:00
• 97574075c4 Update pakku.json 0.7.19 Xikaro 2025-01-25 22:55:09 +05:00
• b44bcb5244 Update pakku-lock.json Xikaro 2025-01-25 22:51:33 +05:00
• f6b8bddc1e Update server_starter.conf Xikaro 2025-01-25 22:45:17 +05:00
• 752a845445 Update server_starter.conf Xikaro 2025-01-25 22:43:38 +05:00
• f1da81bb4a ref: server Xikaro 2025-01-25 22:39:31 +05:00
• 65e8cd0b06 Update CHANGELOG.md Dmitry 2025-01-26 00:03:45 +07:00
• 8e6e1318e5 Merge pull request #733 from Egogorka/fix-collapsible-bricks Dmitry 2025-01-26 00:03:32 +07:00
• 0aecdce1d8 Merge pull request #737 from Pyritie/patch-1 Dmitry 2025-01-26 00:02:23 +07:00
• c0a53cab62 Merge pull request #732 from AirRice/sign-exploit-squasher Dmitry 2025-01-26 00:01:51 +07:00
• c50f5966f6 Merge branch 'main' into patch-1 Pyritie 2025-01-25 17:01:24 +00:00
• d8fa521bc9 Merge pull request #739 from Nebby1999/main Dmitry 2025-01-26 00:00:21 +07:00
• 4090358be0 Merge pull request #740 from deneth-weerasinghe/main Dmitry 2025-01-25 23:59:15 +07:00
• 5a5260a542 Merge branch 'main' into main Dmitry 2025-01-25 23:58:43 +07:00
• d8c37eac78 Merge pull request #742 from Metriximor/main Dmitry 2025-01-25 23:56:42 +07:00
• d62ed8bb6b Update CHANGELOG.md Dmitry 2025-01-25 23:56:26 +07:00
• 1ecdc4bd76 Merge pull request #744 from Pyritie/patch-2 Dmitry 2025-01-25 23:55:45 +07:00
• 93ee99349a Merge pull request #745 from CaptainGold1/glowstone_lamp_fuel Dmitry 2025-01-25 23:54:59 +07:00
• 50fa27f0e7 Merge pull request #750 from Nebby1999/feature/create_sequenced_assemblying_Scraping Dmitry 2025-01-25 23:53:34 +07:00
• 81b06d7caa Merge pull request #751 from Pyritie/Fixed-colored-steel-dust-centrifuge-recipes Dmitry 2025-01-25 23:53:07 +07:00
• 3543e8f083 Merge pull request #752 from Pyritie/patch-3 Dmitry 2025-01-25 23:52:43 +07:00
• ab9a22d29d Merge pull request #753 from CaptainGold1/processed-ores-heat Dmitry 2025-01-25 23:52:11 +07:00
• 8025dccf40 Merge pull request #755 from SverhRazum-Nah/TFC-magma-as-passive-boiler-heater Dmitry 2025-01-25 23:48:43 +07:00
• 160de3cfa7 Merge branch 'main' into TFC-magma-as-passive-boiler-heater Dmitry 2025-01-25 23:48:34 +07:00
• 811f0976b0 Merge pull request #756 from CaptainGold1/cassiterite-fix Dmitry 2025-01-25 23:47:42 +07:00
• f2d124265b Merge pull request #758 from Nebby1999/feature/small_dust_from_failed_pressing Dmitry 2025-01-25 23:45:49 +07:00
• aff2201418 Merge pull request #759 from CaptainGold1/wool_fix Dmitry 2025-01-25 23:44:43 +07:00
• 1726f86477 Update CHANGELOG.md Dmitry 2025-01-25 23:43:44 +07:00
• a9a682bd3d Merge pull request #760 from Nebby1999/feature/forging_guide_in_guidebook Dmitry 2025-01-25 23:43:17 +07:00
• 7543a23e88 Merge pull request #731 from Pyritie/crystals Dmitry 2025-01-25 23:40:51 +07:00
• 194af34182 Patchouli Entry Nebby1999 2025-01-25 00:42:36 -03:00
• 981929bab0 UNTESTED: fixes wool recipe conflict CaptainGold1 2025-01-24 20:00:41 -06:00
• 52f44279c9 Remove log call Nebby1999 2025-01-24 20:43:26 -03:00
• afdba67fd4 Get small dust from failed pressing Nebby1999 2025-01-24 20:36:50 -03:00
• 511716f042 Update normal_magnetite.json Pyritie 2025-01-24 21:17:47 +00:00
• eca15e1fd2 Update surface_copper.json Pyritie 2025-01-24 21:16:22 +00:00
• a43a6e89e7 Add files via upload SverhRazum-Nah 2025-01-24 21:51:16 +03:00
• 9ad7d5a05d Add files via upload SverhRazum-Nah 2025-01-24 21:50:52 +03:00
• 8a9cd75dd6 Fixed cassiterite heating exploit CaptainGold1 2025-01-24 12:48:21 -06:00
• 42e6665ee3 Added heat values for blocks and log rods CaptainGold1 2025-01-23 23:00:09 -06:00
• a0b08da739 Removed the entry on valid inputs to blast furnace CaptainGold1 2025-01-23 22:28:49 -06:00
• c71dff649b Fixed crushed/processed ores not heating CaptainGold1 2025-01-23 22:25:50 -06:00
• 568da8c60a Update recipe_types.js Pyritie 2025-01-23 21:56:02 +00:00
• fb580befb1 Update terrariums.js Pyritie 2025-01-23 21:53:47 +00:00
• 8b35ca0285 Merge branch 'TerraFirmaGreg-Team:main' into Fixed-colored-steel-dust-centrifuge-recipes Pyritie 2025-01-23 21:48:17 +00:00
• 030bc552d4 Update recipes.js Pyritie 2025-01-23 21:46:48 +00:00
• c25c186572 decreased depth of non-primitive indicators Pyritie 2025-01-23 20:47:27 +00:00
• d5770b8993 Automatic Scraping with Sequenced Assembly Nebby_G 2025-01-23 13:40:19 -03:00
• 9f8defd707 Add glowstone as infinite lamp fuel CaptainGold1 2025-01-22 16:37:20 -06:00
• 387c72d380 Update recipes.js Pyritie 2025-01-22 20:38:42 +00:00
• 5ddda569d9 Add item heat to kelp and seaweed Metriximor 2025-01-22 10:43:12 +00:00
• f30cd26a0e Add seaweed and kelp drying recipes Metriximor 2025-01-21 20:27:49 +00:00
• 3dc98922a9 Replace blasting charcoal recipe Nebby_G 2025-01-21 13:00:17 -03:00