merges from master

4 files changed, 25 insertions, 0 deletions

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
new file mode 100644
index 00000000..281faf65
--- /dev/null
+++ b/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,14 @@
+# This mods.toml is loaded by forge 1.13-1.19 and is only here to make forge display an error message
+modLoader = "javafml"
+loaderVersion = "[12,)"
+license = "LGPL"
+
+[[mods]]
+modId="notenoughupdateserrordisplay"
+version="99.99"
+displayName="NotEnoughUpdates (1.8.9)"
+description='''
+This mod description is only here to warn you about using the wrong version of Minecraft and Forge.
+'''
+
+
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
new file mode 100644
index 00000000..8dd63bf3
--- /dev/null
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,10 @@
+{
+  "id": "notenoughupdates",
+  "version": "9999.0",
+  "schemaVersion": 1,
+  "entrypoints": {
+    "main": [
+      "io.github.moulberry.notenoughupdates.envcheck.FabricEntrypoint"
+    ]
+  }
+}
diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json
index 8b1d4559..ed1ba55a 100644
--- a/src/main/resources/mixins.notenoughupdates.json
+++ b/src/main/resources/mixins.notenoughupdates.json
@@ -2,6 +2,7 @@
   "package": "io.github.moulberry.notenoughupdates.mixins",
   "refmap": "mixins.notenoughupdates.refmap.json",
   "minVersion": "0.7",
+  "plugin": "io.github.moulberry.notenoughupdates.envcheck.NEUMixinConfigPlugin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "AccessorEntityAgeable",
diff --git a/src/main/resources/pronoundb.jks b/src/main/resources/pronoundb.jks
new file mode 100644
index 00000000..1c279333
--- /dev/null
+++ b/src/main/resources/pronoundb.jks