Commit Graph

Select branches

Hide Pull Requests

factory

frames-experimental

gh-pages

master

recipes_rework

technic_cnc_pr_636

#10

#10

#100

#100

#102

#102

#106

#106

#107

#108

#108

#112

#112

#114

#114

#115

#115

#116

#116

#118

#118

#12

#12

#123

#124

#124

#126

#126

#13

#13

#130

#130

#131

#131

#133

#133

#135

#135

#136

#136

#138

#138

#139

#139

#141

#141

#143

#143

#144

#144

#145

#145

#149

#149

#15

#15

#151

#151

#152

#153

#154

#154

#157

#157

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#167

#167

#17

#17

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#180

#181

#182

#183

#184

#185

#185

#186

#188

#189

#19

#19

#190

#191

#196

#197

#198

#199

#199

#2

#20

#20

#201

#201

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#210

#210

#211

#211

#212

#212

#214

#217

#217

#218

#218

#22

#22

#221

#223

#223

#224

#224

#228

#228

#229

#229

#23

#23

#230

#231

#231

#232

#232

#233

#235

#235

#237

#238

#238

#239

#239

#24

#24

#243

#243

#247

#247

#248

#249

#249

#250

#250

#251

#251

#257

#257

#258

#26

#26

#260

#260

#262

#262

#264

#264

#266

#267

#268

#27

#27

#271

#271

#272

#273

#273

#275

#275

#283

#288

#289

#289

#290

#290

#294

#295

#297

#298

#301

#301

#302

#302

#304

#304

#305

#305

#306

#307

#308

#31

#31

#310

#310

#312

#314

#315

#316

#317

#318

#32

#32

#320

#321

#323

#323

#324

#324

#325

#326

#329

#329

#33

#33

#333

#334

#334

#335

#335

#336

#338

#338

#339

#34

#34

#340

#340

#341

#343

#343

#344

#345

#346

#347

#348

#35

#35

#353

#354

#357

#358

#359

#36

#36

#360

#360

#361

#362

#364

#365

#366

#368

#369

#371

#373

#373

#376

#376

#377

#377

#378

#378

#379

#38

#38

#382

#383

#385

#388

#389

#389

#390

#391

#393

#395

#395

#397

#40

#40

#401

#406

#407

#408

#408

#412

#414

#415

#417

#418

#42

#42

#420

#420

#421

#422

#423

#424

#425

#429

#43

#43

#434

#437

#437

#438

#44

#44

#441

#443

#443

#445

#445

#446

#449

#45

#45

#451

#452

#453

#455

#456

#457

#458

#459

#46

#46

#461

#466

#467

#468

#469

#47

#47

#470

#471

#473

#48

#48

#481

#482

#483

#484

#485

#487

#489

#493

#497

#498

#500

#501

#504

#505

#506

#508

#509

#510

#511

#513

#514

#517

#518

#52

#52

#521

#522

#523

#525

#526

#527

#528

#529

#529

#530

#532

#533

#534

#535

#540

#542

#545

#547

#548

#549

#55

#55

#551

#556

#557

#560

#561

#563

#564

#566

#567

#568

#569

#57

#57

#570

#571

#572

#574

#575

#577

#578

#581

#583

#583

#584

#59

#59

#592

#593

#596

#598

#6

#6

#60

#60

#600

#607

#608

#609

#61

#61

#612

#613

#62

#62

#625

#625

#627

#628

#63

#63

#633

#634

#636

#637

#638

#639

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#82

#82

#86

#86

#88

#88

#9

#9

#96

#96

Mono Color

