Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	docker/Dockerfile

README.md

@@ -63,13 +63,6 @@ environment:
       - AUTO_LOAD_GAME_FORGET_LAST_FILE_ON_TITLE=${AUTO_LOAD_GAME_FORGET_LAST_FILE_ON_TITLE-true}
       - AUTO_LOAD_GAME_LOAD_INTO_MULTIPLAYER=${AUTO_LOAD_GAME_LOAD_INTO_MULTIPLAYER-true}
 
-      ## Remote Control mod
-      # Disabling this will remove the ability to automatically sleep and save on shutdown
-      - ENABLE_REMOTECONTROL_MOD=${ENABLE_REMOTECONTROL_MOD-true}
-      - REMOTE_CONTROL_EVERYONE_IS_ADMIN=${REMOTE_CONTROL_EVERYONE_IS_ADMIN-true}    # Disable any authorization by just making everyone an admin - useful for private servers where everyone is trusted
-      - REMOTE_CONTROL_DEFAULT_ADMINS=${REMOTE_CONTROL_DEFAULT_ADMINS-}   # A list of comma-separated json objects to use as default admins, eg: {id: "123456789", name: "Seb"}, {id: "987654321", name: "Kitz"}
-      - REMOTE_CONTROL_SHOULD_ASSIGN_ADMIN_TO_FIRST_CABIN_FARMER=${REMOTE_CONTROL_SHOULD_ASSIGN_ADMIN_TO_FIRST_CABIN_FARMER-true}   # Give the first player that connects admin privileges
-
       ## Save Backup mod
       # Disabling this will stop saves being backed up
       - ENABLE_SAVEBACKUP_MOD=${ENABLE_SAVEBACKUP_MOD-true}

docker-compose.yml

@@ -43,18 +43,11 @@ services:
 
       ## Auto Load Game mod
       # Removing this will mean you need to VNC in to manually start the game each boot
-      - ENABLE_AUTOLOADGAME_MOD=${ENABLE_AUTOLOADGAME-null}
+      - ENABLE_AUTOLOADGAME_MOD=${ENABLE_AUTOLOADGAME-true}
       - AUTO_LOAD_GAME_LAST_FILE_LOADED=${AUTO_LOAD_GAME_LAST_FILE_LOADED-null}
       - AUTO_LOAD_GAME_FORGET_LAST_FILE_ON_TITLE=${AUTO_LOAD_GAME_FORGET_LAST_FILE_ON_TITLE-true}
       - AUTO_LOAD_GAME_LOAD_INTO_MULTIPLAYER=${AUTO_LOAD_GAME_LOAD_INTO_MULTIPLAYER-true}
 
-      ## Remote Control mod
-      # Disabling this will remove the ability to automatically sleep and save on shutdown
-      - ENABLE_REMOTECONTROL_MOD=${ENABLE_REMOTECONTROL_MOD-true}
-      - REMOTE_CONTROL_EVERYONE_IS_ADMIN=${REMOTE_CONTROL_EVERYONE_IS_ADMIN-true}    # Disable any authorization by just making everyone an admin - useful for private servers where everyone is trusted
-      - REMOTE_CONTROL_DEFAULT_ADMINS=${REMOTE_CONTROL_DEFAULT_ADMINS-}   # A list of comma-separated json objects to use as default admins, eg: {id: "123456789", name: "Seb"}, {id: "987654321", name: "Kitz"}
-      - REMOTE_CONTROL_SHOULD_ASSIGN_ADMIN_TO_FIRST_CABIN_FARMER=${REMOTE_CONTROL_SHOULD_ASSIGN_ADMIN_TO_FIRST_CABIN_FARMER-true}   # Give the first player that connects admin privileges
-
       ## Save Backup mod
       # Disabling this will stop saves being backed up
       - ENABLE_SAVEBACKUP_MOD=${ENABLE_SAVEBACKUP_MOD-true}

docker/mods/AutoLoadGame/manifest.json

@@ -1,10 +1,10 @@
-{
+{
   "Name": "Auto Load Game",
-  "Author": "Caraxian",
-  "Version": "1.0.2",
+  "Author": "Caraxian, yatsukiko",
+  "Version": "1.0.3",
   "Description": "Automatically load a save file when starting.",
   "UniqueID": "caraxian.AutoLoadGame",
   "EntryDll": "AutoLoadGame.dll",
-  "MinimumApiVersion": "2.10.1",
+  "MinimumApiVersion": "4.0.0",
   "UpdateKeys": [ "Nexus:2509" ]
 }

docker/mods/RemoteControl/config.json.template

@@ -1,5 +0,0 @@
-{
-  "everyoneIsAdmin": ${REMOTE_CONTROL_EVERYONE_IS_ADMIN},
-  "admins": [],
-  "shouldAssignAdminToFirstCabinFarmer": ${REMOTE_CONTROL_SHOULD_ASSIGN_ADMIN_TO_FIRST_CABIN_FARMER}
-}

docker/mods/RemoteControl/manifest.json

@@ -1,10 +0,0 @@
-{
-  "Name": "Remote Control",
-  "Author": "Sebbity",
-  "Version": "1.0.0",
-  "Description": "Remotely control a stardew valley host ",
-  "UniqueID": "Sebbity.RemoteControl",
-  "EntryDll": "RemoteControl.dll",
-  "MinimumApiVersion": "2.10.0",
-  "UpdateKeys": [ "GitHub:Novex/StardewValley-RemoteControl"]
-}