Update to 1.0.0

4 files changed, 88 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec19eb52b027..bb94b8fffa27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = factorio-headless
 	pkgdesc = A 2D game about building and maintaining factories - Server version (stable branch)
-	pkgver = 0.17.79
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = http://www.factorio.com/
 	install = factorio-headless.install
 	arch = x86_64
 	license = custom: commercial
+	depends = glibc
 	conflicts = factorio
 	conflicts = factorio-demo
 	conflicts = factorio-experimental
@@ -18,12 +19,12 @@ pkgbase = factorio-headless
 	source = factorio-headless.service
 	source = factorio-headless.conf
 	source = factorio-headless.sysusers
-	source = factorio_headless_x64_0.17.79.tar.xz::http://www.factorio.com/get-download/0.17.79/headless/linux64
+	source = factorio_headless_x64_1.0.0.tar.xz::http://www.factorio.com/get-download/1.0.0/headless/linux64
 	sha256sums = 8859e0c8650bd90a7ff35f6ec15df91cbbc5ef6ffab6119876731feb811861d1
 	sha256sums = 72bbef31fced163e5993eff0e73a836a557165775eb77e0d69b24fe5ec4690a7
-	sha256sums = d384e69bac3807006b0af787d1c5dcd9f247ad49c7250ac18a3737763d755d47
+	sha256sums = 40931abfd15db6027c02471c20f86923e74471a9eb91453638c42e0f968027f5
 	sha256sums = 87dae15d1bcfb4683faea9c66498bd916bd27f8aa0dc724c4e21076dcf17da64
-	sha256sums = 9ace12fa986df028dc1851bf4de2cb038044d743e98823bc1c48ba21aa4d23df
+	sha256sums = 81d9e1aa94435aeec4131c8869fa6e9331726bea1ea31db750b65ba42dbd1464
 
 pkgname = factorio-headless
 
diff --git a/LICENSE b/LICENSE
index b5961a19df4e..6ecb1b661b1e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,75 +1,98 @@
 Source: http://www.factorio.com/terms-of-service
 
-### Terms of Service
+### END USER LICENSE AGREEMENT (TERMS OF SERVICE)
 
-The basic rule is: Use common sense. We try to be reasonable, please be too.
+#### GENERAL
 
-##### The Game
+- By downloading, installing, opening or otherwise using Factorio or any other connected services or products you agree to be bound by these Terms of Service which constitute an agreement with Wube Software Ltd, company number 09201188, registered seat 3 Gower Street, London, United Kingdom, WC1E 6HA, incorporated at the Companies House.
+- If there is anything you are wondering about in connection with the use of Factorio or with these Terms of Service, do not hesitate to contact us – we will see what we can do but you can be sure we will do our best. Please address your questions, suggestions or requests to support@factorio.com
+
+#### LICENCE
+
+- Factorio is licensed, not sold. No title or ownership in Factorio is being transferred or assigned and these Terms of Service shall not be interpreted as a sale of any rights in Factorio. Wube Software Ltd. retains all right, title, and interest to Factorio, including, but not limited to, all copyrights, trademarks, trade secrets, trade names, proprietary rights, source code and its parts, art assets or moral rights.
+- Subject to the provisions of these Terms of Service, you are granted a non-exclusive, non-transferable, limited, and revocable right and licence to use the purchased or downloaded copy of Factorio for your personal, non-commercial use. Your licence rights are subject to your compliance with these Terms of Service.
+- The term of your licence under these Terms of Service shall commence on the date that you install or otherwise use Factorio or any other connected services or products and ends on the date that you uninstall or otherwise dispose of Factorio.
+
+#### NATURE OF THE GAME
 
 - Factorio is still in the development. That means it is an unfinished product so it may contain bugs and unfinished features.
 - The game is still evolving and is subject to changes in the future.
-- We are not liable for any damage that might be caused to you by downloading, installing and using our software.
-- Especially we are not responsible if you stay awake all night long playing Factorio and can't go to school / work in the morning:)
-- You download, install and use Factorio at your own risk.
-- There's always the possibility of a project being discontinued at any time.
+- You download, install and use Factorio at your own risk. We are not liable for any damage that might be caused to you by downloading, installing and using our software.
+- Especially we are not responsible if you stay awake all night long playing Factorio and can't go to school / work in the morning :)
+- There's always the possibility of the development of the project being discontinued at any time.
+- Use of our online matching server and mod portal requires an account on our website.
 
-##### Paid content
+#### PAYMENTS, PAID CONTENT
 
