Merge remote-tracking branch 'upstream/develop' into develop

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 go:
- - 1.7.6
- - 1.8.5
- - 1.9.2
+ - "1.10"
+ - "1.11"
+ - "1.12"
  - tip
 
 install:

docker/Dockerfile

@@ -4,7 +4,7 @@ FROM frolvlad/alpine-glibc
 MAINTAINER Mitch Roote <mitch@r00t.ca>
 
 ENV FACTORIO_VERSION=latest \
-    MANAGER_VERSION=0.8.0 \
+    MANAGER_VERSION=0.8.1 \
     ADMIN_PASSWORD=factorio
 
 VOLUME /opt/factorio/saves /opt/factorio/mods /opt/factorio/config /security

ui/App/App.jsx

@@ -181,7 +181,7 @@ class App extends React.Component {
                         <Route path="/saves" render={(props) => {return <SavesContent {...props} {...appProps}/>}}/>
                         <Route path="/config" render={(props) => {return <ConfigContent {...props} {...appProps}/>}}/>
                         <Route path="/console" render={(props) => {return <ConsoleContent {...props} {...appProps}/>}}/>
-                        <Route exakt path="/" render={(props) => {return <Index {...props} {...appProps} />}}/>
+                        <Route exact path="/" render={(props) => {return <Index {...props} {...appProps} />}}/>
                     </Switch>
 
                     <Footer />

ui/index.js

@@ -26,10 +26,9 @@ $('body').on("show.bs.collapse hide.bs.collapse", (e) => {
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {Route} from 'react-router';
 import App from './App/App.jsx';
 import LoginContent from './App/components/LoginContent.jsx';
-import {BrowserRouter, Switch} from "react-router-dom";
+import {BrowserRouter, Switch, Route} from "react-router-dom";
 
 /**
  * Start React Render