zefram/minetest/technic.git
11 years agoadded connect_sides to appropriate tube tables
hdastwb [Sun, 21 Jul 2013 21:15:03 +0000 (17:15 -0400)]
added connect_sides to appropriate tube tables

11 years agoMerge pull request #61 from hdastwb/patch-1
ShadowNinja [Sat, 20 Jul 2013 21:48:18 +0000 (14:48 -0700)]
Merge pull request #61 from hdastwb/patch-1

Convert remove_items to a number in item_drop to avoid crashes

11 years agoconvert remove_items to avoid crashes
hdastwb [Sat, 20 Jul 2013 15:32:26 +0000 (11:32 -0400)]
convert remove_items to avoid crashes

11 years agoMerge pull request #59 from bulldog98/master
RealBadAngel [Fri, 19 Jul 2013 14:24:02 +0000 (07:24 -0700)]
Merge pull request #59 from bulldog98/master

added a mv grinder

11 years agoadded a mv grinder
Jonathan Raphael Joachim Kolberg [Fri, 19 Jul 2013 08:58:38 +0000 (10:58 +0200)]
added a mv grinder

11 years agoAnother try to get rid of default creative without depending on it.
RealBadAngel [Wed, 17 Jul 2013 22:51:06 +0000 (00:51 +0200)]
Another try to get rid of default creative without depending on it.

11 years agoremove debug code
RealBadAngel [Wed, 17 Jul 2013 19:18:02 +0000 (21:18 +0200)]
remove debug code

11 years ago- Fix teleportation: now it teleports player to side of the gate player was lookin...
RealBadAngel [Wed, 17 Jul 2013 18:28:42 +0000 (20:28 +0200)]
- 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.

11 years agobackgrounds for mv and hv batboxes
RealBadAngel [Wed, 17 Jul 2013 17:15:29 +0000 (19:15 +0200)]
backgrounds for mv and hv batboxes

11 years agoCommons for battery boxes
RealBadAngel [Wed, 17 Jul 2013 17:14:40 +0000 (19:14 +0200)]
Commons for battery boxes

11 years agoRemove lv, mv, and hv tiers from power tools.
RealBadAngel [Wed, 17 Jul 2013 17:14:01 +0000 (19:14 +0200)]
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.

Other changes:
- moved charge/discharge functions to battery_boxes_commons.lua
- added UI style backgrounds for all the batboxes

11 years agoAdd compressing method to UI
RealBadAngel [Wed, 17 Jul 2013 09:54:52 +0000 (11:54 +0200)]
Add compressing method to UI

11 years agoLV batbox background
RealBadAngel [Mon, 15 Jul 2013 19:39:31 +0000 (21:39 +0200)]
LV batbox background

11 years ago32x compressor textures
RealBadAngel [Mon, 15 Jul 2013 18:23:08 +0000 (20:23 +0200)]
32x compressor textures

11 years agoAdd compressor
RealBadAngel [Mon, 15 Jul 2013 18:21:49 +0000 (20:21 +0200)]
Add compressor

11 years agoNew items by ObKo (textures)
RealBadAngel [Sun, 14 Jul 2013 10:43:11 +0000 (12:43 +0200)]
New items by ObKo (textures)

11 years agoNew items by ObKo
RealBadAngel [Sun, 14 Jul 2013 10:42:38 +0000 (12:42 +0200)]
New items by ObKo

11 years agoBlast resistant concrete (by ObKo)
RealBadAngel [Sun, 14 Jul 2013 10:11:56 +0000 (12:11 +0200)]
Blast resistant concrete (by ObKo)

11 years agoFix crafting recipes and some code style.
RealBadAngel [Sun, 14 Jul 2013 09:30:03 +0000 (11:30 +0200)]
Fix crafting recipes and some code style.

11 years agoRemove deafault creative mod dependency.
RealBadAngel [Sun, 14 Jul 2013 09:21:43 +0000 (11:21 +0200)]
Remove deafault creative mod dependency.

11 years agoGigh -> High
ShadowNinja [Sat, 13 Jul 2013 00:32:38 +0000 (20:32 -0400)]
Gigh -> High

11 years agoFix code style of the high voltage battery box
ShadowNinja [Sat, 13 Jul 2013 00:28:07 +0000 (20:28 -0400)]
Fix code style of the high voltage battery box

