diff --git a/patchwork.md b/patchwork.md index 46f21aa62..58d70bd47 100644 --- a/patchwork.md +++ b/patchwork.md @@ -461,4 +461,38 @@ and Not sure what irritates me more ``` -both skipped because the changes where already ported. \ No newline at end of file +both skipped because the changes where already ported. + +``` +4ae370b9dbaf1de0ed32a5f32340b1448136c9cc +Merge pull request #606 from TheWireLord/numpadenter-support +``` +Just lua changes. + +``` +f5eb6ce03e0d9bbbf77130452afd4b49e758f7bd +Fix copy-paste error in inventory docs +``` +Skipped because it was already ported. + +``` +663859d2e5a97edefebf9ac36206903d7dd33a3e +Fix double URL decode +``` + +``` +abf425dfb5553483cdc51c50a6b7d8b5e44814f4 +Fix overflow in os.epoch +``` + +``` +e3a672099c1b5d2c06f9fe4d8ccd024fef0873a2 +Fix JEI integration with turtle/pocket upgrades +``` +Skipped because there seems to be no REI integration. + +``` +2f0cae0bc1b038ac092bafa7f65a317537203cd8 +Make upgrade recipe requirements a little more lax +``` +Crafting is still messed up, but this port didn't change the behavior. \ No newline at end of file diff --git a/src/main/resources/data/computercraft/lua/bios.lua b/src/main/resources/data/computercraft/lua/bios.lua index 3e754f111..2a96b3398 100644 --- a/src/main/resources/data/computercraft/lua/bios.lua +++ b/src/main/resources/data/computercraft/lua/bios.lua @@ -338,8 +338,8 @@ function read(_sReplaceChar, _tHistory, _fnComplete, _sDefault) redraw() elseif sEvent == "key" then - if param == keys.enter then - -- Enter + if param == keys.enter or param == keys.numPadEnter then + -- Enter/Numpad Enter if nCompletion then clear() uncomplete()