technic

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

6055ed6503 Blast resistant concrete (by ObKo) RealBadAngel 2013-07-14 12:11:56 +0200
f4302fcbfa Fix crafting recipes and some code style. RealBadAngel 2013-07-14 11:30:03 +0200
2f23f71652 Remove deafault creative mod dependency. RealBadAngel 2013-07-14 11:21:43 +0200
3a6916f721 bugfix concrete's craft recipe #55 pagliaccio 2013-07-13 13:27:21 +0200
ad0bef9d90 Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-13 13:19:07 +0200
57cd394773 Gigh -> High ShadowNinja 2013-07-12 20:32:38 -0400
1f4c621ffc Fix code style of the high voltage battery box ShadowNinja 2013-07-12 20:28:07 -0400
187015e073 Fix coding style of nuclear reactor ShadowNinja 2013-07-12 19:23:29 -0400
4f35f407ce Add LuaVoxelManip support to forcefield ShadowNinja 2013-07-12 15:41:59 -0400
30361afb34 Fix forcefield ShadowNinja 2013-07-12 15:06:15 -0400
e9031d352e Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-12 16:19:38 +0200
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 +0200
d497429abc Load tools ShadowNinja 2013-07-11 15:10:14 -0400
3c199ad4ff Merge ba1474d1cf into 70d26c005f #52 pagliaccio 2013-07-11 10:26:18 -0700
ba1474d1cf bugfix concerte craft recipe #52 pagliaccio 2013-07-11 18:57:50 +0200
5d470cd753 Move files to subfolders ShadowNinja 2013-07-11 12:19:09 -0400
182ec28dd4 Merge dcc2b7f2b8 into 70d26c005f #47 ObKo 2013-07-11 09:22:04 -0700
84c8f68c6e Merge branch 'master' of https://github.com/RealBadAngel/technic pagliaccio 2013-07-11 18:09:56 +0200
18a905a9dd bugfix in nuclear reactor pagliaccio 2013-07-11 17:37:52 +0200
afc84d6a8d Update nuclear_reactor_hv.lua kpoppel 2013-07-11 14:33:03 +0200
3055270a7c Add nuclear reactor kpoppel 2013-07-11 01:04:58 +0200
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 +0200
cda068c24b bugfix pagliaccio 2013-07-09 13:13:29 +0200
c6a5de6f2f Merge branch 'master' of github.com:pagliaccio/technic pagliaccio 2013-07-09 13:00:49 +0200
ff5ae7089f bugfix HV battery box pagliaccio 2013-07-08 17:48:54 +0200
a995735122 add gitignore pagliaccio 2013-07-08 14:46:32 +0200
13e8857f1a Fix HV battery box and some indentation. Bug found by pagliaccio. kpoppel 2013-07-08 22:11:20 +0200
19c9a0443b Merge branch 'indev' ShadowNinja 2013-07-08 16:53:44 -0400
c82b1c35b5 Fix HV battery box and some indentation. Bug found by pagliaccio. kpoppel 2013-07-08 22:11:20 +0200
c3580871bd Merge 8447f165f7 into 3a3700537b #48 pagliaccio 2013-07-08 09:00:15 -0700
8447f165f7 bugfix HV battery box #48 pagliaccio 2013-07-08 17:48:54 +0200
53d56ea5ba add gitignore pagliaccio 2013-07-08 14:46:32 +0200
dcc2b7f2b8 Blast-resistant Concrete. #47 Konstantin Oblaukhov 2013-07-08 13:48:14 +0700
d0acb37836 Carbon items. Konstantin Oblaukhov 2013-07-08 09:54:44 +0700
680f6eab52 Merge 2c4ec16141 into 79e8d26989 #46 pagliaccio 2013-07-07 12:14:25 -0700
2c4ec16141 bugfix #46 pagliaccio 2013-07-07 21:08:32 +0200
589b508c3e Composite and copper plates. Konstantin Oblaukhov 2013-07-07 23:39:25 +0700
129f97310b New machine - compressor. Konstantin Oblaukhov 2013-07-07 22:35:24 +0700
577767ae58 Merge f192854ced into 79e8d26989 #45 pagliaccio 2013-07-07 07:33:37 -0700
f192854ced add coal generator in MV #45 pagliaccio 2013-07-07 16:29:07 +0200
79e8d26989 Merge pull request #43 from ObKo/indev-enriched-uranium kpoppel 2013-07-06 15:55:26 -0700
46c73440ed Merge 2e20ae875a into 220c61ce91 #44 pagliaccio 2013-07-06 15:41:11 -0700
2e20ae875a add coal driven generator in MV #44 pagliaccio 2013-07-07 00:27:56 +0200
da8cf5ed66 Merge 8be389e774 into 220c61ce91 #43 ObKo 2013-07-06 07:04:38 -0700
8be389e774 Enriched Uranium. #43 Konstantin Oblaukhov 2013-07-06 20:52:41 +0700
220c61ce91 Merge pull request #42 from ObKo/indev-uranium RealBadAngel 2013-07-06 06:22:39 -0700
13f1ab62dc Merge e606b93ac6 into 85d937e199 #42 ObKo 2013-07-06 01:36:13 -0700
3a3700537b Merge changes made in technic_game RealBadAngel 2013-07-06 10:35:48 +0200
e606b93ac6 Support for multiple-input recipes in extractor. #42 Konstantin Oblaukhov 2013-07-06 15:19:15 +0700
85d937e199 Made the supply converter reset its supply and demand stats if the cabling is bad. kpoppel 2013-07-06 00:31:48 +0200
4c6546ed56 Forgot to reset demand on power failure. kpoppel 2013-07-06 00:22:12 +0200
ab38e29a18 Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev kpoppel 2013-07-06 00:19:05 +0200
e64994d473 Fix a bug when digging up a small cube light. Fix the power radiator so that it reacts correcty when power is lost. Add punch feature to toggle all attached appliances. kpoppel 2013-07-06 00:17:56 +0200
b1d668fa3b Merge pull request #40 from m97/indev RealBadAngel 2013-07-05 06:20:28 -0700
f3a5964e98 Merge ce5dfa311e into 73209cc37d #40 m97 2013-07-05 06:18:32 -0700
2a96df5dcb Merge 1d8eed39ad into b78b90d422 #35 ObKo 2013-07-04 23:32:23 -0700
b78b90d422 New textures for lumps and ingots. Konstantin Oblaukhov 2013-06-26 20:48:50 +0700
2d168e5afc Use ores from default instead of moreores ShadowNinja 2013-07-05 01:09:33 -0400
465890950b Improved cross-compatibility with homedecor's brass ingots. Vanessa Ezekowitz 2013-07-04 23:32:20 -0400
73209cc37d Fix cycling power drain on the forcefield. Now it disables itself if no power. kpoppel 2013-07-04 21:39:29 +0200
9a0d3f2166 Forcefield now working with updated power scheme. kpoppel 2013-07-04 21:33:27 +0200
9770be430d Textures. I really need help on some nice ones. kpoppel 2013-07-04 20:29:38 +0200
6e4ffb4883 Fix item wear. kpoppel 2013-07-04 19:19:45 +0200
ce5dfa311e Add extractor. #40 m97 2013-07-04 19:05:00 +0200
66a4a91224 Fix to formspec background element syntax RealBadAngel 2013-07-03 23:32:41 +0200
c7207a9cba Silenced the power radiator. kpoppel 2013-07-02 22:45:08 +0200
7201aeb6ba Removed down_converters as they are superseeded by the new supply converter. kpoppel 2013-07-02 22:26:45 +0200
053fa59739 Merge pull request #38 from kpoppel/master kpoppel 2013-07-01 15:19:06 -0700
be269e2503 Merge ee5c6c23fa into 390ea04352 #38 kpoppel 2013-07-01 15:16:32 -0700
ee5c6c23fa Changed power distribution method and streamlined the various existing machines. An electrical network now requires a switching station to work. This statin is the one resolving the network collecting power and distributing it again. Added up/down converter. It is kind of finished. It can be updated with a slot for an upgrade but so far it works without by resolving the types of wires above and below the box. Tool and machine registering changed to use a table with key+value instead of the iterative method it used to have. The power radiator changed to be able to send up to 3000MV EUs in a radius of 6. #38 kpoppel 2013-07-02 00:03:36 +0200
44508110e8 Re-add Framed Glass RealBadAngel 2013-06-30 21:47:32 +0200
8e03d7ded6 Sync with indev branch, bump version to 0.4.7 RealBadAngel 2013-06-30 07:12:02 +0200
c687e8cb7b Merge pull request #36 from ObKo/blocks Jordan Snelling 2013-06-27 00:40:03 -0700
766bb17243 Merge 9de141ee6b into 251e8ed7b5 #36 ObKo 2013-06-26 19:25:22 -0700
9de141ee6b New blocks of metal. #36 Konstantin Oblaukhov 2013-06-27 09:13:44 +0700
1d8eed39ad New textures for lumps and ingots. #35 Konstantin Oblaukhov 2013-06-26 20:48:50 +0700
8c3d2a0afc Merge 2a43a48fcf into 251e8ed7b5 #34 ObKo 2013-06-23 20:06:36 -0700
2a43a48fcf New textures for ingots and lumps. Konstantin Oblaukhov 2013-06-24 09:54:07 +0700
251e8ed7b5 Merge pull request #33 from kaeza/place_craftitems #34 Jordan Snelling 2013-06-21 09:40:26 -0700
e28de481b0 Merge 0039f38b94 into e718c73b36 #33 Diego Martínez 2013-06-20 20:28:37 -0700
0039f38b94 Deployers and constructors now able to "place" craftitems. #33 Diego Martínez 2013-06-21 00:20:20 -0300
37d9d94c44 Added case study of radiated power through inductive coils. kpoppel 2013-06-19 00:24:37 +0200
467dcf1d5d Merge pull request #4 from RealBadAngel/indev kpoppel 2013-06-18 10:18:23 -0700
e718c73b36 Merge pull request #32 from kaeza/master Jordan Snelling 2013-06-18 06:52:34 -0700
6f252873ae Merge a1da74209b into 60c9d97101 #32 Diego Martínez 2013-06-18 06:50:23 -0700
a1da74209b Constructor now digs node drops instead of actual nodes. #32 Diego Martínez 2013-06-18 10:46:28 -0300
60c9d97101 Merge pull request #23 from Novatux/frames RealBadAngel 2013-06-15 06:33:33 -0700
390ea04352 Merge pull request #27 from kpoppel/master kpoppel 2013-06-12 14:34:25 -0700
36e5a32bb4 Merge cfb5bd190c into fc7a23f8b1 #27 kpoppel 2013-06-12 14:33:15 -0700
cfb5bd190c Added the Mv and HV down converters. Doing that required some changes to the batteries in that they have new meta data aligned with the other machines. I also added a BA type machine in addition to the existing PR and RE types. This way it is easy to find he batteries on the network. #27 kpoppel 2013-06-12 23:30:37 +0200
fc7a23f8b1 Merge pull request #26 from kpoppel/master kpoppel 2013-06-12 13:12:13 -0700
e525623008 Merge a27b59dde5 into 66d6431a91 #26 kpoppel 2013-06-12 13:12:05 -0700
a27b59dde5 Fix to the chainsaw. handle_node drops should no longer become nil. #26 kpoppel 2013-06-12 22:08:23 +0200
66d6431a91 Merge pull request #24 from kpoppel/master kpoppel 2013-06-06 13:58:30 -0700
f8bf78660c Merge e62a0fd0c1 into 63cc81ea67 #24 kpoppel 2013-06-06 13:58:24 -0700
802db28dc3 Whitespace cleanup kpoppel 2013-06-06 22:49:08 +0200
e62a0fd0c1 Changed grinding of ingots to give 1 dust. This is to avoid duplication exploit. #24 kpoppel 2013-06-06 22:46:40 +0200
3944670f22 Merge 1524a9f610 into 895ee322d2 #23 Novatux 2013-06-05 07:23:20 -0700
1524a9f610 Frames destroy liquids they should replace and are not blocked by them. #23 Novatux 2013-06-05 16:22:45 +0200
63cc81ea67 Merge pull request #22 from kpoppel/master kpoppel 2013-06-04 14:39:24 -0700