CC-Tweaked

mirrors/CC-Tweaked

Fork 0

mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-03 19:07:56 +00:00

Commit Graph

Select branches

Hide Pull Requests

build-tools

feature/lib-multipart

feature/network-visualiser

feature/onethread-cobalt

feature/pocket-computer-tooltip

feature/waluaigi

hotfix/item-group

master

mc-1.13.x

mc-1.14-fabric

mc-1.14.x

mc-1.15.x

mc-1.16.x

mc-1.17.x

mc-1.18.x

mc-1.19.2

mc-1.19.x

mc-1.20.x

mc-1.20.y

mc-1.21.x

mc-1.21.y

mc-1.4.7

#1

#1

#1000

#1002

#1009

#101

#1015

#1017

#1021

#1022

#1027

#1032

#1055

#1057

#1058

#1062

#1063

#1064

#1065

#1069

#1069

#1070

#1071

#1075

#1078

#1083

#1086

#1086

#1092

#1095

#1096

#1099

#1100

#1101

#1106

#1112

#1114

#1114

#1125

#1126

#1127

#1131

#1133

#1136

#1139

#115

#1156

#1170

#1172

#1182

#1188

#1189

#119

#1190

#1193

#1194

#1195

#1199

#12

#12

#120

#1200

#1203

#1205

#1208

#1209

#121

#1211

#1219

#1226

#123

#1231

#1232

#124

#1255

#1262

#1265

#1266

#1267

#127

#1273

#1275

#1276

#1277

#129

#1295

#1298

#1303

#1304

#1305

#1316

#1317

#1320

#1341

#1344

#1349

#1351

#1352

#1366

#137

#1376

#1378

#138

#139

#1391

#1414

#1417

#1421

#1430

#144

#1446

#145

#1453

#1457

#1461

#1465

#1467

#1469

#1480

#1481

#1485

#1489

#1494

#15

#1500

#151

#1510

#1511

#1517

#1517

#152

#1521

#1523

#153

#1531

#1532

#1537

#1542

#1542

#1549

#155

#1554

#1558

#1559

#1564

#1569

#1570

#1572

#1574

#1579

#1597

#1598

#1601

#1615

#1618

#1627

#1627

#164

#1647

#1647

#1656

#166

#1662

#167

#1678

#1679

#1683

#1684

#1689

#1692

#1747

#175

#1761

#1763

#1768

#1793

#1795

#1813

#182

#1823

#183

#1850

#186

#1860

#187

#188

#1888

#189

#1900

#1906

#1915

#1923

#1924

#1928

#1928

#1950

#1953

#1954

#1969

#1984

#1985

#1992

#2000

#2002

#2003

#2005

#2029

#203

#2037

#2044

#2047

#207

#2095

#2097

#2098

#210

#2117

#2119

#213

#2135

#2135

#2140

#215

#216

#2164

#2164

#218

#2180

#2180

#2189

#2194

#220

#2203

#221

#2211

#2214

#2224

#2232

#2238

#2238

#2239

#2239

#225

#226

#2260

#2263

#2263

#2265

#2265

#227

#2272

#228

#235

#236

#237

#241

#242

#246

#247

#248

#252

#253

#259

#26

#26

#267

#272

#274

#276

#280

#281

#287

#291

#292

#302

#31

#31

#311

#321

#323

#324

#327

#329

#331

#332

#333

#334

#341

#348

#350

#353

#358

#360

#365

#367

#368

#372

#378

#381

#392

#393

#395

#396

#399

#400

#403

#407

#408

#409

#410

#412

#418

#419

#420

#427

#431

#434

#436

#437

#440

#441

#443

#447

#453

#454

#455

#458

#459

#465

#467

#474

#475

#478

#484

#488

#490

#491

#5

#500

#506

#508

#510

#510

#512

#513

#517

#522

#522

#527

#529

#533

#546

#549

#55

#553

#554

#556

#560

#562

#563

#570

#571

#576

#580

#582

#583

#586

#588

#589

#592

#595

#602

#603

#606

#623

#632

#637

#638

#639

#64

#64

#648

#65

#653

#656

#657

#66

#66

#662

#663

#664

#668

