From b3f6c8ce5419e0355aab9cf27ea981127155d8ac Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Fri, 7 Apr 2017 23:05:46 -0700
Subject: [PATCH 1/4] Updates suggested client version from 510 to 511

---
 code/modules/client/client procs.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 5a9227e9770..c83cd6973b6 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -8,7 +8,7 @@
 #define UPLOAD_LIMIT		10485760	//Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen?
 #define MIN_CLIENT_VERSION	0		//Just an ambiguously low version for now, I don't want to suddenly stop people playing.
 									//I would just like the code ready should it ever need to be used.
-#define SUGGESTED_CLIENT_VERSION	510		// only integers (e.g: 510, 511) useful here. Does not properly handle minor versions (e.g: 510.58, 511.848)
+#define SUGGESTED_CLIENT_VERSION	511		// only integers (e.g: 510, 511) useful here. Does not properly handle minor versions (e.g: 510.58, 511.848)
 
 	/*
 	When somebody clicks a link in game, this Topic is called first.

From 45ab4e38cb3cd5cdaee4cbe8e982f53d3bb88c7b Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Sat, 8 Apr 2017 18:05:33 -0700
Subject: [PATCH 2/4] Tiger requests

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index af2cfc45cc9..c39aa338588 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ git:
 
 env:
   global:
-    - BYOND_MAJOR="510"
-    - BYOND_MINOR="1346"
+    - BYOND_MAJOR="511"
+    - BYOND_MINOR="1379"
   matrix:
     - DM_MAPFILE="cyberiad"
     - DM_MAPFILE="metastation"

From 5b2fd98b93e6c681076c783e28f4490112873af6 Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Fri, 21 Apr 2017 00:40:56 -0700
Subject: [PATCH 3/4] fixes merge conflict

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb99bb4d8d0..91b9d6f108e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,9 @@ git:
 
 env:
   global:
-<<<<<<< HEAD
     - BYOND_MAJOR="511"
     - BYOND_MINOR="1379"
-=======
-    - BYOND_MAJOR="510"
-    - BYOND_MINOR="1346"
     - BYOND_MACRO_COUNT=2
->>>>>>> ParadiseSS13/master
   matrix:
     - DM_MAPFILE="cyberiad"
     - DM_MAPFILE="metastation"

From 87aaff51468ccb2d51a4997116fdad315646e1c3 Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Tue, 25 Apr 2017 22:40:08 -0700
Subject: [PATCH 4/4] Updates to 511.1380

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 91b9d6f108e..b52a729c45c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ git:
 env:
   global:
     - BYOND_MAJOR="511"
-    - BYOND_MINOR="1379"
+    - BYOND_MINOR="1380"
     - BYOND_MACRO_COUNT=2
   matrix:
     - DM_MAPFILE="cyberiad"