| 
							
							
								 David Andersen | 16b6a5b253 | Merge branch '0.14.16' | 2016-10-25 14:08:09 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 44f5ffd6b4 | add badges | 2016-10-25 13:48:02 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 8fd01ef07f | Merge remote-tracking branch 'remotes/origin/0.14.16' # Conflicts:
#	Dockerfile
#	README.md | 2016-10-25 13:39:45 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 6b8c0f01ab | update checksum | 2016-10-25 13:35:32 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 284e7f00b0 | update example config | 2016-10-25 13:34:55 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | abe0c82a8e | add back exec | 2016-10-25 12:33:45 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | f90f3c7569 | removed exec | 2016-10-25 19:30:12 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | 9dca3590ae | update docs | 2016-10-25 11:59:50 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 1e7c8bc8b7 | typo | 2016-10-25 11:40:53 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 4ed57b0c20 | rename entrypoint | 2016-10-25 18:39:28 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | 88258a263e | utility script | 2016-10-25 18:31:07 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | f3df464856 | simplify startup | 2016-10-25 18:30:24 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | 3a007b377f | update alpine | 2016-10-25 18:02:33 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | ddf7f99a2b | doc update | 2016-10-25 10:28:04 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 8a3df67b52 | example config | 2016-10-25 10:11:09 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 14b11329d7 | updated readme | 2016-10-25 17:03:50 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | 2d79854697 | update readme | 2016-10-25 16:58:54 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | 65658b10d6 | use server-settings.json for settings | 2016-10-25 16:49:23 +00:00 |  | 
			
				
					| 
							
							
								 David Andersen | be4c89d937 | updated to 0.14.14 | 2016-10-25 15:51:34 +00:00 |  | 
			
				
					| 
							
							
								 zopanix | cb52eb3dff | Merge pull request #8 from bkach/0.12.33 Updated to 0.12.33 | 2016-05-04 07:23:54 +02:00 |  | 
			
				
					| 
							
							
								 Boris Kachscovsky | 322fe61b13 | Corrected SHA1 | 2016-05-04 01:43:57 +01:00 |  | 
			
				
					| 
							
							
								 Boris Kachscovsky | 3e42118a04 | Updated to 0.12.33 - Updated Dockerfile and SHA1
- Updated README | 2016-05-03 15:00:35 +01:00 |  | 
			
				
					| 
							
							
								 zopanix | ee861acee5 | Merge pull request #7 from dtandersen/0.12.32_update 0.12.32 update | 2016-04-30 17:35:26 +02:00 |  | 
			
				
					| 
							
							
								 David Andersen | f69732d4f8 | updated readme to 0.12.32 | 2016-04-29 16:08:48 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 86914046e0 | updated version and sha1 for 0.12.32 | 2016-04-29 16:07:55 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | f7c2b144ce | updated readme for 0.12.32 | 2016-04-29 15:56:19 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | a2179f3f61 | updated version and sha1 for 0.12.32 | 2016-04-29 15:51:47 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 3cc553c786 | Merge branch 'master' of https://github.com/zopanix/docker_factorio_server into dt_0.12.31 | 2016-04-29 15:48:27 -07:00 |  | 
			
				
					| 
							
							
								 zopanix | 0b3a7bd84c | Merge pull request #6 from dtandersen/0.12.31_update updated to 0.12.31 | 2016-04-27 13:18:07 +02:00 |  | 
			
				
					| 
							
							
								 David Andersen | a28d8315aa | updated imagelayers.io badge url | 2016-04-26 15:05:59 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 14d1af4d9e | updated dockerfile links | 2016-04-26 15:01:32 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | b8c0e42baa | Merge branch '0.12.31_update' into dt_develop # Conflicts:
#	Dockerfile
#	README.md | 2016-04-26 14:44:56 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 148c01eab0 | updated to 0.12.31 | 2016-04-26 14:26:18 -07:00 |  | 
			
				
					| 
							
							
								 zopanix | 99c79f7e64 | Revert "Set version to 0.12.29" This reverts commit 7e0718a332. | 2016-04-26 13:51:29 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 11f92f34d8 | Set version to 0.12.29 | 2016-04-26 13:48:32 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 186af111d9 | Set Version to 0.12.30 | 2016-04-24 14:14:19 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | b6f14800ab | Set Version to 0.12.29 | 2016-04-24 14:13:51 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 4a5504cdb6 | Set Version to 0.12.28 | 2016-04-24 14:13:35 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 0e8cb6c26c | Set Version to 0.12.27 | 2016-04-24 14:13:14 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | b950fe99c6 | Set Version to 0.12.25 | 2016-04-24 14:12:44 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 6ed85052ff | Set Version to 0.12.25 | 2016-04-24 14:12:17 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 30425c8d66 | Set Version to 0.12.24 | 2016-04-24 14:11:45 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 522a3a2e93 | Trying to fix with alpine | 2016-04-24 14:06:44 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | e37cdcc508 | Fixing some things | 2016-04-24 13:42:15 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 7babfe47ff | Fixed typo | 2016-04-24 13:36:37 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | bfd2c5f600 | Set version back to 0.12.30 | 2016-04-24 12:56:23 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 3fc2e97f7e | Set version to 0.12.29 | 2016-04-24 12:55:53 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | d141764f44 | Remove sha1sum | 2016-04-24 12:54:12 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 4a816ad5f9 | Added feature alpine with ssl verification and sha1 verification of the image | 2016-04-24 12:45:15 +02:00 |  | 
			
				
					| 
							
							
								 David Andersen | d1aa470d25 | Merge branch 'alpine' | 2016-04-14 23:04:50 -07:00 |  |