factorio-clusterio

aperx/factorio-clusterio

0 Fork 0

mirror of https://github.com/clusterio/clusterio.git synced 2026-11-11 23:04:52 +09:00

Commit Graph

Select branches

Hide Pull Requests

1.2.x

2.1

copilot/update-host-id-uniqueness-message

cursor/manage-host-factorio-versions-772f

doomsday-save-point

feature/proxy-lobby

feature/windows-headless-support

fix/esm-package-runtime

fix/player-sync-create-character

fix/stream-reject-closes-connection

fix/subscriber-connector-listeners

master

plugin-minimap

proxy-stopped-instances

remoteMap

remoteMap-ts-refactor

#1

#1000

#1010

#1011

#1012

#1013

#1014

#1015

#1016

#1017

#1018

#1019

#1020

#1021

#1022

#1023

#1024

#1025

#1026

#1027

#1028

#1029

#1030

#1031

#1032

#1033

#1034

#1035

#1036

#1037

#1038

#1039

#1040

#1041

#1042

#1043

#1044

#1045

#1047

#1048

#1049

#1050

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#106

#1060

#1061

#1062

#1064

#1066

#1067

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#1080

#1081

#1082

#1085

#1086

#1087

#1088

#1089

#1090

#1095

#1096

#1097

#1098

#11

#1104

#1106

#1107

#1111

#1112

#1113

#1114

#1115

#1116

#1117

#1119

#1120

#1120/merge

#1121

#1122

#1125

#1128

#1129

#1130

#1132

#1133

#1136

#1137

#1138

#1139

#1140

#1141

#1142

#1143

#1144

#1146

#1147

#1148

#1149

#1150

#1151

#1152

#1153

#1154

#1155

#1156

#1157

#1158

#1159

#1160

#1161

#1162

#1163

#1164

#1166

#1167

#1168

#117

#1170

#1171

#1171/merge

#1172

#1173

#1173/merge

#1174

#1175

#1176

#1177

#1178

#1179

#1180

#1181

#1182

#1183

#1184

#1185

#1188

#1189

#1189/merge

#1195

#1195/merge

#1196

#1196/merge

#1197

#1197/merge

#1198

#1199

#1199/merge

#120

#123

#125

#125/merge

#127

#128

#129

#13

#130

#131

#132

#133

#135

#138

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#158

#159

#160

#162

#163

#164

#165

#166

#167

#168

#169

#170

#171

#172

#173

#174

#175

#176

#178

#179

#18

#180

#181

#183

#184

#186

#187

#188

#19

#19/merge

#190

#191

#192

#193

#194

#195

#197

#199

#20

#203

#204

#205

#209

#210

#211

#212

#213

#215

#218

#219

#221

#222

#224

#225

#226

#227

#228

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#248

#249

#250

#251

#252

#253

#254

#255

#260

#261

#262

#263

#265

#266

#268

#269

#270

#271

#272

#274

#275

#276

#277

#278

#279

#280

#281

#282

#283

#284

#285

#287

#288

#289

#29

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#300

#301

#302

#304

#305

#307

#308

#31

#310

#311

#312

#313

#314

#315

#318

#320

#321

#323

#324

#325

#326

#327

#332

#335

#336

#337

#338

#339

#340

#341

#343

#344

#345

#346

#347

#348

#349

#351

#352

#353

#354

#355

#357

#358

#359

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#370

#371

#372

#373

#374

#376

#377

#378

#379

#380

#382

#383

#384

#385

#386

#388

#389

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#401

#402

#403

#404

#407

#408

#409

#411

#412

#413

#415

#417

#420

#421

#422

#423

#424

#425

#426

#427

#428

#430

#431

#432

#433

#434

#435

#436

#437

#439

#440

#441

#443

#444

#445

#446

#447

#450

#452

#453

#454

#455

#456

#458

#460

#461

#462

#463

#464

#466

#467

#468

#469

#470

#471

#472

