From 8275bacd52ed6cab507a1acf334868c923c48283 Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 17 Jun 2024 22:11:50 +0100 Subject: [PATCH] Merge upstream --- patches/0001-Use-PATCHED-versioning.patch | 6 +++--- upstream | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/0001-Use-PATCHED-versioning.patch b/patches/0001-Use-PATCHED-versioning.patch index 9d3254a..e45e80e 100644 --- a/patches/0001-Use-PATCHED-versioning.patch +++ b/patches/0001-Use-PATCHED-versioning.patch @@ -5,15 +5,15 @@ Subject: [PATCH] Use -PATCHED versioning diff --git a/gradle.properties b/gradle.properties -index 523a2ff19f68d2e57025a832f17bae4778b1a14b..0ae37944f7b2918d416d440ee01bffd9deced85a 100644 +index 70e3c27546bb00ee7ac51036049d3bf9cb81ce4e..e49aca874610f99d5de249d8907fd33dd9eb4193 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3072M archives_base_name=civmodern maven_group=sh.okx.civmodern --mod_version=1.6.1 -+mod_version=1.6.1-PATCHED +-mod_version=1.6.2 ++mod_version=1.6.2-PATCHED mod_description=Civ Modern copyright_licence=GPLv3 mod_home_url=https://github.com/okx-code/civmodern diff --git a/upstream b/upstream index 25f0c63..f6d5d8b 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 25f0c63798f768fcbd653418d39a00c56eaa9012 +Subproject commit f6d5d8b54ffcbdf518c913a82be3a6eb249458eb