Commit Graph - TFG - Gitea: Git with a cup of tea

Jika/TFG

Fork 0

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

8433029e35 fixed a quest title Pyritie 2025-08-11 02:18:42 +01:00
ffc635a880 I think that one guy's install was fucked but I already wrote these, so why not Pyritie 2025-08-11 02:10:17 +01:00
043e7cc23d Merge pull request #1585 from TerraFirmaGreg-Team/dev 0.10.9 Xikaro 2025-08-11 02:08:37 +05:00
437257a033 let's go Pyritie 2025-08-10 22:01:02 +01:00
99b1d28d0a updated cl Pyritie 2025-08-10 21:56:09 +01:00
ce5db1446d updated primitive alloy patchouli page to reflect new alloy ratios Pyritie 2025-08-10 21:54:57 +01:00
e6182b1b66 updated pakku Pyritie 2025-08-10 21:52:29 +01:00
47ea14cd40 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-10 21:32:06 +01:00
a76b28b7d5 Update CHANGELOG.md Redeix 2025-08-10 15:30:46 -05:00
6802646d85 Update recipes.js Redeix 2025-08-10 15:29:14 -05:00
fcb50c2a49 missing item models for the wild ones Pyritie 2025-08-10 21:22:12 +01:00
b04f14132f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-10 20:59:22 +01:00
877653ad9b finished textures for the mars crops (except the greenhouse ones) Pyritie 2025-08-10 20:59:20 +01:00
3eeced88b1 removed some placeholder quest text Pyritie 2025-08-10 20:58:35 +01:00
b2c727835e add: mr tfc-punishment-for-death Xikaro 2025-08-11 00:32:55 +05:00
4ee97185a5 sick of seeing these two bozos in the log files all the time Pyritie 2025-08-10 17:53:42 +01:00
dd795ffab8 config Xikaro 2025-08-10 18:42:41 +05:00
5e4c5565b9 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-10 14:11:36 +01:00
944fdf8c56 fix for sodium hydroxide lye recipe ID on linux Pyritie 2025-08-10 14:11:30 +01:00
3ed36dfca6 smooth-boot-reloaded Xikaro 2025-08-10 18:07:24 +05:00
75531742d0 Update pakku-lock.json Xikaro 2025-08-10 17:52:07 +05:00
d2d459ff4a Update pakku.json Xikaro 2025-08-10 17:51:39 +05:00
71863393c6 Update build.yml Xikaro 2025-08-10 17:33:35 +05:00
e49180e5ed Merge pull request #1578 from TerraFirmaGreg-Team/dev 0.10.8 Xikaro 2025-08-10 17:22:43 +05:00
cd469833af mars farmland loot table Pyritie 2025-08-10 13:04:56 +01:00
aa826ecf94 fixed pakku tfg 0.7.9 Pyritie 2025-08-10 13:04:50 +01:00
afbb6b8bf6 changelog + new version Pyritie 2025-08-10 12:57:50 +01:00
37aea951c9 pakku Pyritie 2025-08-10 12:56:46 +01:00
5c2f57f429 Merge branch 'main' into dev Pyritie 2025-08-10 12:52:42 +01:00
cf3e596905 mars farmland lang Pyritie 2025-08-10 12:16:52 +01:00
2e66bc20e1 made brick cutting recipes cheaper/faster Pyritie 2025-08-10 12:15:06 +01:00
90d26fb597 lang Pyritie 2025-08-10 12:05:06 +01:00
116bb4fd89 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-10 12:04:33 +01:00
919004fc00 cl Pyritie 2025-08-10 12:04:31 +01:00
2c5658a185 Reflector block and some other fixes (#1575) Redeix 2025-08-10 05:39:10 -05:00
0f6ce5a9c5 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-10 02:17:37 +01:00
ac500c9a33 cl Pyritie 2025-08-10 02:17:35 +01:00
ffba6c5547 Show stonecutter and feeding upgrades in EMI (#1574) Spicy Noodles 2025-08-10 02:17:05 +01:00
f74316154d slightly buffed tree tap amounts Pyritie 2025-08-10 02:13:26 +01:00
e59dc4d57d remove lava buckets as fuel Pyritie 2025-08-10 00:13:25 +01:00
fbbfe31ba8 mars farmland stuff, also fixed nox berry EGH recipe Pyritie 2025-08-09 23:57:45 +01:00
5a5c5040fd fixed dust secondary texture Pyritie 2025-08-09 23:57:23 +01:00
44acd49485 added more icon sets for dusts and rods Pyritie 2025-08-09 21:56:24 +01:00
6a6c841979 CL for #1537 Pyritie 2025-08-09 17:43:54 +01:00
655ef68697 fixed a duplicate fluix block, also tweaked the fluix material a little Pyritie 2025-08-09 17:43:08 +01:00
3b9b80f52d lang updates Pyritie 2025-08-09 15:47:43 +01:00
d196a2820e forgot these ores Pyritie 2025-08-09 15:14:59 +01:00
cb74670ceb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-09 15:08:00 +01:00
7de1910ee1 cleaned up and fixed the raw ore to smelting recipes #1566 Pyritie 2025-08-09 15:07:51 +01:00
7a0b6898cf changed plated block recipes to be shapeless so people stop plating their floors by accident Pyritie 2025-08-09 14:23:50 +01:00
fc0c62f77c added create packages/jars to the railgun blacklist Pyritie 2025-08-09 14:12:36 +01:00
7f254aae51 added small to large cog recipes (#1571) Pyritie 2025-08-09 14:09:19 +01:00
97a81e4989 update emi category order Gustavo 2025-08-09 12:11:15 +10:00
1bc04a7a04 add EMI category lang key Gustavo 2025-08-09 12:05:21 +10:00
37e1e2d28b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Gustavo 2025-08-09 11:48:08 +10:00
68e3dc10bc change depth lang key Gustavo 2025-08-09 11:48:06 +10:00
bca574914b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-09 02:13:47 +01:00
2e46016678 changelog for #1554 Pyritie 2025-08-09 02:13:44 +01:00
a09661dd3e lye -> sodium hydroxide Pyritie 2025-08-09 02:12:59 +01:00
253414026d lang key update Gustavo 2025-08-09 10:44:20 +10:00
2915e03744 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Gustavo 2025-08-09 10:33:38 +10:00
0ff8d09856 add translation keys Gustavo 2025-08-09 10:33:36 +10:00
8991740d2a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-09 01:24:25 +01:00
1802b586a7 changelog Pyritie 2025-08-09 01:18:19 +01:00
e53dcf2ea6 biomass and fish oil buffs, added sodium hydroxide to biodiesel from seed oil Pyritie 2025-08-09 01:18:14 +01:00
49b02972b4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Gustavo 2025-08-09 09:56:56 +10:00
26aad81bdd add missing ore item tags Gustavo 2025-08-09 09:56:54 +10:00
1bea67bb09 cleaned up the red alloy recipes, also fixed #1565 Pyritie 2025-08-09 00:47:58 +01:00
b0608183e9 fixes not being able to quern hardwood/softwood, removed strophar/aeronos caps from the log tag Pyritie 2025-08-09 00:34:06 +01:00
4664e60a98 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-08 23:43:06 +01:00
f992705780 added chalk knapping recipes for lower durability chalk items #1562 Pyritie 2025-08-08 23:43:00 +01:00
ec64419623 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Gustavo 2025-08-09 08:30:29 +10:00
7eda76d0c4 run lang merger Gustavo 2025-08-09 08:30:27 +10:00
4a2e6ed229 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-08 23:18:00 +01:00
9e33fb65ca pakku updates for snr, gt, tfclunchbox, greate Pyritie 2025-08-08 23:17:56 +01:00
d4b963ad74 Change the config of FTBQuests to be back to linear (#1568) TomPlop 2025-08-08 18:15:02 -04:00
966f4f000c Fix Pyrolyse Oven accepting other ender pearls (#1567) TomPlop 2025-08-08 18:09:24 -04:00
18919ae833 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-08 20:37:08 +01:00
d29c254dc4 Fix EHG for Logs and reduce cost by half (#1564) TomPlop 2025-08-08 15:23:38 -04:00
18835836a8 updated changelog Pyritie 2025-08-08 20:22:40 +01:00
f9abebb03b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-08 20:20:53 +01:00
cce674098d changed basin to cast iron ingots so you can actually use the mech press in the bronze age Pyritie 2025-08-08 20:20:48 +01:00
feec2487ef Fix infinite energy with Large Solar Arrays (#1563) TomPlop 2025-08-08 15:01:55 -04:00
125a6fc293 once again I break the modpack by committing on my lunch break, thanks krazh Pyritie 2025-08-08 17:24:50 +01:00
6f7ad3bf48 fixes #1559 Pyritie 2025-08-08 12:46:40 +01:00
65090aa58e fixed moon log spam Pyritie 2025-08-08 12:40:13 +01:00
f3bfbf6285 fixed aqueous accumulator Pyritie 2025-08-08 12:36:50 +01:00
be35e4e823 - railgun fanfare (#1557) Redeix 2025-08-08 03:25:12 -05:00
626bdb0de0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-08-08 01:06:05 +01:00
0ea561e78e removed rotting from canola Pyritie 2025-08-08 01:06:04 +01:00
d5a9528d4c Merge pull request #1552 from TerraFirmaGreg-Team/dev 0.10.7 Xikaro 2025-08-08 01:48:26 +03:00
308b14bcad Merge branch 'main' into dev Pyritie 2025-08-07 23:35:16 +01:00
0e9a56713b thanks pakku Pyritie 2025-08-07 23:30:02 +01:00
b08b673070 Merge pull request #1551 from TerraFirmaGreg-Team/dev 0.10.6 Xikaro 2025-08-08 01:12:07 +03:00
e0d8be434e whoops this isn't done yet Pyritie 2025-08-07 23:11:10 +01:00
9aa277a889 I know I'm going to get questions about this Pyritie 2025-08-07 23:06:08 +01:00
2c173e209f pull the trigger, piglet Pyritie 2025-08-07 23:02:08 +01:00
7af3303fe9 rapeseed -> canola Pyritie 2025-08-07 22:56:28 +01:00
c8f79aaa62 changelog, also added red granite knapping texture just cuz that's ugly to new players Pyritie 2025-08-07 22:46:18 +01:00
8c118d61f4 updated pakku Pyritie 2025-08-07 22:35:53 +01:00

... 27 28 29 30 31 ...