11 years agoFix coding style of nuclear reactor
ShadowNinja [Fri, 12 Jul 2013 23:23:29 +0000 (19:23 -0400)]
Fix coding style of nuclear reactor

11 years agoAdd LuaVoxelManip support to forcefield
ShadowNinja [Fri, 12 Jul 2013 19:41:59 +0000 (15:41 -0400)]
Add LuaVoxelManip support to forcefield

11 years agoFix forcefield
ShadowNinja [Fri, 12 Jul 2013 19:06:15 +0000 (15:06 -0400)]
Fix forcefield

11 years agoRemove file that doesn't seem to have any use.
kpoppel [Thu, 11 Jul 2013 21:01:13 +0000 (23:01 +0200)]
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.

11 years agoLoad tools
ShadowNinja [Thu, 11 Jul 2013 19:10:14 +0000 (15:10 -0400)]
Load tools

11 years agoMove files to subfolders
ShadowNinja [Thu, 11 Jul 2013 16:19:09 +0000 (12:19 -0400)]
Move files to subfolders

11 years agoUpdate nuclear_reactor_hv.lua
kpoppel [Thu, 11 Jul 2013 12:33:03 +0000 (14:33 +0200)]
Update nuclear_reactor_hv.lua

Fix temporary recipe.

11 years agoAdd nuclear reactor
kpoppel [Wed, 10 Jul 2013 23:04:58 +0000 (01:04 +0200)]
Add nuclear reactor

Still needs some work. I am pushing it to get ideas and feedback.
Also fix some bugs in the LV coal generator that were found while making
the nuclear reactor.

Conflicts:
technic/init.lua

11 years agoFix HV battery box and some indentation.
kpoppel [Mon, 8 Jul 2013 20:11:20 +0000 (22:11 +0200)]
Fix HV battery box and some indentation.
Bug found by pagliaccio.

11 years agoMerge branch 'indev'
ShadowNinja [Mon, 8 Jul 2013 20:53:44 +0000 (16:53 -0400)]
Merge branch 'indev'

Conflicts:
technic/alloy_furnace.lua
technic/alloy_furnaces_commons.lua
technic/battery_box.lua
technic/battery_box_hv.lua
technic/battery_box_mv.lua
technic/chainsaw.lua
technic/cnc.lua
technic/cnc_nodes.lua
technic/electric_furnace.lua
technic/grinder.lua
technic/init.lua
technic/solar_array_hv.lua
technic/solar_array_lv.lua
technic/solar_array_mv.lua
technic/solar_panel.lua
unified_inventory/api.lua
unified_inventory/depends.txt

11 years agoMerge pull request #43 from ObKo/indev-enriched-uranium
kpoppel [Sat, 6 Jul 2013 22:55:26 +0000 (15:55 -0700)]
Merge pull request #43 from ObKo/indev-enriched-uranium

Enriched Uranium.

11 years agoEnriched Uranium.
Konstantin Oblaukhov [Sat, 6 Jul 2013 13:52:41 +0000 (20:52 +0700)]
Enriched Uranium.

11 years agoMerge pull request #42 from ObKo/indev-uranium
RealBadAngel [Sat, 6 Jul 2013 13:22:39 +0000 (06:22 -0700)]
Merge pull request #42 from ObKo/indev-uranium

Improved extractor

11 years agoMerge changes made in technic_game
RealBadAngel [Sat, 6 Jul 2013 08:35:48 +0000 (10:35 +0200)]
Merge changes made in technic_game

11 years agoSupport for multiple-input recipes in extractor.
Konstantin Oblaukhov [Sat, 6 Jul 2013 08:19:15 +0000 (15:19 +0700)]
Support for multiple-input recipes in extractor.

11 years agoMade the supply converter reset its supply and demand stats if the cabling is bad.
kpoppel [Fri, 5 Jul 2013 22:31:48 +0000 (00:31 +0200)]
Made the supply converter reset its supply and demand stats if the cabling is bad.

11 years agoForgot to reset demand on power failure.
kpoppel [Fri, 5 Jul 2013 22:22:12 +0000 (00:22 +0200)]
Forgot to reset demand on power failure.

11 years agoMerge branch 'indev' of https://github.com/RealBadAngel/technic into indev
kpoppel [Fri, 5 Jul 2013 22:19:05 +0000 (00:19 +0200)]
Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev

