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

• 4c6546ed56 Forgot to reset demand on power failure. kpoppel 2013-07-06 00:22:12 +02:00
• ab38e29a18 Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev kpoppel 2013-07-06 00:19:05 +02:00
• 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 +02:00
• b1d668fa3b Merge pull request #40 from m97/indev RealBadAngel 2013-07-05 06:20:28 -07:00
• f3a5964e98 Merge ce5dfa311ebc1347e11721c21a83b808a5bbccbd into 73209cc37d61e3c90dbd0c441228faa0c8f312dc #40 m97 2013-07-05 06:18:32 -07:00
• 2a96df5dcb Merge 1d8eed39ad1c833bfa29122506f29e66929e7278 into b78b90d4223e01a5c8611105b125e91855bbf602 #35 ObKo 2013-07-04 23:32:23 -07:00
• b78b90d422 New textures for lumps and ingots. Konstantin Oblaukhov 2013-06-26 20:48:50 +07:00
• 2d168e5afc Use ores from default instead of moreores ShadowNinja 2013-07-05 01:09:33 -04:00
• 465890950b Improved cross-compatibility with homedecor's brass ingots. Vanessa Ezekowitz 2013-07-04 23:32:20 -04:00
• 73209cc37d Fix cycling power drain on the forcefield. Now it disables itself if no power. kpoppel 2013-07-04 21:39:29 +02:00
• 9a0d3f2166 Forcefield now working with updated power scheme. kpoppel 2013-07-04 21:33:27 +02:00
• 9770be430d Textures. I really need help on some nice ones. kpoppel 2013-07-04 20:29:38 +02:00
• 6e4ffb4883 Fix item wear. kpoppel 2013-07-04 19:19:45 +02:00
• ce5dfa311e Add extractor. #40 m97 2013-07-04 19:05:00 +02:00
• 66a4a91224 Fix to formspec background element syntax RealBadAngel 2013-07-03 23:32:41 +02:00
• c7207a9cba Silenced the power radiator. kpoppel 2013-07-02 22:45:08 +02:00
• 7201aeb6ba Removed down_converters as they are superseeded by the new supply converter. kpoppel 2013-07-02 22:26:45 +02:00
• 053fa59739 Merge pull request #38 from kpoppel/master kpoppel 2013-07-01 15:19:06 -07:00
• be269e2503 Merge ee5c6c23fab97f1bd1b217a654b72606938619b6 into 390ea043527203bb2d0cb6f873fedbffa68ae83f #38 kpoppel 2013-07-01 15:16:32 -07:00
• 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 +02:00
• 44508110e8 Re-add Framed Glass RealBadAngel 2013-06-30 21:47:32 +02:00
• 8e03d7ded6 Sync with indev branch, bump version to 0.4.7 RealBadAngel 2013-06-30 07:12:02 +02:00
• c687e8cb7b Merge pull request #36 from ObKo/blocks Jordan Snelling 2013-06-27 00:40:03 -07:00
• 766bb17243 Merge 9de141ee6b5a049e5f0bd53ecbd867e0c465ed77 into 251e8ed7b538ecc0a74b13231bce961de74447b7 #36 ObKo 2013-06-26 19:25:22 -07:00
• 9de141ee6b New blocks of metal. #36 Konstantin Oblaukhov 2013-06-27 09:13:44 +07:00
• 1d8eed39ad New textures for lumps and ingots. #35 Konstantin Oblaukhov 2013-06-26 20:48:50 +07:00
• 8c3d2a0afc Merge 2a43a48fcfcf94f8d11a2d6171369681172e7dd1 into 251e8ed7b538ecc0a74b13231bce961de74447b7 #34 ObKo 2013-06-23 20:06:36 -07:00
• 2a43a48fcf New textures for ingots and lumps. Konstantin Oblaukhov 2013-06-24 09:54:07 +07:00
• 251e8ed7b5 Merge pull request #33 from kaeza/place_craftitems #34 Jordan Snelling 2013-06-21 09:40:26 -07:00
• e28de481b0 Merge 0039f38b9497e9c8be830c05b5dd59a7e1633b83 into e718c73b36fcf44c564c84d8bdfa45373c12f2a5 #33 Diego Martínez 2013-06-20 20:28:37 -07:00
• 0039f38b94 Deployers and constructors now able to "place" craftitems. #33 Diego Martínez 2013-06-21 00:20:20 -03:00
• 37d9d94c44 Added case study of radiated power through inductive coils. kpoppel 2013-06-19 00:24:37 +02:00
• 467dcf1d5d Merge pull request #4 from RealBadAngel/indev kpoppel 2013-06-18 10:18:23 -07:00
• e718c73b36 Merge pull request #32 from kaeza/master Jordan Snelling 2013-06-18 06:52:34 -07:00
• 6f252873ae Merge a1da74209b75c5543bd6f2e1cc8b1643adf13ffa into 60c9d971015b2ad7e0b7d591c12e8b33fe296904 #32 Diego Martínez 2013-06-18 06:50:23 -07:00
• a1da74209b Constructor now digs node drops instead of actual nodes. #32 Diego Martínez 2013-06-18 10:46:28 -03:00
• 60c9d97101 Merge pull request #23 from Novatux/frames RealBadAngel 2013-06-15 06:33:33 -07:00
• 390ea04352 Merge pull request #27 from kpoppel/master kpoppel 2013-06-12 14:34:25 -07:00
• 36e5a32bb4 Merge cfb5bd190c8188d0a0ffd43701864cb1de48bd5d into fc7a23f8b16334fae1a3bfc9cc9470e72e5a454c #27 kpoppel 2013-06-12 14:33:15 -07:00
• 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 +02:00
• fc7a23f8b1 Merge pull request #26 from kpoppel/master kpoppel 2013-06-12 13:12:13 -07:00
• e525623008 Merge a27b59dde52eec754db6930b420e1493e16980b8 into 66d6431a914acdedf448692cdd8096884d6dacc2 #26 kpoppel 2013-06-12 13:12:05 -07:00
• a27b59dde5 Fix to the chainsaw. handle_node drops should no longer become nil. #26 kpoppel 2013-06-12 22:08:23 +02:00
• 66d6431a91 Merge pull request #24 from kpoppel/master kpoppel 2013-06-06 13:58:30 -07:00
• f8bf78660c Merge e62a0fd0c1fc92125b168dc08ff33298d04860b5 into 63cc81ea677322ac3a97180f3920cc6d8e3eb954 #24 kpoppel 2013-06-06 13:58:24 -07:00
• 802db28dc3 Whitespace cleanup kpoppel 2013-06-06 22:49:08 +02:00
• e62a0fd0c1 Changed grinding of ingots to give 1 dust. This is to avoid duplication exploit. #24 kpoppel 2013-06-06 22:46:40 +02:00
• 3944670f22 Merge 1524a9f610d1116604255b9d0f479c8c43da6633 into 895ee322d26727cdf680942d82566b2df83c9368 #23 Novatux 2013-06-05 07:23:20 -07:00
• 1524a9f610 Frames destroy liquids they should replace and are not blocked by them. #23 Novatux 2013-06-05 16:22:45 +02:00
• 63cc81ea67 Merge pull request #22 from kpoppel/master kpoppel 2013-06-04 14:39:24 -07:00
• 77a9f225bc Merge 26c0bba1f2a31a1fc3f6148fc09fdc42d717ddf7 into 1fd122b5faf7b4c53a3f8a4f2d3e1176475673ec #22 kpoppel 2013-06-04 14:39:16 -07:00
• 26c0bba1f2 Added ingot grinding for the type which already have a <>_dust in place. The default bronze_ingot does not have a dust item. #22 kpoppel 2013-06-04 23:36:07 +02:00
• 1fd122b5fa Merge pull request #20 from kpoppel/master kpoppel 2013-06-03 15:07:17 -07:00
• c8e41f8cfb Merge be774436c14c781d6c5482d8b4436f7687ba4d2f into ceb8a71f27b45c304ce2626cc4f939a52323b192 #20 kpoppel 2013-06-03 15:07:06 -07:00
• be774436c1 Fix solr array recipes for hv and mv to match that of the lv array. #20 kpoppel 2013-06-04 00:05:07 +02:00
• ceb8a71f27 Merge pull request #19 from kpoppel/master kpoppel 2013-06-03 14:48:46 -07:00
• 72db5482e9 Merge 4f1a44a80b5522db60125f3018c0ce80fbb9e3b4 into 7d890428f547758ffd907252b2effb1d743c02e4 #19 kpoppel 2013-06-03 14:46:33 -07:00
• 4f1a44a80b Removing ununsed textures. Added more safety to item_drop to get around a fatal server halt issue. #19 kpoppel 2013-06-03 23:42:44 +02:00
• ede3978965 Added solar arrays for all voltage tiers. Added transformers for all voltage tiers. I changed the recipes for solar panels to make them less expensive. I also changed the output of the individual panel and made the arrays provie the real "oomph" :-) Solar panels and arrays are dependent on light level, time of day and height abive ground (0) for output and cheating with torches and stuff. Textures added. Fixed bugs in the hv battery box. It was not working at all. I don't understand the hv box top texture though??? I have a sense that all machines connected to the battery boxes are taking the same amount of juice from the box. A method of taking a little or a lot would be nice. kpoppel 2013-06-03 23:37:04 +02:00
• a9a8f3be34 Merge pull request #3 from RealBadAngel/indev kpoppel 2013-06-03 13:54:05 -07:00
• 7d890428f5 HV Battery Box textures added RealBadAngel 2013-05-30 06:01:01 +02:00
• 77254735e4 Make treetap work with moretrees rubber tree. Add moretrees as dependency RealBadAngel 2013-05-29 03:59:25 +02:00
• 0d81a3f42a Bugfix RealBadAngel 2013-05-25 23:00:12 +02:00
• 630db84ad1 bugfix RealBadAngel 2013-05-25 22:39:25 +02:00
• 6234e5de83 Merge pull request #2 from RealBadAngel/indev kpoppel 2013-05-09 14:05:30 -07:00
• 64207baa45 Add HV battery box RealBadAngel 2013-05-09 16:02:02 +02:00
• 4a22282699 Add stained glass code RealBadAngel 2013-05-09 16:01:18 +02:00
• ad8c6e3731 Add stained glass textures RealBadAngel 2013-05-09 16:00:43 +02:00
• d0ecd857b1 Merge pull request #17 from kpoppel/master RealBadAngel 2013-05-07 19:46:23 -07:00
• 3b740434cd Merge 2d68498dc10bc74a35a5cc0ff4e81b6640807511 into 3d715d0862b64c53f92fd5b71d4ace41c54a2806 #17 kpoppel 2013-05-07 16:44:09 -07:00
• 2d68498dc1 Massive change to the way CNC programs are registered. Now the API is open for adding new nodes and inhibiting some nodes for some materials. No more recipes outside of the CNC machine. #17 kpoppel 2013-05-08 01:42:22 +02:00
• 5940f5bda4 Slope box fixes. From Bas080. kpoppel 2013-05-08 00:06:54 +02:00
• fef948c5ac CNC can now change programs while it is working. kpoppel 2013-05-07 22:51:03 +02:00
• 7f2be244f2 Add textures for active mode of CNC. Correct two typing bug in battery_box.lua kpoppel 2013-05-07 22:34:06 +02:00
• 3d715d0862 Merge pull request #16 from kpoppel/master RealBadAngel 2013-05-07 07:12:42 -07:00
• 5c9c7f811d Merge c1df318e855beb4a23f134820c81a071ffec2b03 into 00328622d9cc38a7768a7bf449f5c52ddba666f7 #16 kpoppel 2013-05-06 14:21:52 -07:00
• c1df318e85 Fixes to te machine level of service. #16 kpoppel 2013-05-06 23:14:27 +02:00
• d98405f129 Merge branch 'master' of https://github.com/kpoppel/technic kpoppel 2013-05-06 20:55:33 +02:00
• 2239a4447b Merge pull request #1 from RealBadAngel/indev kpoppel 2013-05-06 11:55:11 -07:00
• 6463b77e60 Add milling machine from non cubic to technic mod. Next step is to make sure it only works if powered. kpoppel 2013-05-06 20:00:00 +02:00
• 00328622d9 Store configuration in the world directory. ShadowNinja 2013-04-25 21:39:08 -04:00
• 31b1393b21 Add HV wireing RealBadAngel 2013-04-27 10:04:17 +02:00
• 4b0aef17a0 Add framedglass mod that uses new drawtype RealBadAngel 2013-04-25 18:45:15 +02:00
• b0be4f0b2b Draw lines separating creative items by modpack #15 khonkhortisan 2013-04-19 23:49:07 -07:00
• a594c5feef item pickup files were wrongly named. Vanessa Ezekowitz 2013-04-20 02:28:24 -04:00
• 85f2692ef0 range fix again RealBadAngel 2013-04-20 08:13:58 +02:00
• 0518993e5d converted item drop sounds to mono, normalized to -3.0dB Vanessa Ezekowitz 2013-04-20 02:02:46 -04:00
• 0992a6a6fc bug fix RealBadAngel 2013-04-20 07:53:35 +02:00
• 5db0041896 Item drop sounds range fix RealBadAngel 2013-04-20 07:43:49 +02:00
• 9b76f5cf27 new "sizzling" sound for dropping items into lava Vanessa Ezekowitz 2013-04-20 01:21:23 -04:00
• 3645c6f48a Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev Vanessa Ezekowitz 2013-04-20 00:58:01 -04:00
• 7a94e25e2b item drop update RealBadAngel 2013-04-20 06:51:49 +02:00
• 5ad1b8db08 Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev Vanessa Ezekowitz 2013-04-19 23:42:08 -04:00
• 1cbe991a57 item pick-up overhaul RealBadAngel 2013-04-20 05:39:41 +02:00
• 76c2d8132c FIX THAT AGAIN :P RealBadAngel 2013-04-18 00:16:32 +02:00
• 3e36899e11 Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev Vanessa Ezekowitz 2013-04-15 04:49:25 -04:00
• a9f73e53d9 removed aaa_recipeshook from depends.txt as it is not used anymore. Vanessa Ezekowitz 2013-04-15 02:49:22 -04:00
• 595ed50451 avoid nil RealBadAngel 2013-04-15 08:33:01 +02:00
• 642b8bec16 Update crafting guide RealBadAngel 2013-04-15 08:28:17 +02:00
• 41af016603 change registering crafting recipes in UI RealBadAngel 2013-04-15 07:56:31 +02:00