Merge pull request #20 from DazedNConfused-/develop

Prepare for v1.6.3 release

Author: DazedNConfused-

cddagl/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

cddagl/constants.py

@@ -26,7 +26,7 @@
 GAME_ISSUE_URL = 'https://cataclysmdda.org/#ive-found-a-bug--i-would-like-to-make-a-suggestion-what-should-i-do'
 
 BUILD_TAG = lambda bn: f'cdda-jenkins-b{bn}'
-NEW_BUILD_TAG = lambda bn: f'experimental-{bn}'
+NEW_BUILD_TAG = lambda bn: f'cdda-experimental-{bn}'
 
 WORLD_FILES = set(('worldoptions.json', 'worldoptions.txt', 'master.gsav'))
 

cddagl/ui/views/main.py

@@ -1471,7 +1471,7 @@ def find_build_finished(self):
         new_target_regex = re.compile(
             r'cdda-windows-' +
             re.escape(new_asset_graphics) + r'-' +
-            re.escape(new_asset_platform) + r'-' +
+            re.escape(new_asset_platform) + r'-msvc-' +
             r'b?(?P<build>[0-9\-]+)\.zip'
             )
 
@@ -3031,7 +3031,7 @@ def lb_http_finished(self):
         new_target_regex = re.compile(
             r'cdda-windows-' +
             re.escape(new_asset_graphics) + r'-' +
-            re.escape(new_asset_platform) + r'-' +
+            re.escape(new_asset_platform) + r'-msvc-' +
             r'b?(?P<build>[0-9\-]+)\.zip'
             )
 

data/mods.json

@@ -197,17 +197,6 @@
     "url": "https://github.com/Poragon/No-Freeze/archive/master.zip",
     "homepage": "https://discourse.cataclysmdda.org/t/no-freeze-mod-release/16709/20"
   },
-  {
-    "type": "direct_download",
-    "ident": "GunCotton",
-    "name": "Gun Cotton",
-    "authors": [ "vegarbg" ],
-    "description": "Adds craftable gun cotton, gun cotton based explosives, and gunpowder.",
-    "category": "items",
-    "dependencies": [ "dda" ],
-    "url": "https://github.com/vegarbg/GunCotton/archive/master.zip",
-    "homepage": "https://github.com/vegarbg/GunCotton"
-  },
   {
     "type": "direct_download",
     "ident": "secronom",