Merge 0.7.0 into QWebEngineView

KrisCris · Apr 17, 2024 · 2be2b14 · 2be2b14
2 parents 2595063 + 0b9e865
commit 2be2b14
Show file tree

Hide file tree

Showing 8 changed files with 232 additions and 168 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ keywords = ["palworld", "editor", "pal"]
 license = {file = "LICENSE"}
 requires-python = ">=3.11"
 readme = "README.md"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
     "setuptools==69.1.0",
     "palworld_save_tools==0.22.0",

diff --git a/src/palworld_pal_editor/api/save.py b/src/palworld_pal_editor/api/save.py
@@ -1,3 +1,4 @@
+import platform
 import traceback
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
@@ -13,7 +14,7 @@
 @save_blueprint.route("/fetch_config", methods=["GET"])
 def fetch_config():
     tk_status = False
-    if Config.mode == "gui":
+    if Config.mode == "gui" and platform.system() != "Darwin":
         try:
             import tkinter as tk
             tk_status = True

diff --git a/src/palworld_pal_editor/assets/data/pal_xp_thresholds.json b/src/palworld_pal_editor/assets/data/pal_xp_thresholds.json
@@ -3,5 +3,5 @@
   4007, 5021, 6253, 7747, 9555, 11740, 14378, 17559, 21392, 26007, 31561, 38241,
   46272, 55925, 67524, 81458, 98195, 118294, 142429, 171406, 206194, 247955,
   298134, 358305, 430525, 517205, 621236, 746089, 895928, 1075751, 1291554,
-  1550533, 1861323, 2234286, 2681857
+  1550533, 1861323, 2234286, 2681807
 ]
diff --git a/src/palworld_pal_editor/config.py b/src/palworld_pal_editor/config.py
@@ -13,7 +13,7 @@
 
 CONFIG_PATH = PROGRAM_PATH / 'config.json'
 
-VERSION = "0.6.0"
+VERSION = "0.7.0"
 
 class Config:
     i18n: str = "en"