11 years agoFix a bug when digging up a small cube light.
kpoppel [Fri, 5 Jul 2013 22:17:56 +0000 (00:17 +0200)]
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.

11 years agoMerge pull request #40 from m97/indev
RealBadAngel [Fri, 5 Jul 2013 13:20:28 +0000 (06:20 -0700)]
Merge pull request #40 from m97/indev

Add extractor.

11 years agoNew textures for lumps and ingots.
Konstantin Oblaukhov [Wed, 26 Jun 2013 13:48:50 +0000 (20:48 +0700)]
New textures for lumps and ingots.

11 years agoUse ores from default instead of moreores
ShadowNinja [Fri, 5 Jul 2013 05:09:33 +0000 (01:09 -0400)]
Use ores from default instead of moreores

11 years agoImproved cross-compatibility with homedecor's brass ingots.
Vanessa Ezekowitz [Fri, 5 Jul 2013 03:32:20 +0000 (23:32 -0400)]
Improved cross-compatibility with homedecor's brass ingots.

11 years agoFix cycling power drain on the forcefield. Now it disables itself if no power.
kpoppel [Thu, 4 Jul 2013 19:39:29 +0000 (21:39 +0200)]
Fix cycling power drain on the forcefield. Now it disables itself if no power.

11 years agoForcefield now working with updated power scheme.
kpoppel [Thu, 4 Jul 2013 19:33:27 +0000 (21:33 +0200)]
Forcefield now working with updated power scheme.

11 years agoTextures. I really need help on some nice ones.
kpoppel [Thu, 4 Jul 2013 18:29:38 +0000 (20:29 +0200)]
Textures. I really need help on some nice ones.

11 years agoFix item wear.
kpoppel [Thu, 4 Jul 2013 17:19:45 +0000 (19:19 +0200)]
Fix item wear.

11 years agoAdd extractor.
m97 [Thu, 4 Jul 2013 17:05:00 +0000 (19:05 +0200)]
Add extractor.

Add extractor for make more rubber from latex. Moved make dyes from
grinder to extractor.

11 years agoFix to formspec background element syntax
RealBadAngel [Wed, 3 Jul 2013 21:32:41 +0000 (23:32 +0200)]
Fix to formspec background element syntax

11 years agoSilenced the power radiator.
kpoppel [Tue, 2 Jul 2013 20:45:08 +0000 (22:45 +0200)]
Silenced the power radiator.

11 years agoRemoved down_converters as they are superseeded by the new supply converter.
kpoppel [Tue, 2 Jul 2013 20:26:45 +0000 (22:26 +0200)]
Removed down_converters as they are superseeded by the new supply converter.

11 years agoMerge pull request #38 from kpoppel/master
kpoppel [Mon, 1 Jul 2013 22:19:06 +0000 (15:19 -0700)]
Merge pull request #38 from kpoppel/master

Changed the way energy is distributed.

This merge will likely require machines to be dug up and placed again.
Added is less server load, electrical lighting, up/down conversion.
It can all be reduxed to a songle ABM if we like to.

11 years agoChanged power distribution method and streamlined the various existing machines.
kpoppel [Mon, 1 Jul 2013 22:03:36 +0000 (00:03 +0200)]
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.

This update will most likely require existing networks to be dug up and placed again. Also the
switching station must be added.

11 years agoRe-add Framed Glass
RealBadAngel [Sun, 30 Jun 2013 19:47:32 +0000 (21:47 +0200)]
Re-add Framed Glass

11 years agoSync with indev branch, bump version to 0.4.7
RealBadAngel [Sun, 30 Jun 2013 05:12:02 +0000 (07:12 +0200)]
Sync with indev branch, bump version to 0.4.7

11 years agoMerge pull request #36 from ObKo/blocks
Jordan Snelling [Thu, 27 Jun 2013 07:40:03 +0000 (00:40 -0700)]
Merge pull request #36 from ObKo/blocks

Blocks of metal.

11 years agoNew blocks of metal.
Konstantin Oblaukhov [Thu, 27 Jun 2013 02:13:44 +0000 (09:13 +0700)]
New blocks of metal.

11 years agoMerge pull request #33 from kaeza/place_craftitems
Jordan Snelling [Fri, 21 Jun 2013 16:40:26 +0000 (09:40 -0700)]
Merge pull request #33 from kaeza/place_craftitems

