kpoppel [Thu, 11 Jul 2013 12:33:03 +0000 (14:33 +0200)]
Update nuclear_reactor_hv.lua
Fix temporary recipe.
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
kpoppel [Mon, 8 Jul 2013 20:11:20 +0000 (22:11 +0200)]
Fix HV battery box and some indentation.
Bug found by pagliaccio.
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
kpoppel [Sat, 6 Jul 2013 22:55:26 +0000 (15:55 -0700)]
Merge pull request #43 from ObKo/indev-enriched-uranium
Enriched Uranium.
Konstantin Oblaukhov [Sat, 6 Jul 2013 13:52:41 +0000 (20:52 +0700)]
Enriched Uranium.
RealBadAngel [Sat, 6 Jul 2013 13:22:39 +0000 (06:22 -0700)]
Merge pull request #42 from ObKo/indev-uranium
Improved extractor
RealBadAngel [Sat, 6 Jul 2013 08:35:48 +0000 (10:35 +0200)]
Merge changes made in technic_game
Konstantin Oblaukhov [Sat, 6 Jul 2013 08:19:15 +0000 (15:19 +0700)]
Support for multiple-input recipes in extractor.
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.
kpoppel [Fri, 5 Jul 2013 22:22:12 +0000 (00:22 +0200)]
Forgot to reset demand on power failure.
kpoppel [Fri, 5 Jul 2013 22:19:05 +0000 (00:19 +0200)]
Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev
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.
RealBadAngel [Fri, 5 Jul 2013 13:20:28 +0000 (06:20 -0700)]
Merge pull request #40 from m97/indev
Add extractor.
Konstantin Oblaukhov [Wed, 26 Jun 2013 13:48:50 +0000 (20:48 +0700)]
New textures for lumps and ingots.
ShadowNinja [Fri, 5 Jul 2013 05:09:33 +0000 (01:09 -0400)]
Use ores from default instead of moreores
Vanessa Ezekowitz [Fri, 5 Jul 2013 03:32:20 +0000 (23:32 -0400)]
Improved cross-compatibility with homedecor's brass ingots.
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.
kpoppel [Thu, 4 Jul 2013 19:33:27 +0000 (21:33 +0200)]
Forcefield now working with updated power scheme.
kpoppel [Thu, 4 Jul 2013 18:29:38 +0000 (20:29 +0200)]
Textures. I really need help on some nice ones.
kpoppel [Thu, 4 Jul 2013 17:19:45 +0000 (19:19 +0200)]
Fix item wear.
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.
RealBadAngel [Wed, 3 Jul 2013 21:32:41 +0000 (23:32 +0200)]
Fix to formspec background element syntax
kpoppel [Tue, 2 Jul 2013 20:45:08 +0000 (22:45 +0200)]
Silenced the power radiator.
kpoppel [Tue, 2 Jul 2013 20:26:45 +0000 (22:26 +0200)]
Removed down_converters as they are superseeded by the new supply converter.
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.
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.
RealBadAngel [Sun, 30 Jun 2013 19:47:32 +0000 (21:47 +0200)]
Re-add Framed Glass
RealBadAngel [Sun, 30 Jun 2013 05:12:02 +0000 (07:12 +0200)]
Sync with indev branch, bump version to 0.4.7
Jordan Snelling [Thu, 27 Jun 2013 07:40:03 +0000 (00:40 -0700)]
Merge pull request #36 from ObKo/blocks
Blocks of metal.
Konstantin Oblaukhov [Thu, 27 Jun 2013 02:13:44 +0000 (09:13 +0700)]
New blocks of metal.
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.
Diego Martínez [Fri, 21 Jun 2013 03:20:20 +0000 (00:20 -0300)]
Deployers and constructors now able to "place" craftitems.
kpoppel [Tue, 18 Jun 2013 22:24:37 +0000 (00:24 +0200)]
Added case study of radiated power through inductive coils.
kpoppel [Tue, 18 Jun 2013 17:18:23 +0000 (10:18 -0700)]
Merge pull request #4 from RealBadAngel/indev
Indev
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.
Diego Martínez [Tue, 18 Jun 2013 13:46:28 +0000 (10:46 -0300)]
Constructor now digs node drops instead of actual nodes.
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.
kpoppel [Wed, 12 Jun 2013 21:34:25 +0000 (14:34 -0700)]
Merge pull request #27 from kpoppel/master
Adding 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.
kpoppel [Wed, 12 Jun 2013 20:12:13 +0000 (13:12 -0700)]
Merge pull request #26 from kpoppel/master
Chainsaw fix.
kpoppel [Wed, 12 Jun 2013 20:08:23 +0000 (22:08 +0200)]
Fix to the chainsaw. handle_node drops should no longer become nil.
kpoppel [Thu, 6 Jun 2013 20:58:30 +0000 (13:58 -0700)]
Merge pull request #24 from kpoppel/master
Avoid ingot grinding exploit.
kpoppel [Thu, 6 Jun 2013 20:49:08 +0000 (22:49 +0200)]
Whitespace cleanup
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.
Novatux [Wed, 5 Jun 2013 14:22:45 +0000 (16:22 +0200)]
Frames destroy liquids they should replace and are not blocked by them.
kpoppel [Tue, 4 Jun 2013 21:39:24 +0000 (14:39 -0700)]
Merge pull request #22 from kpoppel/master
Added ingot grinding.
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.
kpoppel [Mon, 3 Jun 2013 22:07:17 +0000 (15:07 -0700)]
Merge pull request #20 from kpoppel/master
Recipe fix.
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.
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.
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.
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.
kpoppel [Mon, 3 Jun 2013 20:54:05 +0000 (13:54 -0700)]
Merge pull request #3 from RealBadAngel/indev
Indev
RealBadAngel [Thu, 30 May 2013 04:01:01 +0000 (06:01 +0200)]
HV Battery Box textures added
RealBadAngel [Wed, 29 May 2013 01:59:25 +0000 (03:59 +0200)]
Make treetap work with moretrees rubber tree.
Add moretrees as dependency
RealBadAngel [Sat, 25 May 2013 21:00:12 +0000 (23:00 +0200)]
Bugfix
RealBadAngel [Sat, 25 May 2013 20:39:25 +0000 (22:39 +0200)]
bugfix
kpoppel [Thu, 9 May 2013 21:05:30 +0000 (14:05 -0700)]
Merge pull request #2 from RealBadAngel/indev
Indev
RealBadAngel [Thu, 9 May 2013 14:02:02 +0000 (16:02 +0200)]
Add HV battery box
RealBadAngel [Thu, 9 May 2013 14:01:18 +0000 (16:01 +0200)]
Add stained glass code
RealBadAngel [Thu, 9 May 2013 14:00:43 +0000 (16:00 +0200)]
Add stained glass textures
RealBadAngel [Wed, 8 May 2013 02:46:23 +0000 (19:46 -0700)]
Merge pull request #17 from kpoppel/master
Add more CNC stuff
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.
kpoppel [Tue, 7 May 2013 22:06:54 +0000 (00:06 +0200)]
Slope box fixes. From Bas080.
kpoppel [Tue, 7 May 2013 20:51:03 +0000 (22:51 +0200)]
CNC can now change programs while it is working.
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
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)
kpoppel [Mon, 6 May 2013 21:14:27 +0000 (23:14 +0200)]
Fixes to te machine level of service.
kpoppel [Mon, 6 May 2013 18:55:33 +0000 (20:55 +0200)]
Merge branch 'master' of https://github.com/kpoppel/technic
kpoppel [Mon, 6 May 2013 18:55:11 +0000 (11:55 -0700)]
Merge pull request #1 from RealBadAngel/indev
Indev
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.
ShadowNinja [Fri, 26 Apr 2013 01:39:08 +0000 (21:39 -0400)]
Store configuration in the world directory.
RealBadAngel [Sat, 27 Apr 2013 08:04:17 +0000 (10:04 +0200)]
Add HV wireing
RealBadAngel [Thu, 25 Apr 2013 16:45:15 +0000 (18:45 +0200)]
Add framedglass mod that uses new drawtype
Vanessa Ezekowitz [Sat, 20 Apr 2013 06:28:24 +0000 (02:28 -0400)]
item pickup files were wrongly named.
RealBadAngel [Sat, 20 Apr 2013 06:13:58 +0000 (08:13 +0200)]
range fix again
Vanessa Ezekowitz [Sat, 20 Apr 2013 06:02:46 +0000 (02:02 -0400)]
converted item drop sounds to mono, normalized to -3.0dB
RealBadAngel [Sat, 20 Apr 2013 05:53:35 +0000 (07:53 +0200)]
bug fix
RealBadAngel [Sat, 20 Apr 2013 05:43:49 +0000 (07:43 +0200)]
Item drop sounds range fix
Vanessa Ezekowitz [Sat, 20 Apr 2013 05:21:23 +0000 (01:21 -0400)]
new "sizzling" sound for dropping items into lava
Vanessa Ezekowitz [Sat, 20 Apr 2013 04:58:01 +0000 (00:58 -0400)]
Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev
RealBadAngel [Sat, 20 Apr 2013 04:51:49 +0000 (06:51 +0200)]
item drop update
Vanessa Ezekowitz [Sat, 20 Apr 2013 03:42:08 +0000 (23:42 -0400)]
Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev
RealBadAngel [Sat, 20 Apr 2013 03:39:41 +0000 (05:39 +0200)]
item pick-up overhaul
RealBadAngel [Wed, 17 Apr 2013 22:16:32 +0000 (00:16 +0200)]
FIX THAT AGAIN :P
Vanessa Ezekowitz [Mon, 15 Apr 2013 08:49:25 +0000 (04:49 -0400)]
Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev
Vanessa Ezekowitz [Mon, 15 Apr 2013 06:49:22 +0000 (02:49 -0400)]
removed aaa_recipeshook from depends.txt as it is not used anymore.
RealBadAngel [Mon, 15 Apr 2013 06:33:01 +0000 (08:33 +0200)]
avoid nil
RealBadAngel [Mon, 15 Apr 2013 06:28:17 +0000 (08:28 +0200)]
Update crafting guide
RealBadAngel [Mon, 15 Apr 2013 05:56:31 +0000 (07:56 +0200)]
change registering crafting recipes in UI
RealBadAngel [Mon, 15 Apr 2013 05:54:00 +0000 (07:54 +0200)]
Bugfix
RealBadAngel [Mon, 15 Apr 2013 05:52:11 +0000 (07:52 +0200)]
Update recipes
Vanessa Ezekowitz [Mon, 15 Apr 2013 02:53:30 +0000 (22:53 -0400)]
deleted undesired backup file
Vanessa Ezekowitz [Mon, 15 Apr 2013 02:24:55 +0000 (22:24 -0400)]
aliased diamong block back to default one.
Vanessa Ezekowitz [Sun, 14 Apr 2013 07:40:34 +0000 (03:40 -0400)]
remove aaa_recipeshook from unified inventory depends (it isn't needed anymore)
RealBadAngel [Sun, 14 Apr 2013 04:12:49 +0000 (06:12 +0200)]
changes to CraftingGuide
RealBadAngel [Sun, 14 Apr 2013 04:09:04 +0000 (07:09 +0300)]
Create README.md
RealBadAngel [Sun, 14 Apr 2013 02:38:57 +0000 (19:38 -0700)]
Merge pull request #13 from Novatux/master
Change selection box of frames.
Novatux [Sat, 13 Apr 2013 16:17:27 +0000 (18:17 +0200)]
Change selection_box of frames so it is easier to select them.