Prep for 17.5 release

Berserker66 · Jul 30, 2015 · a6a637a · a6a637a
1 parent 83983ac
commit a6a637a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 20 deletions.
diff --git a/omnisetup.py b/omnisetup.py
@@ -48,6 +48,6 @@ def installfile(name):
         print('Warning, %s not found' % name)
 
 
-extra_data = ["themes", "Images", "steam_api.dll", "plugins", "tImages.zip"]
+extra_data = ["themes", "plugins", "tImages.zip"]
 for data in extra_data:
     installfile(data)
diff --git a/omnitool.py b/omnitool.py
@@ -1,6 +1,6 @@
 #! python3.4-32
 from version import Version
-__version__ = Version(170401)
+__version__ = Version(170500)
 __author__ = "Fabian Dill"
 __credits__ = ["Ijwu", "7UR7L3", "Fabian Dill"]
 __maintainer__ = "Fabian Dill"

diff --git a/setup.iss b/setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Omnitool"
-#define MyAppVersion "17.4.0"
+#define MyAppVersion "17.5.0"
 #define MyAppPublisher "Fabian Dill"
 #define MyAppURL "http://www.terrariaonline.com/threads/omnitool-world-mapping-backups-creation-and-more-released.61654/"
 #define MyAppExeName "omnitool.exe"

diff --git a/setup64.iss b/setup64.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Omnitool"
-#define MyAppVersion "17.4.0"
+#define MyAppVersion "17.5.0"
 #define MyAppPublisher "Fabian Dill"
 #define MyAppURL "http://www.terrariaonline.com/threads/omnitool-world-mapping-backups-creation-and-more-released.61654/"
 #define MyAppExeName "omnitool.exe"

diff --git a/worldview.py b/worldview.py
@@ -66,21 +66,6 @@ def make_map(path, outputpath=None, mark=False, name=None):
                 tile, b = get_tile_buffered(f, b)  #tlib.get_tile
 
                 tile, wall, liquid, multi, wire = tile
-                """ debug stuff, please ignore"""
-                ##                if tile:
-                ##
-                ##                    if tile == 255:
-                ##                        print xi,yi
-                ##                        pygame.image.save(s, path[:-3]+"png")
-                ##                        i += 1
-                ##                        if i > 2:
-                ##                            raise AssertionError()
-                ##                    try:
-                ##                        db.tiles[tile]
-                ##                    except:
-                ##                        print tile, xi, yi
-                ##                        #raise AssertionError()
-                """ debug stuff end"""
                 if not liquid:  #liquid == 0 means no liquid
                     # there could be a liquid and a tile, like a chest and water,
                     #but I can only set one color to a pixel anyway, so I priotise the tile
@@ -192,7 +177,7 @@ def make_map(path, outputpath=None, mark=False, name=None):
                 else:
                     pos = item
                 pro = Process(target=make_map, name=item,
-                              args=(os.path.join(p, item), pos, mark, item, False))
+                              args=(os.path.join(p, item), pos, mark, item))
                 pro.start()
                 processes.append(pro)
         while len(processes) > 0: