Merge branch 'master' into gh-pages

JannisX11 · May 9, 2024 · c399405 · c399405
2 parents 89e112d + dc0067e
commit c399405
Show file tree

Hide file tree

Showing 115 changed files with 56,641 additions and 45,618 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ jobs:
   include:
     - name: "macOS"
       os: osx
-      osx_image: "xcode12.5"
+      osx_image: "xcode14.2"
       script:
         - npm run prepublish
         - electron-builder --publish=always

diff --git a/assets/splash_art/1.png b/assets/splash_art/1.png
diff --git a/assets/splash_art/1.webp b/assets/splash_art/1.webp
diff --git a/assets/splash_art/2.png b/assets/splash_art/2.png
diff --git a/assets/splash_art/2.webp b/assets/splash_art/2.webp
diff --git a/assets/splash_art/3.png b/assets/splash_art/3.png
diff --git a/assets/splash_art/3.webp b/assets/splash_art/3.webp
diff --git a/assets/splash_art/4.webp b/assets/splash_art/4.webp
diff --git a/assets/splash_art/5.webp b/assets/splash_art/5.webp
diff --git a/content/animation_presets.png b/content/animation_presets.png
diff --git a/content/flipbook_editor.png b/content/flipbook_editor.png
diff --git a/content/knife_tool.png b/content/knife_tool.png
diff --git a/content/layers.png b/content/layers.png
diff --git a/content/news.json b/content/news.json
@@ -5,30 +5,20 @@
 		"layout": "vertical",
 		"insert_after": "splash_screen",
 		"text": [
-			{"text": "Welcome to Blockbench 4.9", "type": "h2"},
-			{"text": "The Image Editor Update!", "type": "h1"},
-			{"text": "Check out the [full changelog](https://github.com/JannisX11/blockbench/releases/tag/v4.9.0)!"}
+			{"text": "Welcome to Blockbench 4.10", "type": "h2"},
+			{"text": "The Knife Tool Update!", "type": "h1"},
+			{"text": "Check out the [full changelog](https://github.com/JannisX11/blockbench/releases/tag/v4.10.0)!"}
 		],
 		"features": [
 			{
-				"image": "https://web.blockbench.net/content/layers.png",
-				"title": "Layers & Selection Tools",
-				"text": "The 2D Image Editor now features selection tools, layers, secondary color, and more!"
+				"image": "https://web.blockbench.net/content/flipbook_editor.png",
+				"title": "Flipbook Animation Editor",
+				"text": "Setup animated textures, preview them, add, remove, rearrange, or resize frames in this new convenient editor!"
 			},
 			{
-				"image": "https://web.blockbench.net/content/onion_skin.png",
-				"title": "Animation Onion Skinning",
-				"text": "Display different points in time of your animation as reference!"
-			},
-			{
-				"image": "https://web.blockbench.net/content/animation_presets.png",
-				"title": "Animation Presets",
-				"text": "Select from a list of 20 built-in animation presets, or create your own, to make an animation in no time!"
-			},
-			{
-				"image": "https://web.blockbench.net/content/plugin_info.png",
-				"title": "Plugin Info & Settings",
-				"text": "View details and features of a plugin, and change settings, directly from the plugin menu"
+				"image": "https://web.blockbench.net/content/knife_tool.png",
+				"title": "Knife Tool",
+				"text": "Cut your mesh to create new details, edges, and faces and shape your mesh in new ways!"
 			}
 		]
 	}

diff --git a/content/onion_skin.png b/content/onion_skin.png
diff --git a/content/plugin_info.png b/content/plugin_info.png