diff --git a/gm4/plugins/manifest.py b/gm4/plugins/manifest.py index f769561311..9aa39024dd 100644 --- a/gm4/plugins/manifest.py +++ b/gm4/plugins/manifest.py @@ -160,7 +160,7 @@ def update_patch(ctx: Context): deps = _traverse_includes(id) if packs is manifest_cache.modules: deps |= {"base"} # scan the base directory if this is a module - deps_dirs = [element for sublist in [[f"{d}/data", f"{d}/*py"] for d in deps] for element in sublist] + deps_dirs = [element for sublist in [[f"{d}/data", f"{d}/overlay_*/data", f"{d}/*py"] for d in deps] for element in sublist] # add watches to skins this module uses from other modules. NOTE this could be done in a more extendable way in the future, rather than "hardcoded" skin_dep_dirs: list[str] = [] @@ -171,7 +171,7 @@ def update_patch(ctx: Context): watch_dirs = deps_dirs+skin_dep_dirs - diff = run(["git", "diff", last_commit, "--shortstat", "--", f"{id}/data", f"{id}/*.py"] + watch_dirs) if last_commit else True + diff = run(["git", "diff", last_commit, "--shortstat", "--", f"{id}/data", f"{id}/overlay_*/data", f"{id}/*.py"] + watch_dirs) if last_commit else True if not diff and released: # No changes were made, keep the same patch version diff --git a/gm4/plugins/output.py b/gm4/plugins/output.py index 58d8a328ea..b7e6000a6f 100644 --- a/gm4/plugins/output.py +++ b/gm4/plugins/output.py @@ -15,7 +15,7 @@ MODRINTH_AUTH_KEY = "BEET_MODRINTH_TOKEN" SMITHED_API = "https://api.smithed.dev/v2" SMITHED_AUTH_KEY = "BEET_SMITHED_TOKEN" -SUPPORTED_GAME_VERSIONS = ["1.20", "1.20.1"] +SUPPORTED_GAME_VERSIONS = ["1.20", "1.20.1", "1.20.2"] USER_AGENT = "Gamemode4Dev/GM4_Datapacks/release-pipeline (gamemode4official@gmail.com)" class ModrinthConfig(PluginOptions):