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

3fe538e35d gui fix Xikaro 2024-01-12 09:36:15 +05:00
2076053aeb main_menu Xikaro 2024-01-12 08:35:30 +05:00
ad34a8f1da use our kjs plugin Dmitry 2024-01-12 10:23:05 +07:00
677b5d4157 buildtools Xikaro 2024-01-12 08:17:32 +05:00
f6f0c9d225 workflows Xikaro 2024-01-12 08:15:43 +05:00
b3b466f509 Отказоустойчивая система Dmitry 2024-01-12 10:08:32 +07:00
6382341715 Update test.yml Xikaro 2024-01-12 08:07:32 +05:00
829c7d6489 Update test.yml Xikaro 2024-01-12 08:05:35 +05:00
e7b98b256c Update test.yml Xikaro 2024-01-12 07:59:11 +05:00
680b21dfc7 Update test.yml Xikaro 2024-01-12 07:55:47 +05:00
0271b11577 Update test.yml Xikaro 2024-01-12 07:53:55 +05:00
9ab75101a0 workflows Xikaro 2024-01-12 07:50:28 +05:00
ef1716a1ad drop this big dictionary Dmitry 2024-01-12 09:48:33 +07:00
795e3620b6 Update release.yml 0.5.1 Xikaro 2024-01-12 07:26:33 +05:00
f41316b0b6 manifest Xikaro 2024-01-12 07:14:25 +05:00
7c6f8b25ad Update mods Xikaro 2024-01-12 07:10:49 +05:00
dcef88fb51 Update main_client_script.js Dmitry 2024-01-12 09:04:50 +07:00
5a059decd3 Update CHANGELOG.md Dmitry 2024-01-12 09:04:46 +07:00
6748e20e7a dead Dmitry 2024-01-12 09:02:11 +07:00
59cda1a59b fix butchery knifes + fix rock anvil quest Dmitry 2024-01-12 07:53:06 +07:00
bfa65c1eb1 Update release.yml Xikaro 2024-01-12 04:04:20 +05:00
a612863f98 buildtools Xikaro 2024-01-12 03:52:18 +05:00
d21fb080a6 Update test.yml Xikaro 2024-01-12 02:18:34 +05:00
9b7c2c7d64 workflows Xikaro 2024-01-12 02:16:18 +05:00
fed78b6e98 Update test.yml Xikaro 2024-01-12 02:14:34 +05:00
3f66b48190 Update test.yml Xikaro 2024-01-12 02:13:51 +05:00
7373ff0731 workflows test Xikaro 2024-01-12 02:12:46 +05:00
a32987ae8f Update release.yml Xikaro 2024-01-12 01:36:35 +05:00
b0dfd61924 Update CHANGELOG.md 0.5.0 Xikaro 2024-01-12 01:12:19 +05:00
66cf2a60d6 Update release.yml Xikaro 2024-01-12 01:01:55 +05:00
a52ff086a6 manifest Xikaro 2024-01-12 01:01:52 +05:00
dfcf2827d6 Update client_mod.txt Xikaro 2024-01-12 01:01:47 +05:00
6e104ba3cb Update mods Xikaro 2024-01-12 00:55:36 +05:00
85e93da600 workflows Xikaro 2024-01-12 00:55:34 +05:00
92a62a4616 Update embeddium++.toml Xikaro 2024-01-11 23:54:09 +05:00
ce6bde2642 Update pause_menu.txt Xikaro 2024-01-11 23:53:59 +05:00
471756dca0 Update mods Xikaro 2024-01-11 23:48:31 +05:00
f90a097ba4 Merge pull request #176 from TerraFirmaGreg-Team/0.5.0 Dmitry 2024-01-11 20:16:32 +07:00
5ff36b04a8 Update recipes.js Dmitry 2024-01-11 20:16:12 +07:00
3c4efed789 123 Dmitry 2024-01-11 20:11:28 +07:00
d043b278d2 Подчищаем за кубом Dmitry 2024-01-11 20:08:56 +07:00
f078c696fe Update tags.js Dmitry 2024-01-11 17:36:02 +07:00
9b92f474ec some quest fixes Dmitry 2024-01-11 16:02:39 +07:00
2501ebc46e dead Dmitry 2024-01-11 15:35:56 +07:00
2a9d5b1eae Update mods Dmitry 2024-01-11 15:35:11 +07:00
b11954ee00 Revert "merge quests and 0.5.0" Dmitry 2024-01-11 15:35:08 +07:00
9def7797d1 merge quests and 0.5.0 Dmitry 2024-01-11 15:33:26 +07:00
b59b98fcfa Merge branch '0.5.0' into quests Dmitry 2024-01-11 15:29:11 +07:00
50f202191d Merge branch '0.5.0' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x into 0.5.0 Dmitry 2024-01-11 11:54:44 +07:00
447229c8e4 Fix #177 Dmitry 2024-01-11 11:54:34 +07:00
6d913237bf pause_menu Xikaro 2024-01-11 05:30:43 +05:00
7fd3c4958b что то сделал FriendlyCube 2024-01-10 20:45:45 +02:00
57e121051d Update CHANGELOG.md Dmitry 2024-01-10 23:54:29 +07:00
c4a0927113 dead Dmitry 2024-01-10 23:52:25 +07:00
4b21d22968 fix firmalife shit Dmitry 2024-01-10 23:44:01 +07:00
ed3ee66c7b Update CHANGELOG.md Dmitry 2024-01-10 22:13:59 +07:00
777998eb45 Update primitive_age.snbt Dmitry 2024-01-10 22:04:33 +07:00
39584e96f6 new crushing recipes Dmitry 2024-01-10 21:58:46 +07:00
c4962e7d28 probably fix tool quests Dmitry 2024-01-10 21:58:39 +07:00
36120fa53e bla bla Dmitry 2024-01-10 21:45:05 +07:00
f8aa4a1e38 Create data.js Dmitry 2024-01-10 21:15:26 +07:00
50d9b7a0d1 compat Dmitry 2024-01-10 21:15:20 +07:00
d21e1a9227 some Dmitry 2024-01-10 21:01:48 +07:00
5fa9e51652 Update mods Dmitry 2024-01-10 21:01:29 +07:00
1015ac8bf6 Update .gitignore Dmitry 2024-01-10 19:16:05 +07:00
c81340a5db Update mods Dmitry 2024-01-10 19:16:00 +07:00
6537a3aa2e emi cfg Dmitry 2024-01-10 18:55:09 +07:00
42559acf97 firmalife integration (I suppose) Dmitry 2024-01-10 18:55:04 +07:00
8332513790 fix size icon Xikaro 2024-01-10 15:39:08 +05:00
b4d2576f2a Update README.md Xikaro 2024-01-10 15:12:13 +05:00
9af2acbffc v3 gui Xikaro 2024-01-10 15:07:45 +05:00
d6fad80122 Update mods Dmitry 2024-01-10 14:50:52 +07:00
c4eced2c9f Update main_client_script.js Dmitry 2024-01-10 14:08:59 +07:00
80c1696ff1 fxi collapsing Dmitry 2024-01-10 14:07:59 +07:00
f907c98009 return REI Dmitry 2024-01-10 13:46:13 +07:00
fcfd91839a Update CHANGELOG.md Xikaro 2024-01-10 11:07:08 +05:00
cf59845c78 Merge branch 'main' into 0.5.0 Xikaro 2024-01-10 10:47:41 +05:00
2f456aa728 fix embeddium config Xikaro 2024-01-10 10:46:57 +05:00
005233433e Update mods Xikaro 2024-01-10 10:42:41 +05:00
58724af628 some recipes Dmitry 2024-01-10 12:16:47 +07:00
b9f5d0787a Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x Xikaro 2024-01-09 23:33:32 +05:00
57a2a6dfe7 gui Xikaro 2024-01-09 23:33:23 +05:00
549ae398ec Update client_mod.txt Xikaro 2024-01-09 23:30:40 +05:00
94bf85633d Apply #172 Dmitry 2024-01-09 18:18:23 +07:00
3c9134e070 fix films Dmitry 2024-01-09 18:13:19 +07:00
5691c75341 fix cc naming Dmitry 2024-01-09 17:50:25 +07:00
00e3c41120 Merge pull request #164 from TerraFirmaGreg-Team/143-integration-computercraft Dmitry 2024-01-09 17:44:51 +07:00
fcf0c04540 Merge branch '0.5.0' into 143-integration-computercraft Dmitry 2024-01-09 17:44:41 +07:00
c9f77e22e6 Update CHANGELOG.md Dmitry 2024-01-09 17:44:30 +07:00
818f04cb85 Merge pull request #168 from TerraFirmaGreg-Team/craft-in-ae2-and-ae2wtlib Dmitry 2024-01-09 17:41:55 +07:00
5bc6fb0fe5 ore fixes Dmitry 2024-01-09 17:36:27 +07:00
cc21b7a8a6 Merge branch '0.5.0' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x into 0.5.0 Dmitry 2024-01-09 13:08:05 +07:00
cdd8a48556 Update mods Dmitry 2024-01-09 13:07:57 +07:00
cdb306b1bd Update mods Xikaro 2024-01-09 11:06:38 +05:00
94e0194c82 cfg Dmitry 2024-01-09 12:40:42 +07:00
02390cc10f Update CHANGELOG.md Dmitry 2024-01-09 12:04:08 +07:00
1295060fd8 some recipes Dmitry 2024-01-09 09:11:45 +07:00
336e4dbb6d Update mods Dmitry 2024-01-09 09:11:31 +07:00
6727055cb8 Merge branch 'main' into 0.5.0 Dmitry 2024-01-09 08:28:20 +07:00
d89d2f5281 Merge branch 'main' into 0.5.0 Dmitry 2024-01-09 08:27:33 +07:00

... 62 63 64 65 66 ...