#672

#675

#677

#68

#680

#681

#683

#685

#690

#704

#709

#723

#738

#740

#742

#743

#749

#755

#760

#778

#779

#780

#782

#787

#790

#794

#800

#804

#807

#809

#815

#816

#817

#819

#826

#829

#833

#840

#842

#848

#849

#85

#857

#858

#859

#86

#862

#863

#873

#881

#895

#900

#907

#908

#916

#918

#920

#921

#924

#925

#926

#927

#929

#935

#936

#941

#954

#957

#963

#965

#967

#969

#977

#98

#982

#990

#993

1.79

1.80pr0

1.80pr1

1.91.1

1.91.1-beta

V1.97.1-beta

v1.12.2-1.81.0

v1.12.2-1.81.1

v1.12.2-1.82.0

v1.12.2-1.82.1

v1.12.2-1.82.2

v1.12.2-1.82.3

v1.12.2-1.83.0

v1.12.2-1.83.1

v1.12.2-1.84.0

v1.12.2-1.85.0

v1.12.2-1.85.1

v1.12.2-1.85.2

v1.12.2-1.86.0

v1.12.2-1.86.1

v1.12.2-1.86.2

v1.12.2-1.87.0

v1.12.2-1.88.0

v1.12.2-1.89.0

v1.12.2-1.89.1

v1.12.2-1.89.2

v1.13.2-1.82.0

v1.13.2-1.82.3

v1.13.2-1.83.1

v1.14-1.82.3

v1.14.2-1.83.1

v1.14.3-1.83.1

v1.14.4-1.84.0

v1.14.4-1.84.1

v1.14.4-1.85.0

v1.14.4-1.85.1

v1.14.4-1.85.2

v1.14.4-1.86.0

v1.14.4-1.86.1

v1.14.4-1.86.2

v1.14.4-1.87.0

v1.14.4-1.87.1

v1.14.4-1.88.0

v1.14.4-1.89.0

v1.14.4-1.89.1

v1.14.4-1.89.2

v1.15.2-1.86.2

v1.15.2-1.87.0

v1.15.2-1.87.1

v1.15.2-1.88.0

v1.15.2-1.88.1

v1.15.2-1.89.0

v1.15.2-1.89.1

v1.15.2-1.90.0

v1.15.2-1.90.2

v1.15.2-1.91.0

v1.15.2-1.92.0

v1.15.2-1.93.0

v1.15.2-1.93.1

v1.15.2-1.94.0

v1.15.2-1.95.0

v1.15.2-1.95.1

v1.15.2-1.95.2

v1.15.2-1.95.3

v1.15.2-1.96.0

v1.15.2-1.97.0

v1.15.2-1.97.1

v1.16.1-1.90.0

v1.16.1-1.90.1

v1.16.1-1.90.2

v1.16.1-1.90.3

v1.16.2-1.91.0

v1.16.2-1.91.1

v1.16.3-1.92.0

v1.16.3-1.93.0

v1.16.3-1.93.1

v1.16.4-1.94.0

v1.16.4-1.95.0

v1.16.4-1.95.1

v1.16.4-1.95.2

v1.16.4-1.95.3

v1.16.4-1.96.0

v1.16.5-1.100.0

v1.16.5-1.100.1

v1.16.5-1.100.10

v1.16.5-1.100.2

v1.16.5-1.100.3

v1.16.5-1.100.4

v1.16.5-1.100.5

v1.16.5-1.100.6

v1.16.5-1.100.8

v1.16.5-1.100.9

v1.16.5-1.101.0

v1.16.5-1.101.2

v1.16.5-1.101.3

v1.16.5-1.96.2-ccr

v1.16.5-1.96.3-ccr

v1.16.5-1.97.0

v1.16.5-1.98.0

v1.16.5-1.98.1

v1.16.5-1.98.2

v1.16.5-1.99.0

v1.16.5-1.99.1

v1.17.1-1.100.0

v1.17.1-1.100.1

v1.17.1-1.100.2

v1.17.1-1.100.3

v1.17.1-1.100.4

v1.17.1-1.97.4-ccr

v1.17.1-1.97.5-ccr

v1.17.1-1.98.1

