summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-07-21 22:49:53 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-07-21 22:49:53 -0400
commit92bcb8405c4dc0f4af283146a2ad6ea3a178fd06 (patch)
tree2e5bae4b7e8c1a625c2c8f1e3b8729c5ca61c8aa /docs
parent7e5d77fb8c2606795af239717a596de460bc58f7 (diff)
parent72b3c9d14314a3f69a0ca9d6ac9de9de1d31943d (diff)
downloadSMAPI-92bcb8405c4dc0f4af283146a2ad6ea3a178fd06.tar.gz
SMAPI-92bcb8405c4dc0f4af283146a2ad6ea3a178fd06.tar.bz2
SMAPI-92bcb8405c4dc0f4af283146a2ad6ea3a178fd06.zip
Merge branch 'harmony-2' into develop
Diffstat (limited to 'docs')
-rw-r--r--docs/release-notes.md6
-rw-r--r--docs/technical/smapi.md1
2 files changed, 2 insertions, 5 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 1614f169..4fdfa247 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,11 +1,9 @@
← [README](README.md)
# Release notes
-<!--
-## Future release
+## Upcoming release
* For mod authors:
- * Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info).
--->
+ * Updated Harmony 1.2.0.1 to 2.1.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info).
## Upcoming release
* For players:
diff --git a/docs/technical/smapi.md b/docs/technical/smapi.md
index b64239c1..586b17aa 100644
--- a/docs/technical/smapi.md
+++ b/docs/technical/smapi.md
@@ -59,7 +59,6 @@ flag | purpose
`SMAPI_FOR_WINDOWS` | Whether SMAPI is being compiled for Windows; if not set, the code assumes Linux/macOS. Set automatically in `common.targets`.
`SMAPI_FOR_WINDOWS_64BIT_HACK` | Whether SMAPI is being [compiled for Windows with a 64-bit Linux version of the game](https://github.com/Pathoschild/SMAPI/issues/767). This is highly specialized and shouldn't be used in most cases. False by default.
`SMAPI_FOR_XNA` | Whether SMAPI is being compiled for XNA Framework; if not set, the code assumes MonoGame. Set automatically in `common.targets` with the same value as `SMAPI_FOR_WINDOWS` (unless `SMAPI_FOR_WINDOWS_64BIT_HACK` is set).
-`HARMONY_2` | Whether to enable experimental Harmony 2.0 support and rewrite existing Harmony 1._x_ mods for compatibility. Note that you need to replace `build/0Harmony.dll` with a Harmony 2.0 build (or switch to a package reference) to use this flag.
## For SMAPI developers
### Compiling from source