Commit Graph

668 Commits

Author SHA1 Message Date
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
Konstantin Oblaukhov 8be389e774 Enriched Uranium. 2013-07-06 20:52:41 +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
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 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 8e03d7ded6 Sync with indev branch, bump version to 0.4.7 2013-06-30 07:12:02 +02: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
Diego Martínez a1da74209b Constructor now digs node drops instead of actual nodes. 2013-06-18 10:46:28 -03: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 a27b59dde5 Fix to the chainsaw. handle_node drops should no longer become nil. 2013-06-12 22:08:23 +02: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
kpoppel 26c0bba1f2 Added ingot grinding for the type which already have a <>_dust in place.
The default bronze_ingot does not have a dust item.
2013-06-04 23:36:07 +02:00
kpoppel be774436c1 Fix solr array recipes for hv and mv to match that of the lv array. 2013-06-04 00:05:07 +02:00
kpoppel 4f1a44a80b Removing ununsed textures.
Added more safety to item_drop to get around a fatal server halt issue.
2013-06-03 23:42:44 +02:00
kpoppel 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.
2013-06-03 23:37:04 +02:00
RealBadAngel 7d890428f5 HV Battery Box textures added 2013-05-30 06:01:01 +02:00
RealBadAngel 77254735e4 Make treetap work with moretrees rubber tree.
Add moretrees as dependency
2013-05-29 03:59:25 +02:00
RealBadAngel 64207baa45 Add HV battery box 2013-05-09 16:02:02 +02:00
kpoppel 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.

Code length also greatly reduced.
2013-05-08 01:42:22 +02:00
kpoppel 5940f5bda4 Slope box fixes. From Bas080. 2013-05-08 00:06:54 +02:00
kpoppel fef948c5ac CNC can now change programs while it is working. 2013-05-07 22:51:03 +02:00
kpoppel 7f2be244f2 Add textures for active mode of CNC.
Correct two typing bug in battery_box.lua
2013-05-07 22:34:06 +02:00
kpoppel c1df318e85 Fixes to te machine level of service. 2013-05-06 23:14:27 +02:00
kpoppel d98405f129 Merge branch 'master' of https://github.com/kpoppel/technic 2013-05-06 20:55:33 +02:00
kpoppel 6463b77e60 Add milling machine from non cubic to technic mod.
Next step is to make sure it only works if powered.
2013-05-06 20:00:00 +02:00
ShadowNinja 00328622d9 Store configuration in the world directory. 2013-04-27 13:53:12 -04:00
RealBadAngel 31b1393b21 Add HV wireing 2013-04-27 10:04:17 +02:00
RealBadAngel 41af016603 change registering crafting recipes in UI 2013-04-15 07:56:31 +02:00
RealBadAngel 3d8b2a365d Bugfix 2013-04-15 07:54:00 +02:00
RealBadAngel cdb368913b Update recipes 2013-04-15 07:52:11 +02:00
Novatux 3a52153cd7 Change selection_box of frames so it is easier to select them. 2013-04-13 18:17:27 +02:00
RealBadAngel e139fff8fb Updated item_drop (now as modpack component) 2013-04-08 23:52:20 +02:00
RealBadAngel 6cb1f56fb4 dust texture 2013-04-06 14:52:36 +02:00
RealBadAngel 8d092c9ec8 fix grinding recipes and craft recipe for tool workshop 2013-04-05 22:05:54 +02:00
RealBadAngel fd3f25b5e0 split chests off into a separate modpack component 2013-04-05 04:30:33 +02:00
RealBadAngel 0ca19dacb0 Update 0.4.6-0 2013-04-04 01:17:39 +02:00
RealBadAngel 279776ff62 update 2013-03-30 11:36:45 +01:00
RealBadAngel edd6f8c7e9 New ores code 2013-03-28 15:50:34 +01:00
RealBadAngel 52138943ee back to old ways 2013-03-24 17:46:30 +01:00
ShadowNinja f552406e74 Remove backup files 2013-03-24 00:05:46 -04:00
Vanessa 501b4c0d2b Screwdriver tool is obsolete now, deleted. 2013-03-23 20:59:48 -04:00
Vanessa 195e2f2229 Merge branch 'master' of git://github.com/RealBadAngel/technic 2013-03-23 13:44:26 -04:00
Vanessa 9cc10fd61b fixed ore generation. generate_ore() calls were missing the chunk size
parameter.
2013-03-23 13:40:03 -04:00
ShadowNinja e5d48e9492 Remove unnescescary function calls from forcefields and add an enable/disable button 2013-03-21 16:06:13 -04:00
Vanessa Ezekowitz cbe78c13c1 Merge branch 'master' of git://github.com/RealBadAngel/technic 2013-03-20 10:55:47 -04:00
Vanessa Ezekowitz 6d1e9b4d61 Multiple changes, see below:
removed concrete, marble, marble brick, granite, obsidian

stairs/etc from creative inventory, made them work with circular saw in
moreblocks since this mod depends on that one anyway.  Removed technic obsidian
block entirely and aliased it to the default obsidian block; all stairs/slabs
for obsidian are under the default: namespace.

This depends on a small fix to the circular saw that was just added by
Sokomine.  If your copy of circular saw doesn't have this fix, you can still
use /giveme to get the blocks you need.

