Merge branch 'develop' into QWebEngineView

KrisCris · Apr 17, 2024 · ecde9fb · ecde9fb
2 parents 2595063 + 23d5c36
commit ecde9fb
Show file tree

Hide file tree

Showing 11 changed files with 1,035 additions and 183 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