Merge pull request #141 from fishyboteso/feature/update_numpy

Feature/update numpy
This commit is contained in:
Adam Saudagar 2022-10-01 15:31:29 +05:30 committed by GitHub
commit 20c920adc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions

View File

@ -4,8 +4,12 @@ apiversion = 2
chalutier = ("Chalutier", "https://www.esoui.com/downloads/dl2934/Chalutier_1.1.4.zip", 114)
# addons used
lam2 = ("LibAddonMenu-2.0", "https://www.esoui.com/downloads/dl7/LibAddonMenu-2.0r32.zip", 32)
fishyqr = ("FishyQR", "https://github.com/fishyboteso/FishyQR/releases/download/v1.2.0/FishyQR.zip", 120)
libgps = ("LibGPS", "https://cdn.esoui.com/downloads/file601/LibGPS_3_0_3.zip", 30)
lam2 = ("LibAddonMenu-2.0", "https://cdn.esoui.com/downloads/file7/LibAddonMenu-2.0r34.zip", 34)
fishyqr = ("FishyQR", "https://github.com/fishyboteso/FishyQR/releases/download/v1.4/FishyQR.zip", 140)
libgps = ("LibGPS", "https://cdn.esoui.com/downloads/file601/LibGPS_3_2_0.zip", 32)
libmapping = ("LibMapPing", "https://cdn.esoui.com/downloads/file1302/LibMapPing_2_0_0.zip", 200)
libdl = ("LibDebugLogger", "https://cdn.esoui.com/downloads/file2275/LibDebugLogger_2_4_1.zip", 241)
libchatmsg = ("LibChatMessage", "https://cdn.esoui.com/downloads/file2382/LibChatMessage_1_2_0.zip", 120)
version = "0.5.13"
version = "0.5.14"

View File

@ -32,8 +32,7 @@ def show(win_loc, q):
# Position splash at the center of the main window
default_loc = (str(top.winfo_reqwidth()) + "+" + str(top.winfo_reqheight()) + "+" + "0" + "0")
win_loc = win_loc.split(":")[-1]
loc = (win_loc or default_loc).split("+")[1:]
loc = (win_loc or default_loc).split(":")[-1].split("+")[1:]
top.geometry("{}x{}+{}+{}".format(dim[0], dim[1], int(loc[0]) + int(dim[0] / 2), int(loc[1]) + int(dim[1] / 2)))
def waiting():

View File

@ -21,7 +21,7 @@ from win32comext.shell import shell, shellcon
from win32gui import GetForegroundWindow, GetWindowText
import fishy
from fishy.constants import libgps, lam2, fishyqr
from fishy.constants import libgps, lam2, fishyqr, libmapping, libdl, libchatmsg
from fishy.helper.config import config
@ -180,7 +180,7 @@ def get_addonversion(name, url=None, v=None):
def install_required_addons(force=False):
addons_req = [libgps, lam2, fishyqr]
addons_req = [libgps, lam2, fishyqr, libmapping, libdl, libchatmsg]
addon_version = config.get("addon_version", {})
installed = False
for addon in addons_req:

View File

@ -1,7 +1,7 @@
urllib3
winshell
imutils
numpy!=1.19.4
numpy>1.19.4
opencv_python==4.5.2.54
Pillow
pypiwin32
@ -14,4 +14,4 @@ keyboard
playsound==1.2.2
event-scheduler
mouse
d3dshot
d3dshot