Deployers and constructors now able to "place" craftitems.

11 years agoDeployers and constructors now able to "place" craftitems.
Diego Martínez [Fri, 21 Jun 2013 03:20:20 +0000 (00:20 -0300)]
Deployers and constructors now able to "place" craftitems.

11 years agoAdded case study of radiated power through inductive coils.
kpoppel [Tue, 18 Jun 2013 22:24:37 +0000 (00:24 +0200)]
Added case study of radiated power through inductive coils.

11 years agoMerge pull request #4 from RealBadAngel/indev
kpoppel [Tue, 18 Jun 2013 17:18:23 +0000 (10:18 -0700)]
Merge pull request #4 from RealBadAngel/indev

Indev

11 years agoMerge pull request #32 from kaeza/master
Jordan Snelling [Tue, 18 Jun 2013 13:52:34 +0000 (06:52 -0700)]
Merge pull request #32 from kaeza/master

Constructor now digs node drops instead of actual nodes.

11 years agoConstructor now digs node drops instead of actual nodes.
Diego Martínez [Tue, 18 Jun 2013 13:46:28 +0000 (10:46 -0300)]
Constructor now digs node drops instead of actual nodes.

11 years agoMerge pull request #23 from Novatux/frames
RealBadAngel [Sat, 15 Jun 2013 13:33:33 +0000 (06:33 -0700)]
Merge pull request #23 from Novatux/frames

Frames destroy liquids they should replace and are not blocked by them.

11 years agoMerge pull request #27 from kpoppel/master
kpoppel [Wed, 12 Jun 2013 21:34:25 +0000 (14:34 -0700)]
Merge pull request #27 from kpoppel/master

Adding down converters.

11 years agoAdded the Mv and HV down converters.
kpoppel [Wed, 12 Jun 2013 21:30:37 +0000 (23:30 +0200)]
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.

11 years agoMerge pull request #26 from kpoppel/master
kpoppel [Wed, 12 Jun 2013 20:12:13 +0000 (13:12 -0700)]
Merge pull request #26 from kpoppel/master

Chainsaw fix.

11 years agoFix to the chainsaw. handle_node drops should no longer become nil.
kpoppel [Wed, 12 Jun 2013 20:08:23 +0000 (22:08 +0200)]
Fix to the chainsaw. handle_node drops should no longer become nil.

11 years agoMerge pull request #24 from kpoppel/master
kpoppel [Thu, 6 Jun 2013 20:58:30 +0000 (13:58 -0700)]
Merge pull request #24 from kpoppel/master

Avoid ingot grinding exploit.

11 years agoWhitespace cleanup
kpoppel [Thu, 6 Jun 2013 20:49:08 +0000 (22:49 +0200)]
Whitespace cleanup

11 years agoChanged grinding of ingots to give 1 dust. This is to avoid duplication exploit.
kpoppel [Thu, 6 Jun 2013 20:46:40 +0000 (22:46 +0200)]
Changed grinding of ingots to give 1 dust. This is to avoid duplication exploit.

11 years agoFrames destroy liquids they should replace and are not blocked by them.
Novatux [Wed, 5 Jun 2013 14:22:45 +0000 (16:22 +0200)]
Frames destroy liquids they should replace and are not blocked by them.

11 years agoMerge pull request #22 from kpoppel/master
kpoppel [Tue, 4 Jun 2013 21:39:24 +0000 (14:39 -0700)]
Merge pull request #22 from kpoppel/master

Added ingot grinding.

11 years agoAdded ingot grinding for the type which already have a <>_dust in place.
kpoppel [Tue, 4 Jun 2013 21:36:07 +0000 (23:36 +0200)]
Added ingot grinding for the type which already have a <>_dust in place.
The default bronze_ingot does not have a dust item.

11 years agoMerge pull request #20 from kpoppel/master
kpoppel [Mon, 3 Jun 2013 22:07:17 +0000 (15:07 -0700)]
Merge pull request #20 from kpoppel/master

Recipe fix.

11 years agoFix solr array recipes for hv and mv to match that of the lv array.
kpoppel [Mon, 3 Jun 2013 22:05:07 +0000 (00:05 +0200)]
Fix solr array recipes for hv and mv to match that of the lv array.

11 years agoMerge pull request #19 from kpoppel/master
kpoppel [Mon, 3 Jun 2013 21:48:46 +0000 (14:48 -0700)]
Merge pull request #19 from kpoppel/master

