Commit Graph

942 Commits

Author SHA1 Message Date
RealBadAngel
e08ee75990 Merge pull request #79 from metalstache/master
Fix recipe and battery box compatibility
2013-08-04 06:03:35 -07:00
metalstache
d5c5541501 Fix recipe and battery box compatibility 2013-08-03 18:15:51 -04:00
RealBadAngel
b4b222681d Merge pull request #71 from bulldog98/mk3_fix
Fixed the crafting for mining_drill mk3
2013-08-01 20:38:53 -07:00
RealBadAngel
f68d305252 Merge pull request #78 from metalstache/master
Add node metadata storage and Technic machine support
2013-08-01 20:38:14 -07:00
metalstache
3b7695edf4 Add node metadata storage and Technic machine support 2013-08-01 18:46:20 -04:00
RealBadAngel
2159bfba60 Merge pull request #77 from metalstache/master
Add Wrench mod
2013-07-31 09:08:13 -07:00
metalstache
21c96a971f Add Wrench mod 2013-07-31 11:55:59 -04:00
kol0
57dc8904a0 correction amount of energy produced
I correct amount of energy produced with descripton value.
2013-07-30 11:30:12 +02:00
Jonathan Raphael Joachim Kolberg
91329b19a4 Fixed the crafting for mining_drill mk3 2013-07-28 12:45:53 +02:00
Jonathan Raphael Joachim Kolberg
50b8aed01c Finaly fixed the statements
The idle condition for mv mashines is changed to what it should be
because sending items into the tube is done in idle, so we only care
if there is something left in src
2013-07-26 19:29:16 +02:00
Jonathan Raphael Joachim Kolberg
55caa109c9 simplified a statement 2013-07-26 12:44:27 -04:00
RealBadAngel
d8ec3f8bbe Deployer and node breaker are now moved to pipeworks. 2013-07-25 07:59:00 +02:00
RealBadAngel
f4d9a1e4e7 Merge pull request #64 from hdastwb/mvidlecond
fix the mv tube-enabled idle condition
2013-07-24 03:39:09 -07:00
hdastwb
2d7f750d9a fixed a condition with mv machines so as to not power down machines with stuff to grind/smelt but nothing to tube out 2013-07-23 21:43:36 -04:00
RealBadAngel
e38f6f0983 Merge pull request #62 from hdastwb/connect_sides
add tube routing support
2013-07-22 23:38:39 -07:00
RealBadAngel
b7649c75fc Merge pull request #60 from hdastwb/mesesandtube
MESE Sand Tubes
2013-07-22 21:38:07 -07:00
hdastwb
2e4d983be7 added connect_sides to appropriate tube tables 2013-07-21 17:15:03 -04:00
ShadowNinja
e43e6cc1b0 Merge pull request #61 from hdastwb/patch-1
Convert remove_items to a number in item_drop to avoid crashes
2013-07-20 14:48:18 -07:00
hdastwb
17f3ce2ba3 convert remove_items to avoid crashes 2013-07-20 11:32:26 -04:00
hdastwb
b3cf1ab693 added a recipe for MESE sand tubes 2013-07-19 17:51:24 -04:00
RealBadAngel
acef4b1f63 Merge pull request #59 from bulldog98/master
added a mv grinder
2013-07-19 07:24:02 -07:00
Jonathan Raphael Joachim Kolberg
d37cf7d536 added a mv grinder 2013-07-19 10:58:38 +02:00
RealBadAngel
7633b2b1b7 Another try to get rid of default creative without depending on it. 2013-07-18 00:51:06 +02:00
RealBadAngel
dfd478b2e8 remove debug code 2013-07-17 21:18:02 +02:00
RealBadAngel
79858dca5e - 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.
2013-07-17 20:28:42 +02:00
RealBadAngel
2ef1bb7e46 backgrounds for mv and hv batboxes 2013-07-17 19:15:29 +02:00
RealBadAngel
acc7f71302 Commons for battery boxes 2013-07-17 19:14:40 +02:00
RealBadAngel
3bc6cad671 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
2013-07-17 19:14:01 +02:00
RealBadAngel
55a0a40963 Add compressing method to UI 2013-07-17 11:54:52 +02:00
RealBadAngel
922d2554a9 LV batbox background 2013-07-15 21:39:31 +02:00
RealBadAngel
b7deb0db84 32x compressor textures 2013-07-15 20:23:08 +02:00
RealBadAngel
410afaa583 Add compressor 2013-07-15 20:21:49 +02:00
RealBadAngel
58e5f65234 New items by ObKo (textures) 2013-07-14 12:43:11 +02:00
RealBadAngel
58ae29c5a4 New items by ObKo 2013-07-14 12:42:38 +02:00
RealBadAngel
6055ed6503 Blast resistant concrete (by ObKo) 2013-07-14 12:11:56 +02:00
RealBadAngel
f4302fcbfa Fix crafting recipes and some code style. 2013-07-14 11:30:03 +02:00
RealBadAngel
2f23f71652 Remove deafault creative mod dependency. 2013-07-14 11:21:43 +02:00
ShadowNinja
57cd394773 Gigh -> High 2013-07-12 20:32:38 -04:00
ShadowNinja
1f4c621ffc Fix code style of the high voltage battery box 2013-07-12 20:28:07 -04:00
ShadowNinja
187015e073 Fix coding style of nuclear reactor 2013-07-12 19:23:29 -04:00
ShadowNinja
4f35f407ce Add LuaVoxelManip support to forcefield 2013-07-12 15:41:59 -04:00
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