Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9

LICENSE

@@ -34,6 +34,14 @@ Thanks a lot!
 
 -------------------------------------------------------------------------------
 
+The font used for screens and for monospace text in manual was compiled and
+kindly provided by asie. It is assembled from various public domain and MIT
+licenced fonts. For more information, please see:
+
+        https://github.com/asiekierka/unscii-asie
+
+-------------------------------------------------------------------------------
+
 Assets from other sources:
   HDD access samples based on this sample from freesound.org:
     https://www.freesound.org/people/artykris/sounds/117401/

LICENSE-unifont

@@ -1,371 +0,0 @@
-LICENSE
--------
-The source code for everything except the compiled fonts in this current
-release is licensed as follows:
-
-     License for this current distribution of program source
-     files (i.e., everything except the fonts) is released under
-     the terms of the GNU General Public License version 2,
-     or (at your option) a later version.
-
-     See the section below for a copy of the GNU General Public License
-     version 2.
-
-The license for the compiled fonts is covered by the above GPL terms
-with the GNU font embedding exception, as follows:
-
-     As a special exception, if you create a document which uses this font,
-     and embed this font or unaltered portions of this font into the document,
-     this font does not by itself cause the resulting document to be covered
-     by the GNU General Public License. This exception does not however
-     invalidate any other reasons why the document might be covered by the
-     GNU General Public License. If you modify this font, you may extend
-     this exception to your version of the font, but you are not obligated
-     to do so. If you do not wish to do so, delete this exception statement
-     from your version. 
-
-See "http://www.gnu.org/licenses/gpl-faq.html#FontException" for more details.
-
-
-GPL VERSION 2
--------------
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

src/main/resources/assets/opencomputers/doc/ru_RU/item/hoverBoots.md

@@ -8,4 +8,6 @@
 
 Дополнительно, они позволяют без прыжка подыматься на высоту одного блока. Это особенно удобно, когда вы бегаете по горам, например, т.е. занимаетесь делами типичного Майнкрафтера. Ну, или я так слышал.
 
-Ботинки могут быть заряжены в [заряднике](../block/charger.md) OpenComputers или любом другом устройстве, например зарядник Applied Energistics 2, хранилища энергии IndustrialCraft 2 или энергоячейке Thermal Expansion.
+Ботинки могут быть заряжены в [заряднике](../block/charger.md) OpenComputers или любом другом устройстве, например зарядник Applied Energistics 2, хранилища энергии IndustrialCraft 2 или энергоячейке Thermal Expansion.
+ 
+Вы также можете изменить цвет ботинок, соединив их с любым из красителей в верстаке. Также как и с кожаной броней, вы можете использовать несколько красителей одновременно для получения разнообразия цветов. Краску можно удалить соединив ботинок и ведра воды в верстаке или бросив их в котел.

src/main/resources/assets/opencomputers/loot/OpenOS/bin/grep.lua

@@ -152,13 +152,13 @@ if ignore_case then
 end
 
 local function getAllFiles(dir, file_list)
-  local spath = shell.resolve(dir)
+  for node in fs.list(shell.resolve(dir)) do
-  for node in fs.list(spath) do
+    local rel_path = dir:gsub("/+$","") .. '/' .. node
-    local node_path = shell.resolve(spath ..'/'.. node)
+    local resolved_path = shell.resolve(rel_path)
-    if fs.isDirectory(node_path) then
+    if fs.isDirectory(resolved_path) then
-      getAllFiles(node_path, file_list)
+      getAllFiles(rel_path, file_list)
     else
