Resolve merge conflicts

README.md

@@ -1,14 +1,17 @@
 
-# Anitrox Stable Branch (anitrox_stable)
+# Anitrox Development Branch (anitrox_dev)
-This is the stable branch, If you want the prepackaged and prepared builds, you're at the right place.
+This is the development branch, Where all the work happens. Be careful as some features may bite, or be removed without notice!
 # Dependencies to get started
 To begin, you will need to satisfy the following dependencies:
-Node.JS: 16 
+Node.JS: 16.6.0
 npm: 6.14
+# Dependencies for development
+Visual Studio Code (Recommended)
+ESLint
 # Let's get this ~~party~~ bot started!
 For first time start up, You will need to run ``npm install`` to install the needed npm packages.
 Afterwards fill out the ``.env.example`` and ``config-example.json`` and then rename them to ``.env`` and ``config.json``, then just run ``node start.js`` (or ``./start.js`` on Linux)!
 <br>
 ⚠️ If you don't specify the Owner ID, Some commands such as the bot controls will be unusable! 
 # Support
-Support is available on the [Discord Server!](discord.gg/5nQtMNpf43), or @ me on [Twitter!](twitter.com/IDeleteSystem64)
+Support is available on the [Discord Server!](discord.gg/5nQtMNpf43), or @ me on   [Twitter!](twitter.com/IDeleteSystem64) [Mastodon!](glaceon.social/@IDeletedSystem64)

config-example.json

@@ -1,17 +1,17 @@
 {
   "prefix": "n!",
-  "release": "Stable Release",
+  "release": "Developer Release",
-  "build": "1.3.2",
+  "build": "1.4dev",
   "footerTxt": "Anitrox, made with <3 by IDeletedSystem64 | 2018-2022",
   "sandbox": {
     "enabled": false,
-    "id": "793537380330111028",
+    "id": "0",
     "refreshLocal": false,
     "refreshGlobal": false
   },
 
   "statuses": [
-    "with np!help",
+    "with /help",
     "with Sophie!",
     "Trans Rights!",
     "in your computer",