Merge pull request #1704 from Grasscutters/development

Merge `development` into `stable`
Merge branch 'stable' into development
2025-12-14 16:04:40 +01:00 · 2022-09-03 10:19:26 -07:00 · 2022-09-03 10:18:08 -07:00 · 2022-09-03 22:15:23 +09:30 · 2022-09-03 03:36:52 +00:00 · 2022-06-10 00:23:55 -04:00
2 changed files with 1 additions and 2 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17

 group = 'xyz.grasscutters'
-version = '1.3.0'
+version = '1.3.1-dev'

 sourceCompatibility = 17
 targetCompatibility = 17
--- a/1
+++ b/1
@@ -1 +0,0 @@
-../Grasscutter_Resources/Resources/
Author	SHA1	Message	Date
Magix	2b2c612f1e	Merge pull request #1704 from Grasscutters/development Merge `development` into `stable`	2022-09-03 10:19:26 -07:00
Magix	5529674b90	Merge branch 'stable' into development	2022-09-03 10:18:08 -07:00
AnimeGitB	2ed4506074	remove accidentally committed symlink	2022-09-03 22:15:23 +09:30
github-actions	6cf83b30ee	Version 1.3.1-dev [skip actions]	2022-09-03 03:36:52 +00:00
Magix	1792c58030	Change version to `1.2.0`	2022-06-10 00:23:55 -04:00