-      file_list[#file_list+1] = node_path
+      file_list[#file_list+1] = rel_path
     end
   end
 end
@@ -248,36 +248,52 @@ end
 local ec = nil
 local any_hit_ec = 1
 local function test(m,p)
-  local match = {}
+  local empty_line = true
-  local i, j = m.line:find(p, 1, plain)
+  local last_index, slen = 1, #m.line
-  if i then
+  local needs_filename, needs_line_num = include_filename, print_line_num
-    match.word = not match_whole_word or not (m.line:sub(i-1,i-1)..m.line:sub(j+1,j+1)):find("[%a_]")
+  local hit_value = 1
-    match.line = not match_whole_line or i==1 and j==#m.line
+  while last_index <= slen and not m.close do
+    local i, j = m.line:find(p, last_index, plain)
+    local word_fail, line_fail =
+      match_whole_word and not (i and not (m.line:sub(i-1,i-1)..m.line:sub(j+1,j+1)):find("[%a_]")),
+      match_whole_line and not (i==1 and j==slen)
+    local matched = not ((m_only or last_index==1) and not i)
+    if (hit_value == 1 and word_fail) or line_fail then
+      matched,i,j = false
+    end
+    if invert_match == matched then break end
+    if max_matches == 0 then os.exit(1) end
+    any_hit_ec = 0
+    m.hits, hit_value = m.hits + hit_value, 0
+    if max_matches == m.hits or f_only or no_only then
+      m.close = true
+    end
+    if flush or quiet then return end
+    if needs_filename then
+      write(m.label, LABEL_COLOR)
+      write(':', COLON_COLOR)
+      needs_filename = nil
+    end
+    if needs_line_num then
+      write(m.line_num, LINE_NUM_COLOR)
+      write(':', COLON_COLOR)
+      needs_line_num = nil
+    end
+    local p=m_only and '' or m.line:sub(last_index,(i or 0)-1)
+    local g=i and m.line:sub(i,j) or ''
+    if i==1 then g=trim_front(g) elseif last_index==1 then p=trim_front(p) end
+    if j==slen then g=trim_back(g) elseif not i then p=trim_back(p) end
+    write(p)
+    write(g, MATCH_COLOR)
+    empty_line = false
+    last_index = (j or slen)+1
+    if m_only or last_index>slen then
+      write("\n")
+      empty_line = true
+      needs_filename, needs_line_num = include_filename, print_line_num
+    end
   end
-  if invert_match == not not (i and match.word and match.line) then return end
+  if not empty_line then write("\n") end
-  if max_matches == 0 then os.exit(1) end
-  any_hit_ec = 0
-  m.hits = m.hits + 1
-  if max_matches == m.hits or f_only or no_only then
-    m.close = true
-  end
-  if flush or quiet then return end
-  if include_filename then
-    write(m.label, LABEL_COLOR)
-    write(':', COLON_COLOR)
-  end
-  if print_line_num then
-    write(m.line_num, LINE_NUM_COLOR)
-    write(':', COLON_COLOR)
-  end
-  local p=m_only and '' or trim_front(i and m.line:sub(1,i-1) or m.line)
-  local g=i and m.line:sub(i,j) or ''
-  local s=m_only and '' or trim_back(i and m.line:sub(j+1,-1) or '')
-  if p==''then g=trim_front(g) end
-  if s==''then g=trim_back(g) end
-  write(p) 
-  write(g, MATCH_COLOR)
-  write(s..'\n')
 end
 for meta,status in readLines() do
   if not meta then

src/main/resources/assets/opencomputers/loot/OpenOS/boot/93_term.lua

@@ -27,3 +27,10 @@ event.listen("component_unavailable", function(_,type)
     end
   end
 end)
+
+event.listen("screen_resized", function(_,addr,w,h)
+  local window = term.internal.window()
+  if term.isAvailable(window) and window.screen.address == addr and window.fullscreen then
+    window.w,window.h = w,h
+  end
+end)

src/main/resources/assets/opencomputers/loot/OpenOS/lib/process.lua

@@ -86,10 +86,10 @@ function process.load(path, env, init, name)
       -- msg can be a custom error object
       local msg = result[2]
       if type(msg) == 'table' then
-        assert(msg.reason=="terminated",msg.reason)
+        if msg.reason~="terminated" then error(msg.reason,2) end
         result={0,msg.code}
       else
-        assert(false, msg)
+        error(msg,2)
       end
     end
     return select(2,table.unpack(result))

src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua

@@ -15,8 +15,9 @@ local W = term.internal.window
 
 local local_env = {unicode=unicode,event=event,process=process,W=W,kb=kb}
 
-function term.internal.open(dx, dy, w, h)
+function term.internal.open(...)
-  local window = {x=1,y=1,dx=dx or 0,dy=dy or 0,w=w,h=h,blink=true}
+  local dx, dy, w, h = ...
+  local window = {x=1,y=1,fullscreen=select("#",...)==0,dx=dx or 0,dy=dy or 0,w=w,h=h,blink=true}
   return window
 end
 
@@ -25,6 +26,16 @@ function term.getViewport(window)
   return window.w, window.h, window.dx, window.dy, window.x, window.y
 end
 
+function term.setViewport(w,h,dx,dy,x,y,window)
+  window = window or W()
+
+  local gw,gh = window.gpu.getViewport()
+  w,h,dx,dy,x,y = w or gw,h or gh,dx or 0,dy or 0,x or 1,y or 1
+
+  window.w,window.h,window.dx,window.dy,window.x,window.y,window.gw,window.gh=
+    w,h,dx,dy,x,y, gw, gh
+end
+
 function term.gpu(window)
   window = window or W()
   return window.gpu
@@ -40,7 +51,7 @@ end
 
 function term.isAvailable(w)
   w = w or W()
-  return not not (w.gpu and w.screen)
+  return w and not not (w.gpu and w.screen)
 end
 
 function term.internal.pull(input, c, off, p, ...)
@@ -202,12 +213,13 @@ function term.readKeyboard(ops)
   end
   while true do
     local name, address, char, code = term.internal.pull(input)
-    local c, ctrl = nil, kb.isControlDown(address)
+    local c = nil
     hints.cache=char==9 and hints.cache or nil
     if name =="interrupted" then draw("^C\n",true) return ""
     elseif name=="touch" or name=="drag" then term.internal.onTouch(input,char,code)
     elseif name=="clipboard" then c=char
     elseif name=="key_down" then
+      local ctrl = kb.isControlDown(address)
       if ctrl and code == keys.d then return
       elseif char==9 then term.internal.tab(input,hints)
       elseif char==13 and filter(input) then
@@ -262,6 +274,7 @@ end
 
 function term.drawText(value, wrap, window)
   window = window or W()
+  if not window then return end
   local gpu = window.gpu
   if not gpu then return end
   local w,h,dx,dy,x,y = term.getViewport(window)
@@ -338,17 +351,13 @@ function term.setCursorBlink(enabled)
 end
 
 function term.bind(gpu, screen, kb, window)
-  checkArg(1,gpu,"table")
-  checkArg(2,screen,"table")
-  checkArg(3,kb,"table","nil")
-  checkArg(4,window,"table","nil")
   window = window or W()
-  window.gpu = gpu
+  window.gpu = gpu or window.gpu
-  window.screen = screen
+  window.screen = screen or window.screen
-  window.keyboard = kb
+  window.keyboard = kb or window.keyboard
-  window.gw,window.gh = gpu.getViewport()
+  if window.fullscreen then
-  window.w = math.min(window.gw - window.dx, window.w or window.gw)
+    term.setViewport(nil,nil,nil,nil,window.x,window.y,window)
-  window.h = math.min(window.gh - window.dy, window.h or window.gh)
+  end
 end
 
 function --[[@delayloaded-start@]] term.internal.ctrl_movement(input, dir)

src/main/scala/li/cil/oc/client/renderer/font/FontParserUnifont.java

@@ -25,7 +25,7 @@ public class FontParserUnifont implements IGlyphProvider {
             glyphs[i] = null;
         }
         try {
-            final InputStream font = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation(Settings.resourceDomain(), "unifont.hex")).getInputStream();
+            final InputStream font = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation(Settings.resourceDomain(), "font.hex")).getInputStream();
             OpenComputers.log().info("Initialized Unifont glyph provider.");
             try {
                 OpenComputers.log().info("Initializing Unifont glyph provider.");