Merge branch 'master' of https://github.com/Microsoft/pxt-microbit
This commit is contained in:
		@@ -13,4 +13,5 @@ notifications:
 | 
			
		||||
cache:
 | 
			
		||||
  directories:
 | 
			
		||||
    - node_modules
 | 
			
		||||
    - built/cache
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ Please follow instructions at https://github.com/Microsoft/pxt#running-a-target-
 | 
			
		||||
## Universal Windows App
 | 
			
		||||
 | 
			
		||||
The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm)
 | 
			
		||||
that wraps codemicrobit.com and provides additional features.
 | 
			
		||||
that wraps m.pxt.io and provides additional features.
 | 
			
		||||
 | 
			
		||||
### Sideloading
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "pxt-microbit",
 | 
			
		||||
  "version": "0.2.103",
 | 
			
		||||
  "version": "0.2.104",
 | 
			
		||||
  "description": "BBC micro:bit target for PXT",
 | 
			
		||||
  "keywords": [
 | 
			
		||||
    "JavaScript",
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
{
 | 
			
		||||
    "id": "microbit",
 | 
			
		||||
    "name": "code micro:bit",
 | 
			
		||||
    "title": "code micro:bit",
 | 
			
		||||
    "name": "m.pxt.io",
 | 
			
		||||
    "title": "m.pxt.io",
 | 
			
		||||
    "corepkg": "microbit",
 | 
			
		||||
    "bundleddirs": [
 | 
			
		||||
        "libs/microbit",
 | 
			
		||||
@@ -72,13 +72,13 @@
 | 
			
		||||
        "log": true
 | 
			
		||||
    },
 | 
			
		||||
    "appTheme": {
 | 
			
		||||
        "logoUrl": "https://codemicrobit.com/about",
 | 
			
		||||
        "logoUrl": "https://m.pxt.io/about",
 | 
			
		||||
        "logo": "./static/logo.svg",
 | 
			
		||||
        "docsLogo": "./static/docslogo.svg",
 | 
			
		||||
        "portraitLogo":"./static/portraitlogo.svg",
 | 
			
		||||
        "footerLogo": "./static/footerlogo.svg",
 | 
			
		||||
        "homeUrl": "https://codemicrobit.com/",
 | 
			
		||||
        "embedUrl": "https://codemicrobit.com/",
 | 
			
		||||
        "homeUrl": "https://m.pxt.io/",
 | 
			
		||||
        "embedUrl": "https://m.pxt.io/",
 | 
			
		||||
        "koduUrl": "https://www.kodugamelab.com/bbc-microbit/",
 | 
			
		||||
        "visualStudioCode": true,
 | 
			
		||||
        "docMenu": [
 | 
			
		||||
 
 | 
			
		||||
@@ -14,9 +14,9 @@
 | 
			
		||||
    <Resource Language="x-generate" />
 | 
			
		||||
  </Resources>
 | 
			
		||||
  <Applications>
 | 
			
		||||
    <Application Id="App" StartPage="https://codemicrobit.com/">
 | 
			
		||||
    <Application Id="App" StartPage="https://m.pxt.io/">
 | 
			
		||||
      <uap:ApplicationContentUriRules>
 | 
			
		||||
        <uap:Rule Match="https://codemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
 | 
			
		||||
        <uap:Rule Match="https://m.pxt.io/" Type="include" WindowsRuntimeAccess="all" />
 | 
			
		||||
      </uap:ApplicationContentUriRules>
 | 
			
		||||
      <uap:VisualElements DisplayName="code micro:bit" Description="Code editors for the BBC micro:bits" BackgroundColor="white" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
 | 
			
		||||
        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png">
 | 
			
		||||
@@ -27,7 +27,7 @@
 | 
			
		||||
        <uap:Extension Category="windows.fileTypeAssociation">
 | 
			
		||||
          <uap:FileTypeAssociation Name="microbithex">
 | 
			
		||||
            <uap:DisplayName>BBC micro:bit binary file</uap:DisplayName>
 | 
			
		||||
            <uap:InfoTip>.hex file created with codemicrobit.com or microbit.co.uk</uap:InfoTip>
 | 
			
		||||
            <uap:InfoTip>.hex file created with m.pxt.io or microbit.co.uk</uap:InfoTip>
 | 
			
		||||
            <uap:SupportedFileTypes>
 | 
			
		||||
              <uap:FileType ContentType="application/x-microbit-hex">.hex</uap:FileType>
 | 
			
		||||
            </uap:SupportedFileTypes>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user