v1.17.1-1.98.2

v1.17.1-1.99.0

v1.17.1-1.99.1

v1.18-1.99.0

v1.18.1-1.100.0

v1.18.1-1.100.1

v1.18.1-1.100.2

v1.18.1-1.100.3-ccr

v1.18.1-1.99.1

v1.18.1-1.99.1-alpha-ccr

v1.18.1-1.99.2-alpha1-ccr

v1.18.2-1.100.10

v1.18.2-1.100.2-ccr

v1.18.2-1.100.3

v1.18.2-1.100.3-ccr

v1.18.2-1.100.4

v1.18.2-1.100.4-ccr

v1.18.2-1.100.5

v1.18.2-1.100.5-ccr

v1.18.2-1.100.6

v1.18.2-1.100.8

v1.18.2-1.100.9

v1.18.2-1.101.0

v1.18.2-1.101.2

v1.18.2-1.101.3

v1.18.x-1.100.0-ccr

v1.18.x-1.100.0-rc.1-ccr

v1.18.x-1.100.1-ccr

v1.18.x-1.100.2-ccr

v1.19-1.100.6

v1.19-1.100.7

v1.19-1.100.8

v1.19.1-1.100.9

v1.19.2

v1.19.2-1.100.10

v1.19.2-1.101.0

v1.19.2-1.101.1

v1.19.2-1.101.2

v1.19.2-1.101.3

v1.19.2-1.101.4

v1.19.3-1.102.0

v1.19.3-1.102.1

v1.19.3-1.102.2

v1.19.3-1.103.0

v1.19.3-1.103.1

v1.19.4-1.104.0

v1.19.4-1.105.0

v1.19.4-1.106.0

v1.19.4-1.106.1

v1.19.4-1.107.0

v1.19.4-1.108.0

v1.20-1.105.0

v1.20.1-1.105.0

v1.20.1-1.106.0

v1.20.1-1.106.1

v1.20.1-1.107.0

v1.20.1-1.108.0

v1.20.1-1.108.1

v1.20.1-1.108.2

v1.20.1-1.108.3

v1.20.1-1.108.4

v1.20.1-1.109.0

v1.20.1-1.109.1

v1.20.1-1.109.2

v1.20.1-1.109.3

v1.20.1-1.109.4

v1.20.1-1.109.5

v1.20.1-1.109.6

v1.20.1-1.109.7

v1.20.1-1.110.0

v1.20.1-1.110.1

v1.20.1-1.110.2

v1.20.1-1.110.3

v1.20.1-1.111.0

v1.20.1-1.112.0

v1.20.1-1.113.0

v1.20.1-1.113.1

v1.20.1-1.114.0

v1.20.1-1.114.1

v1.20.1-1.114.2

v1.20.1-1.114.3

v1.20.1-1.114.4

v1.20.1-1.115.0

v1.20.1-1.115.1

v1.20.1-1.116.0

v1.20.1-1.116.1

v1.20.4-1.109.5

v1.20.4-1.109.6

v1.20.4-1.110.0

v1.20.4-1.110.2

v1.20.5-1.110.3

v1.20.6-1.111.0

v1.21-1.111.0

v1.21-1.111.1

v1.21-1.112.0

v1.21.1-1.113.0

v1.21.1-1.113.1

v1.21.1-1.114.0

v1.21.1-1.114.2

v1.21.1-1.114.3

v1.21.1-1.114.4

v1.21.1-1.114.5

v1.21.1-1.115.0

v1.21.1-1.115.1

v1.21.1-1.116.0

v1.21.1-1.116.1

v1.21.4-1.115.1

v1.21.7-1.116.0

v1.21.7-1.116.1

v1.21.8-1.116.1

v1.4.7-1.105.0

v1.4.7-1.105.1

v1.4.7-1.108.1

v1.80pr1.1

v1.80pr1.10

v1.80pr1.11

v1.80pr1.12

v1.80pr1.13

v1.80pr1.14

v1.80pr1.2

v1.80pr1.3

v1.80pr1.4

v1.80pr1.5

v1.80pr1.6

v1.80pr1.7

v1.80pr1.8

v1.80pr1.9