-- Factorio demo is available to anyone free of charge.
-- You get access to the game by buying (single payment) the membership.
-- Possesion of the membership entitles you to all the updates to the digital content associated with this membership for free in the future. Specifically this means that future updates to the core game are for free. However this doesn't include any more significant products that we might release, such as a Factorio DLCs, Factorio 2, etc.
-- The contents and the price are subject to change in the future. We reserve the right to change the prices and change content when we feel it is appropriate.
-- Possesion of the membership entitles you also to use of the mod portal (see below for the details) and multiplayer matching server.
+- The Factorio demo is available to anyone free of charge.
+- You get access to the game by buying the membership. A single payment is all it takes to obtain full membership and unlock all features of the Factorio game.
+- Possession of the membership entitles you to all the updates to the digital content associated with this membership for free in the future. Specifically this means that future updates to the core game are for free. However this doesn't include any more significant products that we might release, such as a Factorio DLCs, Factorio 2, etc.
+- The contents and the price are subject to change in the future. We reserve the right to change the prices and modify any content when we feel it is beneficial for the future development of the game.
+- Possession of the membership entitles you also to use of the mod portal (see below for the details) and multiplayer matching server.
 
-##### The Mod Portal
+#### THE MOD PORTAL
 
-- The mod portal website and ingame integration are available for all purchasers of the game
+- The mod portal website and in-game integration are available to all purchasers of the game.
 - We reserve the right to remove a mod or edit any mods listing without notice.
-- All mods uploaded must have the permission from the author of the mod, and must not contain any copyrighted material (without permission).
+- All mods uploaded must have the permission from the author of the mod, and must not contain any copyrighted material unless it is permitted by the appropriate copyright owner.
 - Any inappropriate behaviour by users in the discussions feature can lead to account deactivation.
+- By uploading a mod to the mod portal, you grant us the irrevocable right to reproduce, adapt and distribute the mod and its content as necessary to operate the mod portal and provide the service to our users.
+- Any adaptations or works derived from the Factorio assets are permitted to be included and distributed as part of your mod. However Wube Software Ltd. still retains all rights and license to these assets and the work derived from them, and reserves the right to request removal of these assets from your mod.
 
-##### Steam integration
+#### STEAM INTEGRATION
 
-- Paid memberships are entitled to the Steam key which allows them to add Factorio to their Steam library.
-- This Steam key is meant solely for the owner of the membership, from whose profile page it was generated.
-- Giving away / selling / etc. the Steam key to someone else is direct violation of this ToS and will lead to interrupting the membership.
+- Memberships purchased through the Factorio website are entitled to redeem a Steam key which allows them to add Factorio to their Steam library.
+- This Steam key is meant solely for the owner of the membership from whose profile page it was generated.
+- Giving away / selling / or otherwise passing the Steam key to someone else is direct violation of this Terms of Service and will lead to interrupting the membership.
 - We reserve the right to change the policy of giving out keys with above restrictions in the future.
-- People who buy the game via Steam will have an account automatically created at our webpage. This will allow them to use other services we provide or will provide in the future (i.e. mod repository, MP matching server).
+- If you buy the game via Steam, you will be able to link your Steam ID to an account on our website. This will allow you to use other services we provide or will provide in the future (i.e. mod portal, multiplayer matching server).
 
-##### Purchase and Refunds
+#### PURCHASE AND REFUNDS
 
 - After the purchase you will receive an electronic invoice from our payment processing service.
 - After the purchase you will also receive a confirmation email from us with the upgrade code to your new tier and instructions on how to use it.
 - There are no additional or hidden fees. You pay once for the product (the membership tier) and that is it.
