CC-Tweaked

mirrors/CC-Tweaked

0 Fork 0

mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-11-07 23:14:27 +00:00

Commit Graph

Select branches

Hide Pull Requests

build-tools

feature/dep-ver

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

mc-26.1

mc-26.2

mc-26.3

#1

#1/merge

#1000

#1002

#1009

#101

#1015

#1017

#1021

#1022

#1027

#1032

#1055

#1057

#1058

#1062

#1063

#1064

#1065

#1069

#1070

#1071

#1075

#1078

#1083

#1086

#1086/merge

#1092

#1095

#1096

#1099

#1100

#1101

#1106

#1112

#1114

#1114/merge

#1125

#1126

#1127

#1131

#1133

#1136

#1139

#115

#1156

#1170

#1172

#1182

#1188

#1189

#119

#1190

#1193

#1194

#1195

#1199

#12

#12/merge

#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/merge

#152

#1521

#1523

#153

#1531

#1532

#1537

#1542

#1549

#155

#1554

#1558

#1559

#1564

#1569

#1570

#1572

#1574

#1579

#1597

#1598

#1601

#1615

#1618

#1627

#164

#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

#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

#2140

#215

#216

#2164

#218

#2180

#2180/merge

#2189

#2194

#220

#2203

#221

#2211

#2214

#2224

#2232

#2238

#2238/merge

#2239

#2239/merge

#225

#226

#2260

#2263

#2265

#2265/merge

#227

#2272

#228

#2301

#2304

#2306

#2323

#2329

#2329/merge

#2333

#235

#236

#2367

#237

#2374

#2375

#2380

#2386

#2395

#2396

#2398

#2400

#2401

#2405

#241

#2412

#2414

#2416

#2417

#242

#2421

#2422

#2426

#2433

#2433/merge

#2436

#2458

#2458/merge

#246

#2467

#247

#248

#2485

#2485/merge

#2488

#2495

#2505

#2507

#2509

#2511

#2511/merge

#2513

#2518

#252

#2521

#2521/merge

#2523

#253

#259

#26

#26/merge

#267

#272

#274

#276

#280

#281

#287

#291

#292

#302

#31

#31/merge

#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/merge

#512

#513

#517

#522

#522/merge

#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/merge

#648

#65

#653

#656

#657

#66

#66/merge

#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.1-1.116.2

v1.20.1-1.117.0

v1.20.1-1.117.1

v1.20.1-1.118.0

v1.20.1-1.119.0

v1.20.1-1.120.0

v1.20.1-1.120.2

v1.20.1-1.121.0

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.1-1.116.2

v1.21.1-1.117.0

v1.21.1-1.117.1

v1.21.1-1.118.0

v1.21.1-1.119.0

v1.21.1-1.120.0

v1.21.1-1.120.2

v1.21.1-1.121.0

v1.21.11-1.117.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

v26.1.2-1.118.0

v26.1.2-1.118.1

v26.1.2-1.119.0

v26.1.2-1.120.0

v26.2-1.120.0

v26.2-1.120.1

v26.2-1.120.2

v26.3-1.120.2

v26.3-1.120.3

v26.3-1.121.0