v1.91.2

v1.92.0

v1.93.0

v1.93.1

v1.94.0

v1.94.1-beta

v1.95.0-beta

v1.95.3

v1.96.0

v1.96.1-beta

v1.96.1-rc1

v1.97.2

v1.97.3

v19w14a-1.82.0

7b2d482387 Make the CF release stable SquidDev 2020-06-16 09:45:42 +01:00
2b077554f7 Merge branch 'mc-1.14.x' into mc-1.15.x v1.15.2-1.89.0 SquidDev 2020-06-16 09:24:14 +01:00
9134f243c1 Merge branch 'master' into mc-1.14.x v1.14.4-1.89.0 SquidDev 2020-06-15 22:05:02 +01:00
c0f3ca81fb Bump to 1.89.0 v1.12.2-1.89.0 SquidDev 2020-06-15 21:37:08 +01:00
190ed4fd20 Fix incorrect disk drive method name SquidDev 2020-06-11 21:19:14 +01:00
b9ff9b7f90 Allow returning lua functions SquidDev 2020-06-03 21:44:08 +01:00
b9b8121be9 Expose tags for turtle.{inspect,getItemDetail} SquidDev 2020-06-01 11:14:36 +01:00
014bf55cd4 Cherry pick several improvements from #455 Lignum 2020-05-31 17:23:49 +01:00
085ae2e74a Use an older version of GLSL (#459) Lignum 2020-05-28 12:06:14 +02:00
4ff33f165d Fetch MVP matrix in monitor shader instead (#454) Lignum 2020-05-25 12:19:03 +02:00
d929c02d2a Fix settings loading failing for defined settings SquidDev 2020-05-24 12:16:51 +01:00
d50a08a549 Rewrite monitor networking (#453) Jonathan Coates 2020-05-20 08:44:44 +01:00
c493d668c8 Bump version v1.15.2-1.88.1 SquidDev 2020-05-17 17:02:17 +01:00
53477fd3a1 Fix several AIOB exceptions SquidDev 2020-05-17 16:58:19 +01:00
87aa839b60 Upgrade the release to beta v1.15.2-1.88.0 SquidDev 2020-05-16 10:20:16 +01:00
e02ccdcb1a Fix incorrect shadowing SquidDev 2020-05-16 10:19:25 +01:00
f36f532c63 Migrate config to the server (rather than common) SquidDev 2020-05-15 23:05:14 +01:00
5a816917d5 Normalise config names SquidDev 2020-05-15 22:49:12 +01:00
7af63d052d Make many more http options domain-specific SquidDev 2020-05-15 22:44:46 +01:00
4f8217d1ab Implement IPeripheral.getTarget on a few additional TEs SquidDev 2020-05-15 17:34:00 +01:00
5409d441b5 Expose peripherals as a capability SquidDev 2020-05-15 17:09:12 +01:00
d5f82fa458 Replace getMethodNames/callMethod with annotations (#447) Jonathan Coates 2020-05-15 13:21:16 +01:00
d0deab3519 Update changelog to include some missing things SquidDev 2020-05-15 10:48:31 +01:00
d5a8df753a Merge branch 'mc-1.14.x' into mc-1.15.x SquidDev 2020-05-15 10:36:23 +01:00
13de2c4dd0 Fix location of cc.require v1.14.4-1.88.0 SquidDev 2020-05-15 10:28:35 +01:00
906280225e Merge branch 'master' into mc-1.14.x SquidDev 2020-05-15 10:19:57 +01:00
161a5b4707 Document and test the redstone library v1.12.2-1.88.0 SquidDev 2020-05-15 10:03:47 +01:00
c6b6b4479c Update changelog and fix doc typo SquidDev 2020-05-14 19:23:47 +01:00
96e7b60285 Display function arguments and positions in the REPL SquidDev 2020-05-14 19:11:57 +01:00
086fccd997 Move the package library into a separate module SquidDev 2020-05-14 17:27:50 +01:00
5dfaf6eee9 Merge branch 'mc-1.14.x' into mc-1.15.x Jonathan Coates 2020-05-13 15:28:05 +01:00
e251dd066c Fix test failures Jonathan Coates 2020-05-13 15:27:50 +01:00
9abcfe56ea Create the coverage directory before writing SquidDev 2020-05-13 14:41:50 +01:00
abbc641fd4 Merge branch 'mc-1.14.x' into mc-1.15.x SquidDev 2020-05-13 14:36:39 +01:00
c60dcb4f5a Fix deprecated usage SquidDev 2020-05-13 14:04:32 +01:00
4be0b15afa Merge branch 'master' into mc-1.14.x SquidDev 2020-05-13 14:04:28 +01:00
a4ae36b6b3 Bump version to 1.88.0 SquidDev 2020-05-13 13:43:40 +01:00
ac075d9f53 Allow using command computers in survival mode SquidDev 2020-05-13 10:26:59 +01:00
05d7be0362 Improvements to the various file system programs (rm, mv, rename) (#440) Lupus590 2020-05-12 11:32:48 +01:00
9a71dc1a26 Copy across a bunch of 5.1/5.3 io tests SquidDev 2020-05-11 18:05:23 +01:00
156023b154 Create more work for myself SquidDev 2020-05-11 16:08:23 +01:00
6b3773a862 Run tests with coverage SquidDev 2020-05-11 15:41:39 +01:00
376d628cf0 Make the local Lua message a little shorter Jonathan Coates 2020-05-09 08:30:55 +01:00
44062ebd52 Allow lua REPL to warn about using local variables (#367) Lupus590 2020-05-08 16:07:33 +01:00
5739285fc2 Finish off documentation for the commands API Jonathan Coates 2020-05-05 21:17:52 +01:00
70b457ed18 Add a monitor renderer using TBOs (#443) Jonathan Coates 2020-05-05 13:05:23 +01:00
ca2995ed38 Merge branch 'mc-1.14.x' into mc-1.15.x SquidDev 2020-05-04 10:28:55 +01:00
6816931659 Merge branch 'master' into mc-1.14.x SquidDev 2020-05-04 10:28:15 +01:00
1547ecbeb3 Fix incorrect palette serialisation SquidDev 2020-05-04 10:26:20 +01:00
e918f55b58 Merge branch 'mc-1.14.x' into mc-1.15.x SquidDev 2020-05-04 10:05:32 +01:00
c28b468844 Update languages and language script SquidDev 2020-05-04 09:57:38 +01:00
052cf8ee7d Merge branch 'master' into mc-1.14.x SquidDev 2020-05-04 09:39:54 +01:00
550ada2f9e Restore previous behaviour for unknown colours SquidDev 2020-05-04 09:15:23 +01:00
17b7727262 Improve serialisation of terminals SquidDev 2020-05-03 10:34:24 +01:00
4553e404b2 Merge pull request #437 from SquidDev-CC/feature/keep-ids Jonathan Coates 2020-05-03 06:54:04 +01:00
a565a571f9 Return the peripheral name when wrapping (#436) Drew Lemmy 2020-05-03 06:53:42 +01:00
fb64b6017b Add shell.execute SquidDev 2020-05-02 11:05:09 +01:00
ed4229ab70 Keep ids of unlabelled computers and turtles SquidDev 2020-05-02 10:19:30 +01:00
3fb906ef6c Show computer/disk ids in the tool tip more often SquidDev 2020-05-02 10:16:36 +01:00
e1663f3df0 Fix malformed doc comments Jonathan Coates 2020-05-01 08:50:44 +01:00
52c6584c81 Fix treasure disk colour handler SquidDev 2020-04-30 11:33:31 +01:00
9f87eda5de Load treasure disks from various loot tables SquidDev 2020-04-30 11:19:46 +01:00
697e9449cf Delete existing treasure disks SquidDev 2020-04-30 10:59:55 +01:00
76c3e4c155 Merge branch 'mc-1.14.x' into mc-1.15.x SquidDev 2020-04-29 17:37:53 +01:00
358289b5f9 Merge branch 'master' into mc-1.14.x SquidDev 2020-04-29 17:37:36 +01:00
5eec24676f Prevent computers scanning peripherals twice SquidDev 2020-04-29 17:37:02 +01:00
f52b8fa2de Bump mappings version SquidDev 2020-04-29 16:23:18 +01:00
447c3ab125 Clean up dance.lua Jonathan Coates 2020-04-28 09:51:06 +01:00
8fac68386e Fix usages of global variables Jonathan Coates 2020-04-28 09:42:34 +01:00
a3021c4697 Merge branch 'mc-1.14.x' into mc-1.15.x v1.15.2-1.87.1 SquidDev 2020-04-24 18:44:29 +01:00
b7c61f9c6d Bump version v1.14.4-1.87.1 SquidDev 2020-04-24 18:34:01 +01:00
08a0342618 Fix block drop data being generated in the incorrect place SquidDev 2020-04-24 16:41:46 +01:00
3d7a81696d Merge branch 'mc-1.14.x' into mc-1.15.x v1.15.2-1.87.0 SquidDev 2020-04-23 10:58:30 +01:00
48cb032ddf Also publish on releases v1.14.4-1.87.0 SquidDev 2020-04-23 10:54:12 +01:00
33260a7747 Merge branch 'mc-1.14.x' into mc-1.15.x SquidDev 2020-04-23 10:04:37 +01:00
a049502d12 Merge branch 'master' into mc-1.14.x SquidDev 2020-04-23 10:03:45 +01:00
ae7ef66dfa Bump version v1.12.2-1.87.0 SquidDev 2020-04-23 09:56:56 +01:00
9748679484 Add mouse support for the menu in edit and paint (#419) JakobDev 2020-04-23 10:33:35 +02:00
da419b24e7 Enable motd on non-pocket and command computers SquidDev 2020-04-22 17:44:13 +01:00
7f57a977a1 Make the CF link https on tweaked.cc Jonathan Coates 2020-04-22 14:48:42 +01:00
2f42a4e85b Add documentation for shell and multishell Jonathan Coates 2020-04-22 14:39:39 +01:00
af40f5ae5c Add back CraftTweaker integration SquidDev 2020-04-22 11:11:02 +01:00
759d02a249 Some post-merge cleanup SquidDev 2020-04-22 11:04:29 +01:00
d7729337ac Merge branch 'mc-1.14.x' into mc-1.15.x SquidDev 2020-04-22 10:39:00 +01:00
ee391ae9ea Register a fake renderer for turtle players SquidDev 2020-04-22 10:17:31 +01:00
4ed4a6409b Skip the src/generated file in check-lines SquidDev 2020-04-22 10:07:43 +01:00
e5cc345f49 Some cleanup to the Lua programs SquidDev 2020-04-22 10:00:43 +01:00
d847a4d9e0 Merge branch 'master' into mc-1.14.x SquidDev 2020-04-22 09:45:23 +01:00
f106733d71 Redo how http block/allow lists are stored. (#396) Jonathan Coates 2020-04-22 08:58:21 +01:00
f3de97d67f Remove / and \ at the start of shell.setDir() (#410) JakobDev 2020-04-22 07:30:49 +02:00
544f276ff0 Merge pull request #418 from Wojbie/settings-save-fix Jonathan Coates 2020-04-21 17:52:10 +01:00
463635a459 Fix save() sPath param. Wojbie 2020-04-21 18:28:55 +02:00
3b7b845930 Some tiny bits of documentation cleanup SquidDev 2020-04-21 12:12:44 +01:00
1fc0214857 Some redesigning of the settings API (#408) Jonathan Coates 2020-04-21 11:37:56 +01:00
11bf601db9 Backport 1.15's terminal rendering code (#412) Jonathan Coates 2020-04-21 10:43:26 +01:00
7c1154ddfc Avoid shadowing of names in peripheral.isPresent SquidDev 2020-04-21 08:51:49 +01:00
df557e03fa Fix turtles incorrectly handling waterlogged blocks SquidDev 2020-04-20 20:25:09 +01:00
524b6f1d8a Make a bunch of config fields private SquidDev 2020-04-20 20:24:16 +01:00
cea8be7efa Fix terrible grammar in the README SquidDev 2020-04-20 12:01:44 +01:00
c5f918ad95 Increase the maximum limit for websocket messages SquidDev 2020-04-19 20:11:49 +01:00