-- Refunds are possible in following scenarios (please contact us by email at support@factorio.com):
-    - The purchase has not been authorized or it has been a fraud.
-    - The user has technical issues with the game (it doesn't run or works improperly).
-    - The user has accidentaly purchased the game multiple times (typically double purchase scenario).
+- Refunds are possible in following scenarios (please contact us by email at support@factorio.com if you want to request a refund):
+- The purchase has not been authorized or it has been a fraud.
+- The user has technical issues with the game (it doesn't run or works improperly).
+- The user has accidentally purchased the game multiple times (typically double purchase scenario).
+- Request for refund must be communicated to us within 30 days of the initial purchase.
+- We will resolve your request for refund within 14 days after such request is delivered to us. Make sure you provide us with all information that can help us identify the issue upon which your request is based.
 
-- Refund requests must be made within 30 days of the initial purchase.
+#### ONLINE STORES AND DISTRIBUTION SERVICES
 
-##### Intellectual Property and Sharing
+- If Factorio is provided through an authorised external online store or other authorised distribution service, these Terms of Service and such provision of Factorio is subject to the additional terms and conditions adopted by a particular online store or distribution service. All such applicable terms and conditions are part of these Terms of Service by this reference and in case of collision with these Terms of Service such applicable terms and conditions shall prevail.
+
+#### INTELLECTUAL PROPERTY RIGHTS AND SHARING
 
 - You may use Factorio and other paid content for your own personal use.
-- All the content in the game is owned by us. This includes the user provided content that makes it into the game as well (for instance namely translations).
-- Don't sell, copy, transfer or distribute the game, its hacked / altered version, any of its parts or any of our paid content.
-- Ask us for approval to use the game, any of its parts or any materials on our website for any commercial purpose.
-- We encourage users to mod the game within the reasonable boundaries. This includes writing own Lua levels, creating own texture packs, changing properties in the JSON files, etc.
-- You may use the free factorio headless server to run and operate a commercial service providing servers to players. However we reserve the right to request the cessation of the service should an issue with the service provider arise.
+- All the content in the game is owned by Wube Software Ltd. This also includes the user provided content that becomes part of game (for instance translations).
+- If you distribute or otherwise publish your derivative works or modifications of the source code or / and art assets, you automatically grant to Wube Software Ltd. the irrevocable, perpetual, royalty free, sublicensable right and license under all applicable copyrights and intellectual property rights laws to use, reproduce, modify, adapt, perform, display, distribute and otherwise exploit and / or dispose of the modifications and / or derivative works (or any part of them) in any way Wube Software Ltd. considers appropriate. You also waive and agree never to assert against Wube Software Ltd. or its affiliates, distributors or licensors any moral rights or similar rights, that you may have in respect of such modifications and / or derivative works.
+- Factorio is not a free software, copy-left or public domain software. The source code and all art assets are copyrighted and licensed by Wube Software Ltd. and any use of them is subject to the rules stated in these Terms of Service or, if applicable, an express consent of Wube Software Ltd.
+- You are not allowed to copy, transfer or distribute the game, its hacked or otherwise altered versions, any of its parts or any of the paid content.
+- Distribution of the original art assets such as models, fonts or textures is not permitted, unless it is necessary to create your own mods in accordance with the previous paragraphs.
+- Any commercial use of the Factorio source code, art assets or other affiliated assets is subject to express consent of Wube Software Ltd. For this purpose you can contact us on factorio@factorio.com. This does not affect your Video Policy set out below.
+- You may use the free Factorio headless server to run and operate a commercial service providing servers to players. However we reserve the right to request the cessation of the service should an issue with the service provider arise.
 
-##### Use of service
+#### USE OF SERVICE
 
 - Children may use an account established by their parent or legal guardian with the approval of such a person.
 - The game doesn't contain explicit violence and we believe it is appropriate for children from 12 years.
 - If you wish to cancel your account please send us an email to support@factorio.com.
-- We reserve the right to restrict or suspend accounts of users that will clearly violate the terms of service or our privacy policy. In such a case we will first try to resolve the situation by communicating with the user. Suspending the account is the last resort.
+- We reserve the right to restrict or suspend accounts of users that will clearly violate the Terms of Service or our Privacy Policy. In such a case we will first try to resolve the situation by communicating with the user. Suspending the account is the last resort.
+
+#### VIDEO POLICY
 
-##### Other
+- If you are a valid user of the game, you may use our content for the purpose of creating videos (such as tutorials, walkthroughs, reviews etc.), uploading them on video sharing platforms (such as Youtube) and monetize those.
+- You are not allowed to extract assets from our content and distribute those separately (e.g. sound effects, graphics, music).
+- We reserve the right to revoke this permission if the video is being used in a way we see as inappropriate, and reserve the right to takedown such videos.
 
-- Don't do anything that could harm the development of the game or its distribution.
-- The materials appearing on Factorio's website may include technical or typographical errors. We don't warrant that any of the materials on its website are complete, accurate or current
-- Any kind of abusive or clearly inappropriate behavior in regards to service we run (forums, mod portal, matching server) is a violation of these terms of service.
-- There are couple of places where you can share ideas and opinions with other players (our Forum, Twitter, Facebook page). Please behave there appropriately and don’t do anything that gets us into trouble.
-- In case of legal dispute, the governing laws of the Czech Republic will apply.
+#### OTHER
 
-We reserve the right to update these terms at any point in time with immediate effect. Last update was on 28th of July 2016.
+- Do not do anything that could harm the development of the game or its distribution. We try to be helpful and fair towards all members of our Factorio community and we appreciate being rewarded with the same approach from others.
+- The materials appearing in the game or on the Factorio website may include technical or typographical errors. We don't warrant that any of the materials are complete, accurate, or up to date.
+- Any kind of abusive or clearly inappropriate behaviour with regard to services we run (forums, mod portal, matching server) is a violation of these Terms of Service.
+- There are couple of places where you can share ideas and opinions with other players (our Forum, Twitter, Facebook page). Please behave there appropriately and avoid doing anything that would result in sanctions for us.
+- Any legal disputes arising in connection with application of these Terms of Service shall be resolved in accordance with the law of the Czech Republic and will be resolved by the competent courts of the Czech Republic.
+- Each provision of these Terms of Service operates separately. In the case that any provision of these Terms of Service has been invalid or unenforceable for any reason, this fact does not cause invalidity or ineffectiveness of other parts of the Terms of Service.
+- We reserve the right to update these terms at any point in time with immediate effect. Last update was on 31st October 2018.
diff --git a/PKGBUILD b/PKGBUILD
index 39ea4ceb6870..723f689ea376 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,16 @@
-# Maintainer: mickael9 <mickael9@gmail.com>
+# Maintainer: Max Meinhold <mxmeinhold@gmail.com>
+# Contributor: mickael9 <mickael9@gmail.com>
 # Contributor: Sebastien Duthil <duthils@free.fr>
 # Inspiration for service and config files: https://github.com/Bisa/factorio-init
 
 pkgname=factorio-headless
-pkgver=0.17.79
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="A 2D game about building and maintaining factories - Server version (stable branch)"
 arch=('x86_64')
 url="http://www.factorio.com/"
 license=('custom: commercial')
+depends=('glibc')
 conflicts=('factorio' 'factorio-demo' 'factorio-experimental' 'factorio-headless-experimental')
 install=factorio-headless.install
 backup=(etc/conf.d/factorio
@@ -26,9 +28,9 @@ source=(LICENSE
 
 sha256sums=('8859e0c8650bd90a7ff35f6ec15df91cbbc5ef6ffab6119876731feb811861d1'
             '72bbef31fced163e5993eff0e73a836a557165775eb77e0d69b24fe5ec4690a7'
-            'd384e69bac3807006b0af787d1c5dcd9f247ad49c7250ac18a3737763d755d47'
+            '40931abfd15db6027c02471c20f86923e74471a9eb91453638c42e0f968027f5'
             '87dae15d1bcfb4683faea9c66498bd916bd27f8aa0dc724c4e21076dcf17da64'
-            '9ace12fa986df028dc1851bf4de2cb038044d743e98823bc1c48ba21aa4d23df')
+            '81d9e1aa94435aeec4131c8869fa6e9331726bea1ea31db750b65ba42dbd1464')
 
 
 # no modifications needed, the executable looks for:
diff --git a/factorio-headless.conf b/factorio-headless.conf
index ce1ec6b714e0..017aee60d877 100644
--- a/factorio-headless.conf
+++ b/factorio-headless.conf
@@ -4,25 +4,34 @@
 SAVE_NAME=factorio-service-save
 
 # Additional factorio arguments, such as:
-#  -v [ --verbose ]                   enable verbose logging
+#  -v, --verbose                      enable verbose logging
+#  -c, --config PATH                  config file to use
+#  --no-log-rotation                  don't rotate log file
 #  --mod-directory PATH               Mod directory to use
 #  --port N                           network port to use
 #  --bind ADDRESS[:PORT]              IP address (and optionally port) to bind to
 #  --rcon-port N                      Port to use for RCON
+#  --rcon-bind ADDRESS:PORT           IP address and port to use for RCON
 #  --rcon-password PASSWORD           Password for RCON
+#  --use-server-whitelist             If the whitelist should be used.
 #  --server-whitelist FILE            Path to file with server whitelist.
 #  --server-banlist FILE              Path to file with server banlist.
+#  --server-adminlist FILE            Path to file with server adminlist.
 #  --console-log FILE                 Path to file where a copy of the server's log will be stored
 #  --server-id FILE                   Path where server ID will be stored or read from
 #
-FACTORIO_EXTRA_ARGS="--server-banlist server-banlist.json --server-whitelist server-whitelist.json --console-log console.log"
+# See /usr/bin/factorio -h for the full list of options
+
+FACTORIO_EXTRA_ARGS="--server-banlist server-banlist.json --use-server-whitelist --server-whitelist server-whitelist.json --console-log console.log"
 
 # Additional factorio arguments used when generating the map, such as:
 #   --map-gen-settings FILE               Map generation settings
 #   --map-gen-seed SEED                   Map generation seed (you can also set the seed in map-gen-settings.json)
 #   --map-settings FILE                   Map settings
 #   --preset arg                          Name of the map generation preset to be used:
-#                                         default, rich-resources, marathon, dangerous, death-world, rail-world
+#                                         default, rich-resources, marathon, death-world, death-world-marathon, rail-world, ribbon-world, island
+#
+# See /usr/bin/factorio -h for the full list of options
 
 FACTORIO_CREATE_ARGS="--map-gen-settings /etc/factorio/map-gen-settings.json --map-settings /etc/factorio/map-settings.json --preset default"