#473

#475

#477

#478

#479

#480

#481

#483

#484

#485

#487

#488

#490

#492

#493

#494

#495

#496

#497

#498

#499

#5

#501

#502

#503

#504

#505

#508

#509

#510

#511

#516

#517

#518

#519

#520

#522

#524

#527

#528

#529

#530

#531

#532

#533

#534

#537

#538

#539

#54

#54/merge

#541

#542

#543

#544

#545

#546

#547

#55

#551

#552

#553

#554

#555

#556

#557

#558

#56

#560

#561

#562

#568

#569

#570

#571

#573

#574

#576

#577

#578

#579

#580

#582

#583

#584

#585

#586

#587

#590

#592

#598

#6

#600

#602

#603

#605

#606

#607

#613

#614

#616

#618

#619

#621

#622

#623

#624

#625

#626

#627

#628

#629

#630

#631

#632

#633

#635

#637

#638

#639

#640

#641

#642

#643

#646

#647

#648

#649

#652

#654

#655

#656

#657

#658

#659

#660

#661

#662

#663

#664

#665

#671

#672

#673

#674

#675

#677

#678

#679

#680

#681

#682

#683

#684

#685

#686

#692

#693

#694

#695

#696

#697

#701

#703

#704

#705

#706

#708

#709

#71

#711

#712

#713

#714

#72

#731

#732

#733

#734

#735

#738

#739

#74

#741

#742

#743

#746

#747

#748

#749

#75

#750

#753

#755

#756

#757

#758

#76

#762

#763

#764

#765

#766

#767

#77

#772

#777

#778

#780

#781

#782

#783

#785

#787

#788

#789

#79

#790

#791

#794

#798

#799

#80

#800

#801

#808

#809

#81

#811

#813

#815

#816

#817

#819

#82

#821

#823

#824

#825

#827

#829

#83

#830

#831

#832

#834

#836

#837

#838

#839

#84

#844

#845

#856

#857

#858

#862

#863

#864

#866

#868

#870

#871

#872

#873

#875

#877

#880

#881

#882

#885

#889

#890

#893

#894

#895

#896

#897

#901

#902

#909

#911

#913

#914

#915

#917

#918

#919

#92

#92/merge

#920

#920/merge

#921

#922

#924

#93

#930

#931

#932

#933

#935

#936

#937

#939

#94

#940

#941

#942

#943

#944

#945

#946

#947

#948

#95

#951

#952

#954

#955

#956

#957

#958

#959

#960

#961

#962

#963

#970

#971

#972

#973

#974

#975

#976

#977

#978

#979

#981

#982

#983

#984

#988

#989

#990

#991

#992

#993

#994

#995

#996

#997

#998

#999

1.0.0

1.1.0

1.2.0

1.2.1

1.2.2

1.2.3

1.2.4

clusterio_lib-0.1.0

clusterio_lib-0.1.1

v2.0.0

v2.0.0-alpha.0

v2.0.0-alpha.1

v2.0.0-alpha.10

v2.0.0-alpha.10.b

v2.0.0-alpha.10.c

v2.0.0-alpha.11

v2.0.0-alpha.12

v2.0.0-alpha.13

v2.0.0-alpha.14

v2.0.0-alpha.16

v2.0.0-alpha.17

v2.0.0-alpha.18

v2.0.0-alpha.19

v2.0.0-alpha.2

v2.0.0-alpha.20

v2.0.0-alpha.21

v2.0.0-alpha.21c

v2.0.0-alpha.22

v2.0.0-alpha.22b

v2.0.0-alpha.23

v2.0.0-alpha.24

v2.0.0-alpha.25

v2.0.0-alpha.26

v2.0.0-alpha.27

v2.0.0-alpha.3

v2.0.0-alpha.4

v2.0.0-alpha.5

v2.0.0-alpha.6

v2.0.0-alpha.7

v2.0.0-alpha.8

v2.0.0-alpha.9

