Commit Graph

551 Commits

Author SHA1 Message Date
ShadowNinja
30361afb34 Fix forcefield 2013-07-12 15:07:02 -04:00
kpoppel
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.
2013-07-11 23:01:13 +02:00
ShadowNinja
d497429abc Load tools 2013-07-11 15:11:28 -04:00
ShadowNinja
5d470cd753 Move files to subfolders 2013-07-11 12:31:00 -04:00
kpoppel
afc84d6a8d Update nuclear_reactor_hv.lua
Fix temporary recipe.
2013-07-11 14:33:03 +02:00
kpoppel
3055270a7c 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
2013-07-10 21:45:56 -04:00
kpoppel
13e8857f1a Fix HV battery box and some indentation.
Bug found by pagliaccio.
2013-07-08 17:05:34 -04:00
ShadowNinja
19c9a0443b 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
2013-07-08 16:57:56 -04:00
kpoppel
79e8d26989 Merge pull request #43 from ObKo/indev-enriched-uranium
Enriched Uranium.
2013-07-06 15:55:26 -07:00
Konstantin Oblaukhov
8be389e774 Enriched Uranium. 2013-07-06 20:52:41 +07:00
RealBadAngel
220c61ce91 Merge pull request #42 from ObKo/indev-uranium
Improved extractor
2013-07-06 06:22:39 -07:00
RealBadAngel
3a3700537b Merge changes made in technic_game 2013-07-06 10:35:48 +02:00
Konstantin Oblaukhov
e606b93ac6 Support for multiple-input recipes in extractor. 2013-07-06 15:19:15 +07:00
kpoppel
85d937e199 Made the supply converter reset its supply and demand stats if the cabling is bad. 2013-07-06 00:31:48 +02:00
kpoppel
4c6546ed56 Forgot to reset demand on power failure. 2013-07-06 00:22:12 +02:00
kpoppel
ab38e29a18 Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev 2013-07-06 00:19:05 +02:00
kpoppel
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.
2013-07-06 00:17:56 +02:00
RealBadAngel
b1d668fa3b Merge pull request #40 from m97/indev
Add extractor.
2013-07-05 06:20:28 -07:00
Konstantin Oblaukhov
b78b90d422 New textures for lumps and ingots. 2013-07-05 02:28:22 -04:00
ShadowNinja
2d168e5afc Use ores from default instead of moreores 2013-07-05 01:57:45 -04:00
Vanessa Ezekowitz
465890950b Improved cross-compatibility with homedecor's brass ingots. 2013-07-04 23:33:04 -04:00
kpoppel
73209cc37d Fix cycling power drain on the forcefield. Now it disables itself if no power. 2013-07-04 21:39:29 +02:00
kpoppel
9a0d3f2166 Forcefield now working with updated power scheme. 2013-07-04 21:33:27 +02:00
kpoppel
9770be430d Textures. I really need help on some nice ones. 2013-07-04 20:29:38 +02:00
kpoppel
6e4ffb4883 Fix item wear. 2013-07-04 19:19:45 +02:00
m97
ce5dfa311e Add extractor.
Add extractor for make more rubber from latex. Moved make dyes from
grinder to extractor.
2013-07-04 19:05:00 +02:00
RealBadAngel
66a4a91224 Fix to formspec background element syntax 2013-07-03 23:32:41 +02:00
kpoppel
c7207a9cba Silenced the power radiator. 2013-07-02 22:45:08 +02:00
kpoppel
7201aeb6ba Removed down_converters as they are superseeded by the new supply converter. 2013-07-02 22:26:45 +02:00
kpoppel
053fa59739 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.
2013-07-01 15:19:06 -07:00
kpoppel
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.

This update will most likely require existing networks to be dug up and placed again. Also the
switching station must be added.
2013-07-02 00:03:36 +02:00
RealBadAngel
44508110e8 Re-add Framed Glass 2013-06-30 21:47:32 +02:00
RealBadAngel
8e03d7ded6 Sync with indev branch, bump version to 0.4.7 2013-06-30 07:12:02 +02:00
Jordan Snelling
c687e8cb7b Merge pull request #36 from ObKo/blocks
Blocks of metal.
2013-06-27 00:40:03 -07:00
Konstantin Oblaukhov
9de141ee6b New blocks of metal. 2013-06-27 09:13:44 +07:00
Jordan Snelling
251e8ed7b5 Merge pull request #33 from kaeza/place_craftitems
Deployers and constructors now able to "place" craftitems.
2013-06-21 09:40:26 -07:00
Diego Martínez
0039f38b94 Deployers and constructors now able to "place" craftitems. 2013-06-21 00:20:20 -03:00
kpoppel
37d9d94c44 Added case study of radiated power through inductive coils. 2013-06-19 00:24:37 +02:00
kpoppel
467dcf1d5d Merge pull request #4 from RealBadAngel/indev
Indev
2013-06-18 10:18:23 -07:00
Jordan Snelling
e718c73b36 Merge pull request #32 from kaeza/master
Constructor now digs node drops instead of actual nodes.
2013-06-18 06:52:34 -07:00
Diego Martínez
a1da74209b Constructor now digs node drops instead of actual nodes. 2013-06-18 10:46:28 -03:00
RealBadAngel
60c9d97101 Merge pull request #23 from Novatux/frames
Frames destroy liquids they should replace and are not blocked by them.
2013-06-15 06:33:33 -07:00
kpoppel
390ea04352 Merge pull request #27 from kpoppel/master
Adding down converters.
2013-06-12 14:34:25 -07:00
kpoppel
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.
2013-06-12 23:30:37 +02:00
kpoppel
fc7a23f8b1 Merge pull request #26 from kpoppel/master
Chainsaw fix.
2013-06-12 13:12:13 -07:00
kpoppel
a27b59dde5 Fix to the chainsaw. handle_node drops should no longer become nil. 2013-06-12 22:08:23 +02:00
kpoppel
66d6431a91 Merge pull request #24 from kpoppel/master
Avoid ingot grinding exploit.
2013-06-06 13:58:30 -07:00
kpoppel
802db28dc3 Whitespace cleanup 2013-06-06 22:49:08 +02:00
kpoppel
e62a0fd0c1 Changed grinding of ingots to give 1 dust. This is to avoid duplication exploit. 2013-06-06 22:46:40 +02:00
Novatux
1524a9f610 Frames destroy liquids they should replace and are not blocked by them. 2013-06-05 16:22:45 +02:00