• b4980f1c41 Merge b0be4f0b2b into ee0765804c #15 khonkhortisan 2013-09-17 13:52:54 -0700
• 5f2d3c23c7 Merge 1b16eb1aeb into ee0765804c #86 pagliaccio 2013-09-17 13:48:25 -0700
• ee0765804c Partial rewrite ShadowNinja 2013-07-17 15:34:35 -0400
• f54c570e6d Merge 678375a544 into 48ea6fb99d #80 ObKo 2013-09-16 16:31:50 -0700
• 9705365ee4 Merge aa12baa32a into 48ea6fb99d #88 Dominik George 2013-09-10 00:30:07 -0700
• aa12baa32a Removes unified_inventory code duplication. Changes to unified inventory can be merged upstream through my pull request. Eases unified_inventory to a recommendation through depends, because reading the code proved it is checked for and not used if not there. #88 Dominik George 2013-09-10 09:25:45 +0200
• 7bd2300489 Tested technic against upstream item_drop. Removes item_drop, adds upstream item_drop to depends. Dominik George 2013-09-10 09:05:58 +0200
• 1b16eb1aeb remove dolphin directori file #86 pagliaccio 2013-08-31 23:04:00 +0200
• b61a17f183 add teleporter to mine pagliaccio 2013-08-31 20:26:52 +0200
• 48ea6fb99d Use only 1 node for frame motors. Novatux 2013-08-31 15:04:08 +0200
• 8b8e0a02c7 Add license Novatux 2013-08-30 10:20:44 +0200
• 6eddaec43d Merge 3e161a86b4 into ec9f92d98b #69 Jonathan Kolberg 2013-08-27 00:38:20 -0700
• ec9f92d98b Merge pull request #82 from GloopMaster/patch-1 kpoppel 2013-08-27 00:30:48 -0700
• 8c44ddf4b4 Merge f8132c13a2 into 97749578b0 #82 GloopMaster 2013-08-24 15:20:17 -0700
• f8132c13a2 Update grinder_gloopores.lua #82 GloopMaster 2013-08-24 18:20:11 -0400
• 97749578b0 a small fix to not create "empty" stargate files for each player and to clean up such files that already exist hdastwb 2013-08-13 15:53:01 -0400
• 678375a544 Mining drill recipes improved. Composite and carbon plates. #80 Konstantin Oblaukhov 2013-08-10 02:45:26 +0700
• 0bba727863 New recipe for Laser. Power source - Red Energy Crystal. Control logic, carbon plates. Konstantin Oblaukhov 2013-08-10 02:39:23 +0700
• 790e1f9d6d HV cable in Force Field recipe. Konstantin Oblaukhov 2013-08-10 02:35:57 +0700
• 75abf4ecc4 Silver in MV cable and Gold in HV cable. Konstantin Oblaukhov 2013-08-10 02:29:54 +0700
• 6d81303979 New recipe for radiator. Similar to other MV machines. Konstantin Oblaukhov 2013-08-10 02:25:56 +0700
• 25e3a3df49 New recipe for RE Battery. Similar to real galvanic cell. Konstantin Oblaukhov 2013-08-10 02:18:42 +0700
• 2c3009717e New recipes for battery boxes. LV recipe looks like MV/HV, but using RE Battery. MV/HV uses stainless steel/composite as a skeleton. Konstantin Oblaukhov 2013-08-10 02:11:28 +0700
• 8b28a2b4dc Bugfix. Konstantin Oblaukhov 2013-08-10 02:05:34 +0700
• 20d355d56c Make LV machnies recipes more consistent. Use LV cable as connection at bottom. Steel ingots as a skeleton at bottom. Konstantin Oblaukhov 2013-08-10 01:57:54 +0700
• 5c1785867f New recipes for transformers. LV now uses steel ingots, MV - stainless steel ingots, HV - mixed metal ingots. Konstantin Oblaukhov 2013-08-10 01:32:48 +0700
• 8e301794cf New motor recipe. Copper ingot -> LV Cable. Konstantin Oblaukhov 2013-08-10 01:29:59 +0700
• df644d7f77 Merge pull request #76 from kol0/patch-2 sdzen 2013-08-06 17:08:22 -0700
• 430981a651 Merge 7f018695b8 into 3b32bf7907 #67 Jonathan Kolberg 2013-08-05 19:41:34 -0700
• 921495b904 Merge 57dc8904a0 into 3b32bf7907 #76 kol0 2013-08-05 14:51:06 -0700
• 63ce7213c4 Merge 4066744f4c into 3b32bf7907 #73 Jonathan Kolberg 2013-08-05 14:46:59 -0700
• f7b3232b37 Merge b6c962b4c1 into 3b32bf7907 #72 Jonathan Kolberg 2013-08-05 14:46:29 -0700
• 3b32bf7907 Fix wrench crashes RealBadAngel 2013-08-04 15:16:00 +0200
• e08ee75990 Merge pull request #79 from metalstache/master RealBadAngel 2013-08-04 06:03:35 -0700
• a56556287f Merge d5c5541501 into b4b222681d #79 metalstache 2013-08-03 15:17:22 -0700
• d5c5541501 Fix recipe and battery box compatibility #79 metalstache 2013-08-03 18:15:51 -0400
• b4b222681d Merge pull request #71 from bulldog98/mk3_fix RealBadAngel 2013-08-01 20:38:53 -0700
• 1101b257d4 Merge 91329b19a4 into f68d305252 #71 Jonathan Kolberg 2013-08-01 20:38:46 -0700
• f68d305252 Merge pull request #78 from metalstache/master RealBadAngel 2013-08-01 20:38:14 -0700
• 0ab530c6fd Merge 3b7695edf4 into 2159bfba60 #78 metalstache 2013-08-01 15:48:46 -0700
• 3b7695edf4 Add node metadata storage and Technic machine support #78 metalstache 2013-08-01 18:46:20 -0400
• 2159bfba60 Merge pull request #77 from metalstache/master RealBadAngel 2013-07-31 09:08:13 -0700
• efd5cf588c Merge 21c96a971f into 50b8aed01c #77 metalstache 2013-07-31 08:58:17 -0700
• 21c96a971f Add Wrench mod #77 metalstache 2013-07-31 11:55:59 -0400
• 57dc8904a0 correction amount of energy produced #76 kol0 2013-07-30 11:30:12 +0200
• 7f018695b8 Fixed the mv grinder #67 Jonathan Raphael Joachim Kolberg 2013-07-25 17:56:00 +0200
• 4066744f4c Fixed taking of the second part of the recipe #73 Jonathan Raphael Joachim Kolberg 2013-07-28 14:48:16 +0200
• b6c962b4c1 Externalised common functions of the mv machines. #72 #68 Jonathan Raphael Joachim Kolberg 2013-07-26 11:00:30 +0200
• 91329b19a4 Fixed the crafting for mining_drill mk3 #71 Jonathan Raphael Joachim Kolberg 2013-07-28 12:45:53 +0200
• 94b1887cdc Added a mv extractor #70 Jonathan Raphael Joachim Kolberg 2013-07-27 16:17:19 +0200
• 6ce89650c0 Merge c414b8d2f2 into 50b8aed01c #68 Jonathan Kolberg 2013-07-26 18:54:17 -0700
• f758cc5d39 Merge abec8729ab into 50b8aed01c #65 Jonathan Kolberg 2013-07-26 10:35:32 -0700
• 50b8aed01c Finaly fixed the statements Jonathan Raphael Joachim Kolberg 2013-07-25 14:10:58 +0200
• 3b9df17d20 Merge 5052308a34 into 55caa109c9 #66 Jonathan Kolberg 2013-07-26 09:52:40 -0700
• 55caa109c9 simplified a statement Jonathan Raphael Joachim Kolberg 2013-07-24 14:59:05 +0200
• 3e161a86b4 Made the nuclear reactor match the comment #69 Jonathan Raphael Joachim Kolberg 2013-07-26 12:01:37 +0200
• abec8729ab Finaly fixed the statements #65 Jonathan Raphael Joachim Kolberg 2013-07-26 11:12:52 +0200
• c414b8d2f2 Externalised common functions of the mv mashines. Jonathan Raphael Joachim Kolberg 2013-07-26 11:00:30 +0200
• 5052308a34 further simplifing #66 Jonathan Raphael Joachim Kolberg 2013-07-25 22:54:08 +0200
• 2e218d3e6d fix the mv tube conditions Jonathan Raphael Joachim Kolberg 2013-07-25 14:10:58 +0200
• 4720746a2a simlified a statement Jonathan Raphael Joachim Kolberg 2013-07-24 14:59:05 +0200
• d8ec3f8bbe Deployer and node breaker are now moved to pipeworks. RealBadAngel 2013-07-25 07:59:00 +0200
• f4d9a1e4e7 Merge pull request #64 from hdastwb/mvidlecond RealBadAngel 2013-07-24 03:39:09 -0700
• 9842f19d1c Merge 2d7f750d9a into e38f6f0983 #64 hdastwb 2013-07-23 18:47:14 -0700
• 2d7f750d9a fixed a condition with mv machines so as to not power down machines with stuff to grind/smelt but nothing to tube out #64 hdastwb 2013-07-23 21:43:36 -0400
• e38f6f0983 Merge pull request #62 from hdastwb/connect_sides #57 RealBadAngel 2013-07-22 23:38:39 -0700
• fa5a82ac23 Merge 2e4d983be7 into b7649c75fc #62 hdastwb 2013-07-22 23:37:59 -0700
• b7649c75fc Merge pull request #60 from hdastwb/mesesandtube RealBadAngel 2013-07-22 21:38:07 -0700
• c3290c46a6 Merge b3cf1ab693 into e43e6cc1b0 #60 hdastwb 2013-07-22 21:37:26 -0700
• 2e4d983be7 added connect_sides to appropriate tube tables #62 hdastwb 2013-07-21 17:15:03 -0400
• e43e6cc1b0 Merge pull request #61 from hdastwb/patch-1 ShadowNinja 2013-07-20 14:48:18 -0700
• 17f6813783 Merge 17f3ce2ba3 into acef4b1f63 #61 hdastwb 2013-07-20 08:35:23 -0700
• 17f3ce2ba3 convert remove_items to avoid crashes #61 hdastwb 2013-07-20 11:32:26 -0400
• b3cf1ab693 added a recipe for MESE sand tubes #60 hdastwb 2013-07-19 17:51:24 -0400
• acef4b1f63 Merge pull request #59 from bulldog98/master RealBadAngel 2013-07-19 07:24:02 -0700
• 72bd03976b Merge d37cf7d536 into 7633b2b1b7 #59 Jonathan Kolberg 2013-07-19 02:01:22 -0700
• d37cf7d536 added a mv grinder #59 Jonathan Raphael Joachim Kolberg 2013-07-19 10:58:38 +0200
• 7633b2b1b7 Another try to get rid of default creative without depending on it. RealBadAngel 2013-07-18 00:51:06 +0200
• e587a5a77a Merge 000e57c62a into dfd478b2e8 #57 pagliaccio 2013-07-17 15:29:58 -0700
• dfd478b2e8 remove debug code RealBadAngel 2013-07-17 21:18:02 +0200
• 79858dca5e - Fix teleportation: now it teleports player to side of the gate player was lookin at when placing. - Teleportation handles now player look yaw. - Fix to a bug in gates formspec. RealBadAngel 2013-07-17 20:28:42 +0200
• 589343f1b4 Merge b5f0566ddb into 70d26c005f #31 Novatux 2013-07-17 10:37:37 -0700
• b5f0566ddb Frames destroy liquids they should replace and are not blocked by them. #31 Novatux 2013-07-17 19:37:08 +0200
• 2ef1bb7e46 backgrounds for mv and hv batboxes RealBadAngel 2013-07-17 19:15:29 +0200
• acc7f71302 Commons for battery boxes RealBadAngel 2013-07-17 19:14:40 +0200
• 3bc6cad671 Remove lv, mv, and hv tiers from power tools. Theyre already tiered with Mk1-3 (at least drill is, more in the future). Tools can be considered as designed for different tiers of circuits thx to their power needs. For example Mk3 will require ages to load in LV batbox. Batboxes load tools timining: LV standard (1000EU), MV 4x faster (4000EU), HV 16x faster (16000EU) Also since 1EU is the same in any circuit it is possible to move energy from one to another with portable devices like crystals. RealBadAngel 2013-07-17 19:14:01 +0200
• 55a0a40963 Add compressing method to UI RealBadAngel 2013-07-17 11:54:52 +0200
• 000e57c62a Merge branch 'master' of github.com:pagliaccio/technic pagliaccio 2013-07-15 22:03:57 +0200
• c9f3004d45 add bio generator ad MV coal dust generator and bugfix pagliaccio 2013-07-15 15:25:18 +0200
• bc6b451fd1 add generator MV and bio generator LV pagliaccio 2013-07-14 18:03:36 +0200
• d7875f8470 add gitignore pagliaccio 2013-07-08 14:46:32 +0200
• 3a3f24fa41 add gitignore pagliaccio 2013-07-08 14:46:32 +0200
• 922d2554a9 LV batbox background RealBadAngel 2013-07-15 21:39:31 +0200
• b7deb0db84 32x compressor textures RealBadAngel 2013-07-15 20:23:08 +0200
• 410afaa583 Add compressor RealBadAngel 2013-07-15 20:21:49 +0200
• b875ce627c add bio generator ad MV coal dust generator and bugfix pagliaccio 2013-07-15 15:25:18 +0200
• 25e1b995eb add generator MV and bio generator LV pagliaccio 2013-07-14 18:03:36 +0200
• ec4b60eca3 Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-14 14:46:02 +0200
• 58e5f65234 New items by ObKo (textures) RealBadAngel 2013-07-14 12:43:11 +0200
• 58ae29c5a4 New items by ObKo RealBadAngel 2013-07-14 12:42:38 +0200