Merge branch 'dev' into pr/71

This commit is contained in:
Danielv123 committed 2018-04-11 15:22:42 +02:00
commit 51e41835ee
7 files changed
+141 -12

No files matched your search

+2
View File
@@ -34,6 +34,7 @@ Factorio*
database/items.db
config.json
package-lock.json
secret-api-token.txt
mod_cache.json
static/pictures/spritesheet.js
static/pictures/spritesheet.png
@@ -45,4 +46,5 @@ sharedPlugins/*
!sharedPlugins/inventoryImports/
!sharedPlugins/UPSdisplay/
!sharedPlugins/remoteMap/
!sharedPlugins/remoteCommands/
!sharedPlugins/researchSync/