merge 1.19.2 into 1.19.3

.circleci/config.yml

@@ -118,7 +118,7 @@ jobs:
       - discord/status:
           success_message: ${DISCORD_MSG}
           success_only: true
-          webhook: ${VS2_118_WEBHOOK}
+          webhook: ${VS2_1192_WEBHOOK}
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,49 @@
+name: Bug report
+description: Let us know about a bug that occurs without other mods
+title: '<title>'
+labels: bug
+assignees: []
+body:
+- type: checkboxes
+  attributes:
+    label: This issue occurs when only Valkyrien Skies and addons are installed and no other mods
+    options:
+      - label: I have tested this issue and it occurs when no other mods are installed
+        required: true
+- type: dropdown
+  attributes:
+    label: Minecraft Version
+    description: What Minecraft version does this issue occur on?
+    options:
+      - 1.16
+      - 1.18
+      - 1.19
+      - 1.20.x
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: Mod Loader
+    description: What mod loader does this issue occur on?
+    options:
+      - Forge
+      - Fabric
+      - Quilt
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Issue description
+    description: Describe what happens, and what you expect to happen instead
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Issue reproduction
+    description: Describe how to reproduce your issue
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Logs
+    description: Go to `.minecraft/logs` and drag and drop the `latest.log` and `debug.log` file into this text field

.github/ISSUE_TEMPLATE/compatibility_issue.yml

@@ -0,0 +1,60 @@
+name: Compatibility issue
+description: Let us know about a bug that occurs when another mod is installed
+title: '<title>'
+labels: compat
+assignees: []
+body:
+- type: markdown
+  attributes:
+    value: |
+      **Note:** do not report issues with the following mods:
+      - Optifine
+      - Magma Server (maybe try Arclight?)
+- type: input
+  attributes:
+    label: Mod Name
+    description: The name of the mod that causes the compatibility issue
+  validations:
+    required: true
+- type: checkboxes
+  attributes:
+    label: This issue occurs when only Valkyrien Skies, addons, and the mod I have specified are installed and no other mods
+    options:
+      - label: I have tested this issue and it occurs with only Valkyrien Skies, addons, and the mod I have specified
+- type: dropdown
+  attributes:
+    label: Minecraft Version
+    description: What Minecraft version does this issue occur on?
+    options:
+      - 1.16
+      - 1.18
+      - 1.19
+      - 1.20.x
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: Mod Loader
+    description: What mod loader does this issue occur on?
+    options:
+      - Forge
+      - Fabric
+      - Quilt
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Issue description
+    description: Describe what happens, and what you expect to happen instead
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Issue reproduction
+    description: Describe how to reproduce your issue
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Logs
+    description: Go to `.minecraft/logs` and drag and drop the `latest.log` and `debug.log` file into this text field

.github/workflows/build-1.18.x.yml → .github/workflows/build.yml

@@ -3,18 +3,34 @@ on:
   push:
     branches:
       - '1.18.x/*'
+      - '1.19.2/*'
   pull_request:
     types: [ opened, synchronize, reopened ]
 jobs:
   validate-gradle:
     name: "Validate Gradle wrapper"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true # Clone with vs-core submodule
       - uses: gradle/wrapper-validation-action@v1
 
+  json-yaml-validate:
+    name: "Validate Json/Yaml files"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write # enable write permissions for pull request comments
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: json-yaml-validate
+        id: json-yaml-validate
+        uses: GrantBirki/json-yaml-validate@v2.3.1
+        with:
+          comment: "true" # enable comment mode
+
   test-server:
     name: Test Server
     strategy:
@@ -24,7 +40,7 @@ jobs:
     timeout-minutes: 20 # Fail after 20 minutes
     steps:
       - name: Shallow Clone (--recurse-submodules)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.gitignore

@@ -18,8 +18,6 @@ out
 !.idea/codeStyles/
 # inspection profile
 !.idea/inspectionProfiles/
-# saveactions config
-!.idea/saveactions_settings.xml
 # recommended plugins
 !.idea/externalDependencies.xml
 

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vs-core"]
-	path = vs-core
-	url = https://github.com/ValkyrienSkies/vs-core