Removed custom generate_ore code and made generate-ore calls use
default.generate_ore() since that is the same function anyway.  This is so that
technic can use the C++ version of that function when it is moved back into the
engine.
2013-03-20 10:50:51 -04:00
RealBadAngel c6da0a6713 Added Forcefield generator by ShadowNinja 2013-03-20 03:46:35 +01:00
RealBadAngel 773382cf2c initial stargate code 2013-03-10 18:37:29 +01:00
Vanessa Ezekowitz 9b54837f99 fixed incorrect dependency for moreblocks/stairsplus
(moreblocks contains stairsplus now)
2013-03-09 13:37:45 -05:00
RealBadAngel 8f485a6ee2 bugfix 2013-03-06 21:51:45 +01:00
RealBadAngel fa9ff3b851 Update to work with latest Stairsplus 2013-03-06 21:04:35 +01:00
Kyle 985401a23d Avoid a nil index crash 2013-02-21 17:14:38 -08:00
RealBadAngel 1a09ffaf49 Merge pull request #7 from khonkhortisan/master
Keep players from falling through moving frames
2013-02-21 13:15:57 -08:00
RealBadAngel 7904a3a1d3 Merge remote branch 'origin/master' 2013-02-21 22:02:12 +01:00
RealBadAngel e23f87d20c Reworked power tools, new drills 2013-02-21 22:01:49 +01:00
Kyle 08acacba06 Remove the original only after creating the copy so players don't fall
through moving frames
2013-02-21 11:38:34 -08:00
khonkhortisan 4b0d4ba9ab Rotate frame motor textures
Without adding new images
2013-02-19 19:24:24 -08:00
RealBadAngel 671ba32e5a Fix to last registered power tool not being able to charge (affected blue energy crystal) 2013-02-19 23:11:41 +01:00
RealBadAngel 4a5877a2bc Nore's update to frames 2013-02-17 19:31:12 +01:00
RealBadAngel d037d26bc7 fix to water mill 2013-02-13 00:27:19 +01:00
Sdzen Boco 60d394e0d4 more textures 2013-02-08 21:14:01 -05:00
RealBadAngel 478407f0a3 Nore's frames code with nodebox frames 2013-02-06 15:34:01 +01:00
RealBadAngel a2aef2a7af Update LV grinder code 2013-02-04 03:53:54 +01:00
RealBadAngel 86f39a0d96 new 32x lv,mv and hv textures 2013-02-04 03:04:12 +01:00
RealBadAngel 6123493fd7 Added API functions to register LV and MV machines 2013-02-03 19:28:51 +01:00
RealBadAngel 5d799eb94f added MV Alloy Furnace 2013-02-03 17:56:52 +01:00
RealBadAngel e8fea5f41d add MV alloy furnace textures 2013-02-03 16:07:02 +01:00
RealBadAngel fd26a83fcf Injector upgrade 2013-02-03 14:59:40 +01:00
RealBadAngel 4cefe5c544 better Control Logic Unit textures 2013-02-03 13:52:17 +01:00
RealBadAngel c93bf21e9c update to some 32x textures 2013-02-03 13:44:38 +01:00
RealBadAngel 91cdd1694a Added crafting recipe for Injector 2013-02-03 13:02:22 +01:00
RealBadAngel 74cf4746be Added Injector 2013-02-03 12:56:23 +01:00
RealBadAngel 4411ba6e03 added tubes crafting recipes 2013-02-03 11:53:19 +01:00
RealBadAngel e83a4c652f added mv furnace to PR list 2013-02-03 10:23:55 +01:00
RealBadAngel b55bae95d8 Added fully functional MV electric furnace 2013-02-03 02:17:22 +01:00
RealBadAngel 3b5e6ca05a Added item - Control Logic Unit 2013-02-02 21:26:34 +01:00
RealBadAngel fdc0562b3a Fixes to deployer 2013-02-02 20:42:07 +01:00
RealBadAngel 661f21754a readded sounds 2013-02-02 09:39:39 +01:00
RealBadAngel 061e6bbadc Re-added Deployer
Initial code of MV furnace
2013-02-01 00:28:22 +01:00
RealBadAngel 86f8e17695 Added MV Electric furnace textures 2013-01-27 21:36:24 +01:00
RealBadAngel 82cba919fa cleanup phase2 2013-01-27 14:03:47 +01:00
RealBadAngel 4c3affecbc cleanup 2013-01-27 14:01:53 +01:00
RealBadAngel 887463d95f cleanup 2013-01-27 13:58:47 +01:00
RealBadAngel a30f1db52d fix to mod directory structure 2013-01-27 13:55:14 +01:00
RealBadAngel 704a410fa1 Cleaned all chests code 2013-01-27 13:34:10 +01:00
RealBadAngel e9050c43fd bug fix 2013-01-27 10:27:38 +01:00
RealBadAngel 876218ea81 Bunch of fixes 2013-01-27 10:15:39 +01:00
RealBadAngel 23e1d8e0ca Make Rubber tree using L-Systems 2013-01-02 04:49:03 +01:00
RealBadAngel 67c0d2834d Fixed a bug tool workshop being able to fill up the cans 2013-01-02 02:39:42 +01:00
RealBadAngel 2bb3b42ca0 removed unnecesary files 2013-01-02 02:38:16 +01:00
Sdzen Boco eea96621e8 most of the nodes are now 16x16, now for items then finally, correction of old 16x16 textures 2012-12-22 16:58:46 -05:00
Sdzen Boco c0378f9d5d A few minor additions 2012-12-21 15:21:56 -05:00
Sdzen Boco 401c57f48c Additional revisions to the 16x16 textures including new chests and enhancements. 2012-12-20 11:29:47 -05:00
Sdzen Boco 9358f9b23b replace 32x texture with 16x: ever so sorry for the discrepancies 2012-12-17 10:26:21 -05:00
RealBadAngel 7e7ec9713a bugfix 2012-12-15 00:52:09 +01:00
RealBadAngel e7d3d78ed2 typo fixed 2012-12-13 02:43:45 +01:00
RealBadAngel 7efa3ff73f fix 2012-12-13 02:17:29 +01:00
RealBadAngel b8d77627a4 update the mod 2012-12-13 01:49:02 +01:00