6cae8e211e Update ServerComputer.java doomy64 2019-08-17 12:05:10 -05:00
a80302c513 Merge pull request #287 from Lignum/patch-1 Jonathan Coates 2019-08-15 06:59:59 +01:00
1c46949da7 Available Lignum 2019-08-15 07:37:02 +02:00
48b1b2f01d v1.14.4-1.83.2 parly 2019-08-09 22:22:15 +09:00
8c45fd362a Update to Minecraft 1.14.4 parly 2019-08-09 22:22:14 +09:00
07b13dd2b4 Prepare for cc-tweaked-fabric parly 2019-08-09 22:22:12 +09:00
07a56454a0 Bumpity bumpity bump v1.14.4-1.84.1 SquidDev 2019-08-09 09:38:30 +01:00
a0e72d02c8 Bump Forge version SquidDev 2019-08-06 08:33:39 +01:00
455a59ca85 Sure, you can be an actual release now SquidDev 2019-08-04 17:01:52 +01:00
46d78af068 Fix changelog being out-of-sync v1.12.2-1.84.0 SquidDev 2019-08-04 11:05:14 +01:00
08d22fd3df Fix changelog being out-of-sync v1.14.4-1.84.0 SquidDev 2019-08-04 11:05:14 +01:00
e6c691a8f8 Fix rom's location SquidDev 2019-08-04 11:02:07 +01:00
4b0e5c445c Merge branch 'master' into mc-1.14.x SquidDev 2019-08-04 10:57:20 +01:00
eb5cff1045 Alright, let's do this one last time SquidDev 2019-08-04 09:27:48 +01:00
35c7792aa2 Limit the titles of printed pages SquidDev 2019-08-04 08:59:44 +01:00
521688d630 Merge pull request #183 from SquidDev-CC/feature/thread-safe-inventories Jonathan Coates 2019-08-01 14:30:32 +01:00
75e2845c01 Remove synchronized from turtle inventory code SquidDev 2019-08-01 14:09:57 +01:00
2f96283286 Make disk drives thread-safe SquidDev 2019-04-02 13:17:06 +01:00
cbe6e9b5f5 Make printers thread-safe SquidDev 2019-04-02 12:45:54 +01:00
2ab79cf474 Version bumps 'n stuff SquidDev 2019-07-30 15:48:05 +01:00
6ce34aba79 A quick attempt at fixing Travis SquidDev 2019-07-30 15:25:14 +01:00
5eeb320b60 Include all mods within a resource mount SquidDev 2019-07-30 15:20:08 +01:00
93310850d2 Use the "cc" module namespace instead of "craftos" SquidDev 2019-07-27 11:34:36 +01:00
a2880b12ca Do not refuel beyond the turtle limit (#274) powerboat9 2019-07-24 07:15:02 +00:00
cef2657048 Fix turtles being replaced by leaves SquidDev 2019-07-21 10:28:22 +01:00
ccd85eb055 Bump Forge version SquidDev 2019-07-21 09:41:58 +01:00
303b57779a Fix turtles harvesting blocks when they shouldn't (#276) powerboat9 2019-07-17 04:23:14 -04:00
6279816ecc Try using the HTTP one instead SquidDev 2019-07-15 08:45:22 +01:00
4ae77261fa Petty changes because I'm petty SquidDev 2019-07-13 08:29:28 +01:00
4b7d843b78 Removed term.getLine liquid 2019-07-13 01:45:16 -05:00
1c28df65c3 Fixed style errors liquid 2019-07-12 23:54:56 -05:00
85b740f484 Added term.getLine and window.getLine liquid 2019-07-12 22:54:37 -05:00
f9929cb27d Fix the signature of loadfile SquidDev 2019-07-12 22:04:28 +01:00
bafab1ac07 Expose expect as a module (#267) SquidDev 2019-07-09 08:04:49 +01:00
e05c262468 Add more tests (#253) JakobDev 2019-07-08 10:24:05 +02:00
acfb72246c Bump JEI version SquidDev 2019-07-07 15:52:52 +01:00
9d51c4c340 Use world-specific collider entity SquidDev 2019-07-05 22:09:42 +01:00
18068effec Use reflection to get the record's sound SquidDev 2019-07-05 21:50:43 +01:00
7a3f7d3bba I'm a muppet SquidDev 2019-06-29 15:44:53 +01:00
95aa48c456 Allow running expectations against stubbed functions SquidDevandhydraz 2019-06-29 15:37:41 +01:00
6ea8ca991b Bump Forge to 1.14.3 v1.14.3-1.83.1 SquidDev 2019-06-26 08:25:32 +01:00
f1e551b960 Bump Forge version SquidDev 2019-06-23 15:30:29 +01:00
772c54ec74 Copy the item stack before merging SquidDev 2019-06-21 22:00:21 +01:00
13cb789c18 Fix "can deploy" check being entirely incorrect SquidDev 2019-06-21 21:51:22 +01:00
42220c4268 Fix several other client-only methods SquidDev 2019-06-21 21:32:15 +01:00
3052506e2e Reload configs from the file SquidDev 2019-06-21 21:32:02 +01:00
0741daa7eb Fix usage of a client-only method SquidDev 2019-06-21 21:01:40 +01:00
b4aa554279 Do not fetch the current block within onLoad SquidDev 2019-06-21 20:57:38 +01:00
8fe2abe0ae Forward tab key directly to the terminal SquidDev 2019-06-21 20:31:28 +01:00
5af789ae11 Bump Forge version SquidDev 2019-06-21 20:31:17 +01:00
904a168d5c Fix incorrect explosion check SquidDev 2019-06-21 18:53:14 +01:00
724441eddc Change URLs in build.gradle to https (#259) JakobDev 2019-06-21 17:51:55 +02:00
f68ab3edd1 Minor tweaks to build script SquidDev 2019-06-15 11:05:45 +01:00
68542aca3a Fix cable breaking rendering SquidDev 2019-06-15 09:19:37 +01:00
594bc4203c Fix block drops for computers and turtles SquidDev 2019-06-15 09:07:31 +01:00
57318b022d Merge branch 'master' into mc-1.14.x SquidDev 2019-06-15 08:00:20 +01:00
761159aa93 Bump Forge version SquidDev 2019-06-15 07:40:27 +01:00
29dce26bf6 Clean up checkstyle warning SquidDev 2019-06-14 20:55:32 +01:00
717ab69093 Add a few Checks (#248) JakobDev 2019-06-14 09:15:12 +02:00
138a2cf08f Merge branches 'copycheck' and 'renamefix' SquidDev 2019-06-13 08:03:35 +01:00
81daf82647 Add Checks to copy.lua JakobDev 2019-06-10 15:59:24 +02:00
f3798bfb63 Improve rename.lua's argument validation JakobDev 2019-06-10 15:31:38 +02:00
bc07dfad2e Make sure all writeDescription methods are pure SquidDev 2019-06-12 21:03:11 +01:00
8dd1c2a6cc Finish off containers, somewhat fix block drops SquidDev 2019-06-12 08:40:20 +01:00
d10b657a54 Initial work on GUIs SquidDev 2019-06-11 21:03:40 +01:00
f90da739eb And bump Forge again SquidDev 2019-06-09 09:46:52 +01:00
d9cadf64e8 Get the build working I guess? SquidDev 2019-06-09 09:07:31 +01:00
15d4a55cd8 Bump mappings and Forge versions SquidDev 2019-06-09 08:58:49 +01:00
309cbdb8be Add wget run (#218) JakobDev 2019-06-08 15:49:42 +02:00
39a9ad0ce7 Initial update to 1.14 SquidDev 2019-06-08 13:36:31 +01:00
0f3c44c926 Merge branch 'master' into mc-1.13.x mc-1.13.x SquidDev 2019-06-08 08:21:08 +01:00
a0e7c4a74c Add a little bit of source code checking to Gradle SquidDev 2019-06-08 00:28:03 +01:00
7d428030df Fix some warnings (#235) Lignum 2019-06-07 15:35:17 +02:00
00c395f689 Add Check to delete.lua (#236) JakobDev 2019-06-06 17:43:48 +02:00
d8e1c73d26 Ensure files cannot be closed multiple times SquidDev 2019-06-04 21:34:19 +01:00
ffa4cc241b Add a test utility for capturing program output SquidDev 2019-06-03 20:33:09 +01:00
6f1b740c8f Un-localise paths in mount error messages SquidDev 2019-06-03 19:58:16 +01:00
3406ba3ebf Fix a build from a clean state failing SquidDev 2019-06-02 18:48:36 +01:00
45e84e1ede Merge branch 'mc-1.13.x' into mc-1.14-fabric v1.14.2-1.83.1 mc-1.14-fabric SquidDev 2019-06-02 18:41:53 +01:00
b6715bd812 Fix a couple of build failures v1.13.2-1.83.1 SquidDev 2019-06-02 18:36:23 +01:00
725dfa764f Add highlight rendering for monitors and cables SquidDev 2019-06-02 18:09:28 +01:00
c221502ec9 Correctly offset touch position on a monitor SquidDev 2019-06-02 18:06:24 +01:00
234f18c228 Merge branch 'mc-1.13.x' into mc-1.14-fabric SquidDev 2019-06-02 17:54:00 +01:00
006ad109cb Update to 1.14.2 SquidDev 2019-06-02 17:42:07 +01:00
18aee02221 Mark CurseForge builds as release SquidDev 2019-06-02 17:28:13 +01:00
401bbf2e6a Fix turtle block placing failing SquidDev 2019-06-02 17:25:49 +01:00
7467b7f88a Fix several deprecated warnings SquidDev 2019-06-02 17:23:33 +01:00
c82d8a7c2a Merge branch 'master' into mc-1.13.x SquidDev 2019-06-02 16:46:45 +01:00
6b81bcf334 Bump version v1.12.2-1.83.1 SquidDev 2019-06-02 16:11:18 +01:00
3d67421d98 Bump Forge version SquidDev 2019-06-02 16:18:44 +01:00
acac70675d Add link to CF on the README SquidDev 2019-06-01 15:14:28 +01:00
56434259c1 Add Checks for Turtle and Pocket programs (#226) JakobDev 2019-06-01 13:48:33 +02:00
da7e4b9016 Add more MOTD messages. (#225) JakobDev 2019-06-01 13:41:01 +02:00
d4b8650d21 Use select('#', ...) instead of ipairs on varargs SquidDev 2019-06-01 10:12:10 +01:00
17645a79f0 Fix type check on rednet.lookup SquidDev 2019-06-01 09:23:18 +01:00
ce1f14a010 Fix a couple of problems in the release buildscript SquidDev 2019-05-31 13:56:48 +01:00
43050426de Bump version v1.12.2-1.83.0 SquidDev 2019-05-31 13:53:15 +01:00
b05f60c98b Add small task to verify changelog is correct SquidDev 2019-05-31 10:19:24 +01:00
c44c560f96 Update changelog and whatsnew SquidDev 2019-05-31 09:35:45 +01:00
e839ef54af Forbid mutating empty_json_array SquidDev 2019-05-30 20:01:09 +01:00

... 27 28 29 30 31 ...