v2.0.0-alpha.9.b

v2.0.1

v2.0.2

v2.0.3

b66df4d233 Merged branch master into dev Danielv123 2016-10-28 16:19:16 +02:00
1e6a46d8b3 Update README.md Daniel 2016-10-28 16:15:43 +02:00
dd0a216cb5 Merged dev into master Danielv123 2016-10-28 16:01:14 +02:00
09d511d0c8 No longer displays all subpages by default, performance on tab inactive Danielv123 2016-10-28 10:51:46 +02:00
85274220e7 Webpage now shows recently connected slaves, resolves #33 Danielv123 2016-10-28 09:51:42 +02:00
a90d78213a Basic serverside slaveawareness Danielv123 2016-10-27 22:41:25 +02:00
f6de6e026b Decreased logging, automatic configuring of multiple instances Danielv123 2016-10-27 09:21:26 +02:00
64009a7e16 Valid JSON config file Danielv123 2016-10-26 09:05:43 +02:00
656c05a30b Changed default config Danielv123 2016-10-26 08:57:50 +02:00
2234d41655 Housekeeping, more config settings Danielv123 2016-10-24 09:31:30 +02:00
234e6eba4c Merged branch instances into dev Danielv123 2016-10-24 08:59:47 +02:00
0927bec070 client.js now launches it's own server instance Thomas Deal 2016-10-23 14:43:06 -04:00
8fd13a7d04 Merged dev into master Danielv123 2016-10-21 16:58:48 +02:00
12ca57af61 More icon exceptions Danielv123 2016-10-21 16:00:40 +02:00
82f52c6e21 Item list sort after amount Danielv123 2016-10-21 15:39:39 +02:00
8562bccd5f Betterer icons Danielv123 2016-10-21 11:14:04 +02:00
3ea2530dab Moar icons :D Danielv123 2016-10-21 11:04:48 +02:00
59ddb289a8 Removed jumping related to icons Danielv123 2016-10-21 09:22:35 +02:00
6b6ffe5904 #8 Working on icons in masterGUI Danielv123 2016-10-20 22:47:36 +02:00
3d38bba455 Merged origin/master into master Danielv123 2016-10-20 22:45:59 +02:00
0133e36f8a Merged dev into master Danielv123 2016-10-20 22:45:47 +02:00
b30d9fa190 Merged branch master into dev Danielv123 2016-10-20 19:34:12 +02:00
854ed8fdd0 Report fluids correctly in Inventory Combinator Thomas Deal 2016-10-20 13:31:33 -04:00
528165367c Merge pull request #31 from Danielv123/dev Daniel 2016-10-20 13:27:07 +02:00
67fef2e543 Resolves #30 Danielv123 2016-10-20 13:25:52 +02:00
52b3e48eb8 Merged branch master into dev Danielv123 2016-10-20 09:17:11 +02:00
cf93377625 Merged branch master into dev Danielv123 2016-10-20 09:17:01 +02:00
67e5916790 Remove Lost bracket Thomas Deal 2016-10-19 22:26:56 -04:00
cc65d8c3c2 Locale updates Thomas Deal 2016-10-19 21:45:10 -04:00
bf2d16669d Support setting world ID, and if set, output it on the Inventory Combinator, and include it in transmitted frames. Thomas Deal 2016-10-19 21:42:09 -04:00
16ec26984a Typo Fixes, Uncomment virtual signals. Thomas Deal 2016-10-19 21:20:12 -04:00
67e192a78f More consistent handling of creation/destruction of entities. Uses entity.unit_number instead of HashPosition. Rebuilds all tables on initial install and on mod version bump. Thomas Deal 2016-10-19 20:41:10 -04:00
5e65fa5208 Add Inventory Combinator which reports the last inventory reported by the external code. Thomas Deal 2016-10-19 20:11:54 -04:00
09feb085ef Spelling fix Thomas Deal 2016-10-19 16:54:54 -04:00
7b44e830f8 Write files only to the server by default, changeable via setFilePlayer() Thomas Deal 2016-10-19 16:52:55 -04:00
2013eb5449 Update README.md Daniel 2016-10-19 18:19:58 +02:00
f896e0dc74 Merged dev into master Danielv123 2016-10-15 15:35:27 +02:00
23e0aef34e Merge pull request #29 from TheAIBot/master Daniel 2016-10-15 15:17:00 +02:00
5abaed00aa fixed bug where you couldn't make lubricant and sul acid. TheAIBot 2016-10-15 08:43:45 +02:00
3bea31cd45 Merge pull request #4 from Danielv123/dev TheAIBot 2016-10-14 16:43:14 +02:00
9d80769a12 MasterGUI basic production chart Danielv123 2016-10-13 13:23:54 +02:00
6b35a3eb47 MasterGUI navigation added Danielv123 2016-10-11 09:30:34 +02:00
2c66b25162 Merge pull request #3 from Danielv123/master TheAIBot 2016-10-10 00:47:19 +02:00
851fbe28e7 Merge remote-tracking branch 'refs/remotes/Danielv123/master' TheAIBot 2016-10-10 00:44:47 +02:00
4b3e5b0917 Merged dev into master Danielv123 2016-10-09 22:28:53 +02:00
640a8d4d21 Removed argument to improve compat with older node versions Danielv123 2016-10-09 22:28:20 +02:00
e5314f6ace Merge pull request #24 from Danielv123/dev Daniel 2016-10-09 11:39:15 +02:00
511e31f24f Merge branch 'master' Danielv123 2016-10-09 11:37:24 +02:00
8f426a1362 Updated readme Danielv123 2016-10-09 11:02:50 +02:00
a2d970fad6 Use the many option for signals instead Danielv123 2016-10-07 23:59:15 +02:00
87cfe1bc46 Sending signals over Clusterio now works Danielv123 2016-10-07 20:29:35 +02:00
a3aafd8b1d JS part of signals kinda finished but it aint working Danielv123 2016-10-07 17:54:23 +02:00
20c591bf71 Removed DB from repo Danielv123 2016-10-06 17:49:16 +02:00
b123d485d2 Slave sending combinator signals finished Danielv123 2016-10-06 17:47:03 +02:00
dfa8b573df Closes #21 Daniel 2016-10-03 21:07:58 +02:00
3fde2be222 Solved #21 Daniel 2016-10-03 21:06:31 +02:00
9011665a80 Merged branch master into dev Danielv123 2016-10-02 11:41:45 +02:00
134c8e4d92 Merge pull request #20 from Danielv123/dev Daniel 2016-10-02 10:21:56 +02:00
9b14da470e Use silent-command to avoid spamming chat. Thanks HanziQ! Danielv123 2016-10-02 10:20:05 +02:00
f9d6d9e001 Add Transmit/Receive Combinators. Transmit combinators are Deciders which also output into txbuffer.txt. Receive Combinators are Constants which replay frames received from external sources via remote calls to receiveFrame and recieveMany. Thomas Deal 2016-10-01 17:51:04 -04:00
4f8ad5eec6 Merge pull request #18 from Danielv123/dev Daniel 2016-10-01 23:35:36 +02:00
6d12bac32a Merged branch master into dev Danielv123 2016-10-01 19:03:02 +02:00
090910aeef Merge remote-tracking branch 'refs/remotes/Danielv123/master' TheAIBot 2016-10-01 02:46:06 +02:00
7e67ae5068 fixed up the last things about the output tank TheAIBot 2016-10-01 02:44:45 +02:00
9ca013590d fixed merge error TheAIBot 2016-10-01 02:27:08 +02:00
72cef84df5 Merge remote-tracking branch 'refs/remotes/origin/json-parser' TheAIBot 2016-10-01 02:26:29 +02:00
d22b7e3de4 multiplayer fixed TheAIBot 2016-10-01 02:26:08 +02:00
5670bdb77a Working on adding charts to master GUI Danielv123 2016-09-30 23:23:01 +02:00
379f8398c7 Merged branch dev into dev Danielv123 2016-09-30 19:27:40 +02:00
e33109703d Minor minor Danielv123 2016-09-30 19:16:46 +02:00
181e570972 Master webpage syntax Danielv123 2016-09-30 19:16:46 +02:00
9391b33cc9 Merge remote-tracking branch 'refs/remotes/Danielv123/master' TheAIBot 2016-09-30 18:24:44 +02:00
aa93af6d06 More cleanup Danielv123 2016-09-29 09:16:01 +02:00
db47320951 Removed outdated script Danielv123 2016-09-29 09:15:42 +02:00
d820c483e6 Merge pull request #15 from Danielv123/dev Daniel 2016-09-27 11:26:01 +02:00
da9d2c14dc Solved #14 and #10, preparing for prerelease Danielv123 2016-09-27 11:24:39 +02:00
1e65eb40c5 Changed up the tranfer format, everything works! Danielv123 2016-09-26 08:07:19 +02:00
06a4d49884 WIP, still not working Danielv123 2016-09-09 08:25:39 +02:00
129ef8d2f8 Tried to cache rcon requests, ended up with dupe machine Danielv123 2016-08-25 20:50:00 +02:00
e326ae093a Merge pull request #13 from TheAIBot/json-parser Daniel 2016-08-25 13:02:47 +02:00
f3c6fdaa3b added json parser for importMany TheAIBot 2016-08-23 22:51:54 +02:00
b3aa96cddf Merge remote-tracking branch 'refs/remotes/Danielv123/master' into json-parser TheAIBot 2016-08-23 22:49:27 +02:00
a12d818cdb Revert "Merge pull request #11 from TheAIBot/master" Daniel 2016-08-23 21:32:56 +02:00
3252eefcfc Merge pull request #11 from TheAIBot/master Daniel 2016-08-23 21:32:56 +02:00
11ff85ca74 fixed desync TheAIBot 2016-08-23 21:12:02 +02:00
62c07c77f2 initial tank chose fluid TheAIBot 2016-08-23 20:31:43 +02:00
c9d5509c85 Merge pull request #2 from Danielv123/master TheAIBot 2016-08-23 20:15:47 +02:00
258946fe51 Added sample server-settings.json to repo Danielv123 2016-08-23 19:42:34 +02:00
410b3e5e53 Added webpage to display network contents Danielv123 2016-08-23 19:31:27 +02:00
8ea74821b4 webserver and API endpoint for getting network contents Danielv123 2016-08-23 14:16:24 +02:00
f2f832333c Merge pull request #1 from Danielv123/master TheAIBot 2016-08-21 10:48:03 +02:00
2fe0844fd8 Merge remote-tracking branch 'refs/remotes/Danielv123/master' TheAIBot 2016-08-21 10:43:48 +02:00
fcb9c5add5 Changed name of mod and descriptions, updated readme.md Danielv123 2016-08-19 16:42:30 +02:00
0e9fb267c4 Working on #7 configs Danielv123 2016-08-17 22:52:44 +02:00
601d5edb27 Cleanup, readme Danielv123 2016-08-17 18:31:43 +02:00
44e311feea Fixed js, items are now created correctly and dupe/loss glitches removed Danielv123 2016-08-17 09:20:14 +02:00
440ecfad30 Everything works! (using rcon) Danielv123 2016-08-16 12:41:55 +02:00
74253908d5 Merge pull request #6 from TheAIBot/master Daniel 2016-08-16 11:54:10 +02:00
4897f019f6 added UPDATE_RATE to config TheAIBot 2016-08-16 11:43:18 +02:00
a3f931fbec Merge pull request #5 from TheAIBot/master Daniel 2016-08-16 10:36:02 +02:00

... 35 36 37 38 39 ...