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

• e35c34040d Migmatite conflict fix (#1153) Jean Roberto de Souza 2025-06-16 13:03:14 -03:00
• 712f8a33c7 fixes #1162 Pyritie 2025-06-16 16:54:28 +01:00
• 6a6f72829a removed gems tag from flint Pyritie 2025-06-16 16:50:01 +01:00
• 5b0e9bda98 fixes #1165 Pyritie 2025-06-16 16:47:43 +01:00
• 692cd26780 - Food changes (#1167) Redeix 2025-06-16 04:57:17 -05:00
• 3f46b6856f - Updated texture for aqueous accumulator (#1168) Redeix 2025-06-16 04:56:15 -05:00
• 3148d3ad66 Update README.md Pyritie 2025-06-16 10:54:54 +01:00
• e60109bdc9 - Updated texture for aqueous accumulator Redeix 2025-06-16 01:05:29 -05:00
• 787a1afe44 - Food changes Redeix 2025-06-16 00:33:37 -05:00
• 65f987dd4b Add some more food recipes (#1166) ofoxsmith 2025-06-16 06:03:16 +10:00
• 1bfb5a969b Merge pull request #1156 from TerraFirmaGreg-Team/dev 0.9.11 Xikaro 2025-06-13 22:14:21 +05:00
• a6a5810b7e bump Xikaro 2025-06-13 22:11:48 +05:00
• c8203a17ce Update pakku-lock.json Xikaro 2025-06-13 22:09:57 +05:00
• 77d981c5fa Update pakku-lock.json for lunchbox fix (#1164) Redeix 2025-06-13 11:43:34 -05:00
• 35f950eb79 started work on rewriting the readme Pyritie 2025-06-13 13:06:56 +01:00
• ffc2106945 recipe fixes Pyritie 2025-06-13 00:39:27 +01:00
• 86a141881d wrong food lang Pyritie 2025-06-12 23:10:56 +01:00
• 2b2deb72fe tooltip fix Pyritie 2025-06-12 22:48:39 +01:00
• 36bc3c699c langs Pyritie 2025-06-12 22:39:25 +01:00
• 284de79e8c comment out coconut milk Pyritie 2025-06-12 21:53:25 +01:00
• a6402c63af update greenhouse tooltip Pyritie 2025-06-12 21:53:15 +01:00
• 8b18a4c7a6 update greenhouse quest Pyritie 2025-06-12 21:52:37 +01:00
• db1907f1a5 pakku updates Pyritie 2025-06-12 20:38:22 +01:00
• c6e090fe50 Merge branch 'dev' into feature/create-6 Pyritie 2025-06-12 13:34:02 +01:00
• b7cc04f188 merge Pyritie 2025-06-12 13:33:44 +01:00
• f822289573 custom gregtech machines and logic to handle TFC recipes (#1160) ofoxsmith 2025-06-12 22:32:10 +10:00
• c83dae8b7d Merge branch 'dev' into feature/food Pyritie 2025-06-12 13:27:17 +01:00
• d7d590ee7b lunchbox capsule recipe tweaks Pyritie 2025-06-12 10:11:58 +01:00
• d12d2001c3 Update lunch box recipe (#1159) Redeix 2025-06-12 02:27:08 -05:00
• 3dd247ab7e pakku updates Pyritie 2025-06-11 20:58:52 +01:00
• cc26bf9fca latex balance changes Pyritie 2025-06-11 20:30:22 +01:00
• 09a9891a8a changelog Pyritie 2025-06-11 20:20:21 +01:00
• 2b0b31d5b5 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-06-11 20:18:36 +01:00
• ff49260d5f added cinnabar to the piglin barter table Pyritie 2025-06-11 20:18:34 +01:00
• a03ea2a556 hi hecuba Pyritie 2025-06-11 19:43:20 +01:00
• c816ac4caf Merge branch 'main' into dev Xikaro 2025-06-11 16:37:32 +05:00
• 390bdc3cba Update pakku-lock (#1157) Redeix 2025-06-11 01:30:43 -05:00
• e037e0fcc8 Update build.yml (#1155) Redeix 2025-06-11 00:12:45 -05:00
• 24da0baeb6 fixed steel millstone not actually needing steel, fixed its recycling recipe Pyritie 2025-06-10 21:21:30 +01:00
• 33088aa174 rearranged food recipes into hopefully a good format? Pyritie 2025-06-10 20:13:03 +01:00
• 6e9f2401ac lunchbox adjustments Pyritie 2025-06-10 17:09:00 +01:00
• 601e92427b more lunchbox stuff Pyritie 2025-06-10 17:06:59 +01:00
• 4d492e261d added lunchbox quest Pyritie 2025-06-10 17:06:45 +01:00
• c91f8efe0e changed LV optional quests to correctly have the heart icon Pyritie 2025-06-10 17:06:14 +01:00
• 01ce7e19fb moved backpack size data to its own file, added lunchbox size data Pyritie 2025-06-10 16:58:06 +01:00
• e1aec5977c fixes warnings about metal bars in the cutter Pyritie 2025-06-10 16:36:03 +01:00
• f53fb9b51b added tfc-lunchbox to pakku too Pyritie 2025-06-10 16:33:07 +01:00
• a845d76657 added recipes for tfc-lunchbox! Pyritie 2025-06-10 16:32:43 +01:00
• 75a6d3d875 fixed colored steel from having higher tier blast furnace recipes, now they can all just use the basic one too Pyritie 2025-06-10 16:32:32 +01:00
• 09641378a3 fixed using the wrong battery in the ultimate battery recipe Pyritie 2025-06-10 11:38:55 +01:00
• a17784d63b Update CHANGELOG.md Redeix 2025-06-09 22:57:43 -05:00
• d44f713041 lang Pyritie 2025-06-10 02:17:16 +01:00
• 32268b9d31 Merge branch 'dev' into feature/space Pyritie 2025-06-10 02:16:10 +01:00
• 31d21075e3 antigravity! and zip gun tags Pyritie 2025-06-10 02:13:48 +01:00
• b93ff500d0 whatever this is Pyritie 2025-06-10 02:13:38 +01:00
• 5b462bbb28 compressed airs! Pyritie 2025-06-10 02:13:26 +01:00
• 0d62bfb3e6 langs Pyritie 2025-06-10 01:03:39 +01:00
• faa21ecbab removed giselle quest Pyritie 2025-06-09 23:33:14 +01:00
• 443ea6996a forgor one of the giselle recipes Pyritie 2025-06-09 23:33:00 +01:00
• e77ca60a26 revert new raw iron texture Pyritie 2025-06-09 23:21:48 +01:00
• bfc4a46f68 remove ad-astra-giselle-addon, tweak netherite spacesuit recipes Pyritie 2025-06-09 23:21:36 +01:00
• 8145a468f3 Updated changelog (#1152) Redeix 2025-06-09 16:15:16 -05:00
• 64c4cce30a Update piglin_disguise_block.json (#1151) Redeix 2025-06-09 16:11:34 -05:00
• 5d3f50daeb fix railways cap decolor recipe Pyritie 2025-06-09 21:51:53 +01:00
• cf7fc7f4d1 Merge branch 'dev' into feature/create-6 Pyritie 2025-06-09 21:15:33 +01:00
• 9c41fe262f merge Pyritie 2025-06-09 21:15:19 +01:00
• 84041d2e00 changelog Pyritie 2025-06-09 21:08:50 +01:00
• f9d2130192 changelog Pyritie 2025-06-09 21:05:26 +01:00
• 917da8d00e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-06-09 21:01:11 +01:00
• 5be2eb1d99 welcome back stonecutter Pyritie 2025-06-09 21:01:09 +01:00
• 86a35b7386 turned on the EMI default recipe button by default Pyritie 2025-06-09 20:50:40 +01:00
• 2b3a1d8ee2 Conductor (#1144) Jean Roberto de Souza 2025-06-09 15:34:05 -03:00
• 1a5867d956 fixes #1107 Pyritie 2025-06-09 18:59:05 +01:00
• fd7ae525ff langs Pyritie 2025-06-09 18:52:20 +01:00
• d3a47fa04f changelog Pyritie 2025-06-09 18:51:11 +01:00
• c11e13c949 fixes #1149 Pyritie 2025-06-09 18:46:30 +01:00
• 158f2c112c gregtech facade crafting (#1145) GameStar 2025-06-09 10:56:02 -05:00
• 2a0f11bd15 Include ElytraServers/Greate-Encased-Cogwheel-Drop-Fix (#1148) 楓 2025-06-09 23:54:04 +08:00
• e4014d1d6e Small fixes for Empty Jar, Beekeeper quest and Assembler Chute (#1142) TomPlop 2025-06-08 17:22:01 -04:00
• 8beb9ba090 Conflict issues fix (#1141) Jean Roberto de Souza 2025-06-08 18:21:46 -03:00
• 0ab1572392 added a bunch of circuits to create's assembler recipes Pyritie 2025-06-07 23:29:34 +01:00
• a830260b71 chorus/lightbloom stuff Pyritie 2025-06-07 23:03:41 +01:00
• 55a27896c4 moon noise tweaks Pyritie 2025-06-07 21:55:34 +01:00
• 65b9055e34 does this fix the weird squares with structures? Pyritie 2025-06-07 21:29:57 +01:00
• 29a713cb6c asurine dust + centrifuge recipes Pyritie 2025-06-07 21:29:41 +01:00
• 80e25ff6d9 langs Pyritie 2025-06-07 20:34:25 +01:00
• 2180da4932 cc recipe tweaks Pyritie 2025-06-07 20:06:27 +01:00
• 4615f3564a mysterious cube recipe Pyritie 2025-06-07 20:06:20 +01:00
• fdfca2ecc8 langs Pyritie 2025-06-07 19:17:01 +01:00
• ce1f8a4b80 adjusted the brightness of the generated raw ore textures Pyritie 2025-06-07 19:04:02 +01:00
• adc9932c2e removed FE cables 💔 Pyritie 2025-06-07 18:52:45 +01:00
• 5805f9c082 fixed ad astra's lamps so they actually emit light lmao Pyritie 2025-06-07 18:26:58 +01:00
• 7075f7eff1 we love material unification Pyritie 2025-06-07 18:13:04 +01:00
• 6cb1602455 more recipe tweaks Pyritie 2025-06-07 17:59:51 +01:00
• cb60215f5a tfc-ambiental tooltips for space suits Pyritie 2025-06-07 17:59:39 +01:00
• c359174053 langs Pyritie 2025-06-07 17:52:32 +01:00
• b36a2c1741 oh yeah there's no etrium ore Pyritie 2025-06-07 17:06:43 +01:00
• 3ccc700676 ore vein updates Pyritie 2025-06-07 16:57:39 +01:00
• e1c76bb03a desh raw ore block change Pyritie 2025-06-07 16:56:52 +01:00
• f6d16409ec chorus flower loot table Pyritie 2025-06-07 16:07:19 +01:00