Merge branch 'develop'

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -5,8 +5,6 @@ body:
   - type: markdown
     attributes:
       value: |
-        🛑 **Bug reports are not yet being accepted for Twine 2.4.**
-
         Sorry to hear you are having problems with Twine!
 
           - Issues in this repository are for tracking problems with the Twine application. "How do I?" type questions are better answered on community resources like the Intfiction.org forums, Reddit, or Discord.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -5,7 +5,6 @@ body:
   - type: markdown
     attributes:
       value: |
-        🛑 **Feature requests are not yet being accepted for Twine 2.4.**
         - Usually, new issues are reviewed around once a month. It may take longer.
         - If work begins on your suggestion, it will be added to a project in this repository. You can track the status of its implementation there.
   - type: textarea

README.md

@@ -1,7 +1,3 @@
-**You are reading the README of the `develop` branch, which is currently being
-refactored and revised. Much functionality of Twine 2.3.x needs to be restored
-on this branch, and what is here is still buggy.**
-
 ## twinejs
 
 by Chris Klimas, Leon Arnott, Daithi O Crualaoich, Ingrid Cheung, Thomas Michael

electron-builder.config.js

@@ -25,7 +25,7 @@ module.exports = {
 	},
 	win: {
 		artifactName: `twine-${pkg.version}-windows.exe`,
-		icon: `icons/app-${isPreview ? 'preview' : 'release'}.png`,
+		icon: `icons/app-${isPreview ? 'preview' : 'release'}.ico`,
 		target: 'nsis'
 	}
 };

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Twine",
-	"version": "2.4.0-beta1",
+	"version": "2.4.0-beta2",
 	"description": "a GUI for creating nonlinear stories",
 	"author": "Chris Klimas <chris@twinery.org>",
 	"license": "GPL-3.0",
@@ -11,7 +11,7 @@
 	},
 	"dependencies": {
 		"@popperjs/core": "^2.9.1",
-		"@tabler/icons": "^1.40.2",
+		"@tabler/icons": "^1.48.0",
 		"classnames": "^2.2.6",
 		"codemirror": "^5.59.4",
 		"detect-it": "^4.0.1",
@@ -35,6 +35,7 @@
 		"react-popper": "^2.2.4",
 		"react-router-dom": "^5.2.0",
 		"react-scrollbar-size": "^3.2.0",
+		"react-tabs": "^3.2.3",
 		"react-transition-group": "^4.4.1",
 		"scroll": "^3.0.1",
 		"segseg": "^1.0.0",
@@ -68,6 +69,7 @@
 		"@types/react-dom": "^16.9.0",
 		"@types/react-helmet": "^6.1.1",
 		"@types/react-router-dom": "^5.1.7",
+		"@types/react-tabs": "^2.3.3",
 		"@types/react-transition-group": "^4.4.1",
 		"@types/scroll": "^3.0.0",
 		"@types/semver": "^7.3.4",
@@ -78,6 +80,7 @@
 		"electron": "^12.0.0",
 		"electron-builder": "^22.10.5",
 		"faker": "^5.4.0",
+		"history": "^5.1.0",
 		"jest-axe": "^4.1.0",
 		"jest-useragent-mock": "^0.1.1",
 		"npm-run-all": "^4.1.5",