From 0ec3b4ea1828a1edfcc39ddb45d34450b7f05658 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Sun, 2 Aug 2020 19:51:22 +0200
Subject: [PATCH] merge and small fix

---
 src/modpack.json          | 6 ------
 src/overrides/options.txt | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/modpack.json b/src/modpack.json
index cf285de..c3c59b3 100644
--- a/src/modpack.json
+++ b/src/modpack.json
@@ -2519,12 +2519,6 @@
         "roles": [
           "author"
         ]
-      },
-      {
-        "name": "LordMZTE",
-        "roles": [
-          "author"
-        ]
       }
     ]
   },
diff --git a/src/overrides/options.txt b/src/overrides/options.txt
index e832ac4..b107c72 100644
--- a/src/overrides/options.txt
+++ b/src/overrides/options.txt
@@ -1,6 +1,6 @@
 gamma:1.0
 guiScale:2
-resourcePacks:["1.12.zip", "F32-1.12.2.zip"]
+resourcePacks:["1.12.zip", "F32-1.12.2.zip", "spackenmobs-1.0.zip"]
 showSubtitles:true
 autoJump:false
 soundCategory_master:0.4