Solar arrays and bug fixes to HV tier.

11 years agoRemoving ununsed textures.
kpoppel [Mon, 3 Jun 2013 21:42:44 +0000 (23:42 +0200)]
Removing ununsed textures.
Added more safety to item_drop to get around a fatal server halt issue.

11 years agoAdded solar arrays for all voltage tiers.
kpoppel [Mon, 3 Jun 2013 21:37:04 +0000 (23:37 +0200)]
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.

11 years agoMerge pull request #3 from RealBadAngel/indev
kpoppel [Mon, 3 Jun 2013 20:54:05 +0000 (13:54 -0700)]
Merge pull request #3 from RealBadAngel/indev

Indev

11 years agoHV Battery Box textures added
RealBadAngel [Thu, 30 May 2013 04:01:01 +0000 (06:01 +0200)]
HV Battery Box textures added

11 years agoMake treetap work with moretrees rubber tree.
RealBadAngel [Wed, 29 May 2013 01:59:25 +0000 (03:59 +0200)]
Make treetap work with moretrees rubber tree.
Add moretrees as dependency

11 years agoBugfix
RealBadAngel [Sat, 25 May 2013 21:00:12 +0000 (23:00 +0200)]
Bugfix

11 years agobugfix
RealBadAngel [Sat, 25 May 2013 20:39:25 +0000 (22:39 +0200)]
bugfix

11 years agoMerge pull request #2 from RealBadAngel/indev
kpoppel [Thu, 9 May 2013 21:05:30 +0000 (14:05 -0700)]
Merge pull request #2 from RealBadAngel/indev

Indev

11 years agoAdd HV battery box
RealBadAngel [Thu, 9 May 2013 14:02:02 +0000 (16:02 +0200)]
Add HV battery box

11 years agoAdd stained glass code
RealBadAngel [Thu, 9 May 2013 14:01:18 +0000 (16:01 +0200)]
Add stained glass code

11 years agoAdd stained glass textures
RealBadAngel [Thu, 9 May 2013 14:00:43 +0000 (16:00 +0200)]
Add stained glass textures

11 years agoMerge pull request #17 from kpoppel/master
RealBadAngel [Wed, 8 May 2013 02:46:23 +0000 (19:46 -0700)]
Merge pull request #17 from kpoppel/master

Add more CNC stuff

11 years agoMassive change to the way CNC programs are registered.
kpoppel [Tue, 7 May 2013 23:42:22 +0000 (01:42 +0200)]
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.

Code length also greatly reduced.

11 years agoSlope box fixes. From Bas080.
kpoppel [Tue, 7 May 2013 22:06:54 +0000 (00:06 +0200)]
Slope box fixes. From Bas080.

11 years agoCNC can now change programs while it is working.
kpoppel [Tue, 7 May 2013 20:51:03 +0000 (22:51 +0200)]
CNC can now change programs while it is working.

11 years agoAdd textures for active mode of CNC.
kpoppel [Tue, 7 May 2013 20:34:06 +0000 (22:34 +0200)]
Add textures for active mode of CNC.
Correct two typing bug in battery_box.lua

11 years agoMerge pull request #16 from kpoppel/master
RealBadAngel [Tue, 7 May 2013 14:12:42 +0000 (07:12 -0700)]
Merge pull request #16 from kpoppel/master

Added CNC machine to technic mod. (noncubic goes technic)

11 years agoFixes to te machine level of service.
kpoppel [Mon, 6 May 2013 21:14:27 +0000 (23:14 +0200)]
Fixes to te machine level of service.

11 years agoMerge branch 'master' of https://github.com/kpoppel/technic
kpoppel [Mon, 6 May 2013 18:55:33 +0000 (20:55 +0200)]
Merge branch 'master' of https://github.com/kpoppel/technic

11 years agoMerge pull request #1 from RealBadAngel/indev
kpoppel [Mon, 6 May 2013 18:55:11 +0000 (11:55 -0700)]
Merge pull request #1 from RealBadAngel/indev

Indev

11 years agoAdd milling machine from non cubic to technic mod.
kpoppel [Mon, 6 May 2013 18:00:00 +0000 (20:00 +0200)]
Add milling machine from non cubic to technic mod.
Next step is to make sure it only works if powered.