Commit Graph

Select branches

Hide Pull Requests

factory

frames-experimental

gh-pages

master

pr_647_technic_cnc_rewrite

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

#644

#645

#647

#65

#65

#650

#651

#651

#654

#655

#66

#66

#661

#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

• 6ce89650c0 Merge c414b8d2f23b436ee7072588dd2ce7fe91e63043 into 50b8aed01c988de4c173ecb72b12ced667d0d595 #68 Jonathan Kolberg 2013-07-26 18:54:17 -07:00
• f758cc5d39 Merge abec8729ab972a6acbe7346c7058b2143b639c88 into 50b8aed01c988de4c173ecb72b12ced667d0d595 #65 Jonathan Kolberg 2013-07-26 10:35:32 -07:00
• 50b8aed01c Finaly fixed the statements Jonathan Raphael Joachim Kolberg 2013-07-25 14:10:58 +02:00
• 3b9df17d20 Merge 5052308a3412592512845251442a876d91899300 into 55caa109c95f9dfbca29411fa8e354b0fd1cdbbb #66 Jonathan Kolberg 2013-07-26 09:52:40 -07:00
• 55caa109c9 simplified a statement Jonathan Raphael Joachim Kolberg 2013-07-24 14:59:05 +02:00
• 3e161a86b4 Made the nuclear reactor match the comment #69 Jonathan Raphael Joachim Kolberg 2013-07-26 12:01:37 +02:00
• abec8729ab Finaly fixed the statements #65 Jonathan Raphael Joachim Kolberg 2013-07-26 11:12:52 +02:00
• c414b8d2f2 Externalised common functions of the mv mashines. Jonathan Raphael Joachim Kolberg 2013-07-26 11:00:30 +02:00
• 5052308a34 further simplifing #66 Jonathan Raphael Joachim Kolberg 2013-07-25 22:54:08 +02:00
• 2e218d3e6d fix the mv tube conditions Jonathan Raphael Joachim Kolberg 2013-07-25 14:10:58 +02:00
• 4720746a2a simlified a statement Jonathan Raphael Joachim Kolberg 2013-07-24 14:59:05 +02:00
• d8ec3f8bbe Deployer and node breaker are now moved to pipeworks. RealBadAngel 2013-07-25 07:59:00 +02:00
• f4d9a1e4e7 Merge pull request #64 from hdastwb/mvidlecond RealBadAngel 2013-07-24 03:39:09 -07:00
• 9842f19d1c Merge 2d7f750d9a734e2c84cc1ee14746a4ee2f8757e6 into e38f6f0983feb5725feab8f966d2385b7c7ae23d #64 hdastwb 2013-07-23 18:47:14 -07:00
• 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 -04:00
• e38f6f0983 Merge pull request #62 from hdastwb/connect_sides #57 RealBadAngel 2013-07-22 23:38:39 -07:00
• fa5a82ac23 Merge 2e4d983be7592af81b49f95895acf064b8ec38a2 into b7649c75fc6bc2618db6944d6cc74ce419e4c57c #62 hdastwb 2013-07-22 23:37:59 -07:00
• b7649c75fc Merge pull request #60 from hdastwb/mesesandtube RealBadAngel 2013-07-22 21:38:07 -07:00
• c3290c46a6 Merge b3cf1ab693e269364ff962cce583a06d7fd06f00 into e43e6cc1b0f4de3107179f6b86f23db60f492d1d #60 hdastwb 2013-07-22 21:37:26 -07:00
• 2e4d983be7 added connect_sides to appropriate tube tables #62 hdastwb 2013-07-21 17:15:03 -04:00
• e43e6cc1b0 Merge pull request #61 from hdastwb/patch-1 ShadowNinja 2013-07-20 14:48:18 -07:00
• 17f6813783 Merge 17f3ce2ba37918c828046dbba4cb069415e90a71 into acef4b1f6341492684da1ad876bfc56f02b7f7fb #61 hdastwb 2013-07-20 08:35:23 -07:00
• 17f3ce2ba3 convert remove_items to avoid crashes #61 hdastwb 2013-07-20 11:32:26 -04:00
• b3cf1ab693 added a recipe for MESE sand tubes #60 hdastwb 2013-07-19 17:51:24 -04:00
• acef4b1f63 Merge pull request #59 from bulldog98/master RealBadAngel 2013-07-19 07:24:02 -07:00
• 72bd03976b Merge d37cf7d5365837b8e26af2c5fa6abe0d712c6716 into 7633b2b1b750adffbb5ae2e483cc5eed2ec225ef #59 Jonathan Kolberg 2013-07-19 02:01:22 -07:00
• d37cf7d536 added a mv grinder #59 Jonathan Raphael Joachim Kolberg 2013-07-19 10:58:38 +02:00
• 7633b2b1b7 Another try to get rid of default creative without depending on it. RealBadAngel 2013-07-18 00:51:06 +02:00
• e587a5a77a Merge 000e57c62a77a63bdb8b01560098424290294edd into dfd478b2e8786b98882e09d89139f9eaa9252770 #57 pagliaccio 2013-07-17 15:29:58 -07:00
• dfd478b2e8 remove debug code RealBadAngel 2013-07-17 21:18:02 +02:00
• 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 +02:00
• 589343f1b4 Merge b5f0566ddbb2f4e80cd197a7e537effb4553d4d7 into 70d26c005fbadd4c978216c51750eda5ac4ea824 #31 Novatux 2013-07-17 10:37:37 -07:00
• b5f0566ddb Frames destroy liquids they should replace and are not blocked by them. #31 Novatux 2013-07-17 19:37:08 +02:00
• 2ef1bb7e46 backgrounds for mv and hv batboxes RealBadAngel 2013-07-17 19:15:29 +02:00
• acc7f71302 Commons for battery boxes RealBadAngel 2013-07-17 19:14:40 +02:00
• 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 +02:00
• 55a0a40963 Add compressing method to UI RealBadAngel 2013-07-17 11:54:52 +02:00
• 000e57c62a Merge branch 'master' of github.com:pagliaccio/technic pagliaccio 2013-07-15 22:03:57 +02:00
• c9f3004d45 add bio generator ad MV coal dust generator and bugfix pagliaccio 2013-07-15 15:25:18 +02:00
• bc6b451fd1 add generator MV and bio generator LV pagliaccio 2013-07-14 18:03:36 +02:00
• d7875f8470 add gitignore pagliaccio 2013-07-08 14:46:32 +02:00
• 3a3f24fa41 add gitignore pagliaccio 2013-07-08 14:46:32 +02:00
• 922d2554a9 LV batbox background RealBadAngel 2013-07-15 21:39:31 +02:00
• b7deb0db84 32x compressor textures RealBadAngel 2013-07-15 20:23:08 +02:00
• 410afaa583 Add compressor RealBadAngel 2013-07-15 20:21:49 +02:00
• b875ce627c add bio generator ad MV coal dust generator and bugfix pagliaccio 2013-07-15 15:25:18 +02:00
• 25e1b995eb add generator MV and bio generator LV pagliaccio 2013-07-14 18:03:36 +02:00
• ec4b60eca3 Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-14 14:46:02 +02:00
• 58e5f65234 New items by ObKo (textures) RealBadAngel 2013-07-14 12:43:11 +02:00
• 58ae29c5a4 New items by ObKo RealBadAngel 2013-07-14 12:42:38 +02:00
• 6055ed6503 Blast resistant concrete (by ObKo) RealBadAngel 2013-07-14 12:11:56 +02:00
• f4302fcbfa Fix crafting recipes and some code style. RealBadAngel 2013-07-14 11:30:03 +02:00
• 2f23f71652 Remove deafault creative mod dependency. RealBadAngel 2013-07-14 11:21:43 +02:00
• 3a6916f721 bugfix concrete's craft recipe #55 pagliaccio 2013-07-13 13:27:21 +02:00
• ad0bef9d90 Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-13 13:19:07 +02:00
• 57cd394773 Gigh -> High ShadowNinja 2013-07-12 20:32:38 -04:00
• 1f4c621ffc Fix code style of the high voltage battery box ShadowNinja 2013-07-12 20:28:07 -04:00
• 187015e073 Fix coding style of nuclear reactor ShadowNinja 2013-07-12 19:23:29 -04:00
• 4f35f407ce Add LuaVoxelManip support to forcefield ShadowNinja 2013-07-12 15:41:59 -04:00
• 30361afb34 Fix forcefield ShadowNinja 2013-07-12 15:06:15 -04:00
• e9031d352e Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-12 16:19:38 +02:00
• fa846989ac Remove file that doesn't seem to have any use. Fix typing error in register... file Fix two issues with nuclear reactor and set the burn time to 24h. kpoppel 2013-07-11 23:01:13 +02:00
• d497429abc Load tools ShadowNinja 2013-07-11 15:10:14 -04:00
• 3c199ad4ff Merge ba1474d1cfeed3515b27ac62bc14c766f108d200 into 70d26c005fbadd4c978216c51750eda5ac4ea824 #52 pagliaccio 2013-07-11 10:26:18 -07:00
• ba1474d1cf bugfix concerte craft recipe #52 pagliaccio 2013-07-11 18:57:50 +02:00
• 5d470cd753 Move files to subfolders ShadowNinja 2013-07-11 12:19:09 -04:00
• 182ec28dd4 Merge dcc2b7f2b87d1135ae6a2ccb8e1887ab8498b696 into 70d26c005fbadd4c978216c51750eda5ac4ea824 #47 ObKo 2013-07-11 09:22:04 -07:00
• 84c8f68c6e Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-11 18:09:56 +02:00
• 18a905a9dd bugfix in nuclear reactor pagliaccio 2013-07-11 17:37:52 +02:00
• afc84d6a8d Update nuclear_reactor_hv.lua kpoppel 2013-07-11 14:33:03 +02:00
• 3055270a7c Add nuclear reactor kpoppel 2013-07-11 01:04:58 +02:00
• 70d26c005f Added nuclear reactor. Still needs some work. I submit it to show and get idea feedback. LV coal generator fixed with bugs found while making the nuclear generator. kpoppel 2013-07-11 01:04:58 +02:00
• cda068c24b bugfix pagliaccio 2013-07-09 13:13:29 +02:00
• c6a5de6f2f Merge branch 'master' of github.com:pagliaccio/technic pagliaccio 2013-07-09 13:00:49 +02:00
• ff5ae7089f bugfix HV battery box pagliaccio 2013-07-08 17:48:54 +02:00
• a995735122 add gitignore pagliaccio 2013-07-08 14:46:32 +02:00
• 13e8857f1a Fix HV battery box and some indentation. Bug found by pagliaccio. kpoppel 2013-07-08 22:11:20 +02:00
• 19c9a0443b Merge branch 'indev' ShadowNinja 2013-07-08 16:53:44 -04:00
• c82b1c35b5 Fix HV battery box and some indentation. Bug found by pagliaccio. kpoppel 2013-07-08 22:11:20 +02:00
• c3580871bd Merge 8447f165f749f2531c74402f7d913fba968526db into 3a3700537baa748e459258385d27bb79ab391546 #48 pagliaccio 2013-07-08 09:00:15 -07:00
• 8447f165f7 bugfix HV battery box #48 pagliaccio 2013-07-08 17:48:54 +02:00
• 53d56ea5ba add gitignore pagliaccio 2013-07-08 14:46:32 +02:00
• dcc2b7f2b8 Blast-resistant Concrete. #47 Konstantin Oblaukhov 2013-07-08 13:48:14 +07:00
• d0acb37836 Carbon items. Konstantin Oblaukhov 2013-07-08 09:54:44 +07:00
• 680f6eab52 Merge 2c4ec1614119ebea0f10fd9798c1f33342eec2cb into 79e8d26989cf20108bc69cf3b1da32655d57735a #46 pagliaccio 2013-07-07 12:14:25 -07:00
• 2c4ec16141 bugfix #46 pagliaccio 2013-07-07 21:08:32 +02:00
• 589b508c3e Composite and copper plates. Konstantin Oblaukhov 2013-07-07 23:39:25 +07:00
• 129f97310b New machine - compressor. Konstantin Oblaukhov 2013-07-07 22:35:24 +07:00
• 577767ae58 Merge f192854ced7bda38c572789528b536828e5a9a89 into 79e8d26989cf20108bc69cf3b1da32655d57735a #45 pagliaccio 2013-07-07 07:33:37 -07:00
• f192854ced add coal generator in MV #45 pagliaccio 2013-07-07 16:29:07 +02:00
• 79e8d26989 Merge pull request #43 from ObKo/indev-enriched-uranium kpoppel 2013-07-06 15:55:26 -07:00
• 46c73440ed Merge 2e20ae875af9883ea864e6f46e12e58b597fab5b into 220c61ce9109685f283687002abd267b57aaf013 #44 pagliaccio 2013-07-06 15:41:11 -07:00
• 2e20ae875a add coal driven generator in MV #44 pagliaccio 2013-07-07 00:27:56 +02:00
• da8cf5ed66 Merge 8be389e774a99ec5d08ca86b3902bb98310fd58d into 220c61ce9109685f283687002abd267b57aaf013 #43 ObKo 2013-07-06 07:04:38 -07:00
• 8be389e774 Enriched Uranium. #43 Konstantin Oblaukhov 2013-07-06 20:52:41 +07:00
• 220c61ce91 Merge pull request #42 from ObKo/indev-uranium RealBadAngel 2013-07-06 06:22:39 -07:00
• 13f1ab62dc Merge e606b93ac633fd95bb2a65aac6acb94b30abcb14 into 85d937e1997bcaa833e40df78117d53708ecdccd #42 ObKo 2013-07-06 01:36:13 -07:00
• 3a3700537b Merge changes made in technic_game RealBadAngel 2013-07-06 10:35:48 +02:00
• e606b93ac6 Support for multiple-input recipes in extractor. #42 Konstantin Oblaukhov 2013-07-06 15:19:15 +07:00
• 85d937e199 Made the supply converter reset its supply and demand stats if the cabling is bad. kpoppel 2013-07-06 00:31:48 +02:00